From 8e6012bb097bbc5b3456bc9b6a4f6b90cb4e6c15 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Mon, 18 May 2009 19:06:09 +0000 Subject: Source tidy up including standard header for all source files. --- Source/CMCopyTable.h | 20 ++++++++------------ Source/CMImageView.m | 1 - Source/CMMCPConnection.m | 3 ++- Source/CMMCPResult.h | 4 +--- Source/CMMCPResult.m | 1 - Source/ImageAndTextCell.m | 1 - Source/SPDataCellFormatter.h | 1 - Source/SPEditorTokens.h | 29 +++++++++++++++++++++++------ Source/SPEditorTokens.l | 26 +++++++++++++++++++++++--- Source/SPGrowlController.h | 13 +++++++++++-- Source/SPSQLParser.h | 3 ++- Source/SPSQLParser.m | 3 ++- Source/SPTableRelations.h | 1 - Source/SPTableRelations.m | 1 - Source/SPTextViewAdditions.m | 1 - Source/TableDocumentSplitView.h | 7 ++----- Source/TableDocumentSplitView.m | 7 +++---- Source/TableStatus.h | 2 +- Source/TableStatus.m | 24 ++++++++++++++++++++++++ Source/sequel-pro_Prefix.pch | 2 +- 20 files changed, 103 insertions(+), 47 deletions(-) (limited to 'Source') diff --git a/Source/CMCopyTable.h b/Source/CMCopyTable.h index 071554b1..d10d3725 100644 --- a/Source/CMCopyTable.h +++ b/Source/CMCopyTable.h @@ -1,14 +1,11 @@ -/*! - @header CMCopyTable.h - @abstract sequel-pro - @discussion 
- $Id:$
- Created by Stuart Glenn on Wed Apr 21 2004.
- Changed by Lorenz Textor on Sat Nov 13 2004
- Copyright (c) 2004 Stuart Glenn. All rights reserved.
-
-*/ - +// +// CMCopyTable.h +// sequel-pro +// +// Created by Stuart Glenn on Wed Apr 21 2004. +// Changed by Lorenz Textor on Sat Nov 13 2004 +// Copyright (c) 2004 Stuart Glenn. All rights reserved. +// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or @@ -25,7 +22,6 @@ #import - /*! @class copyTable @abstract subclassed NSTableView to implement copy & drag-n-drop diff --git a/Source/CMImageView.m b/Source/CMImageView.m index de96fac5..f5bd9f61 100644 --- a/Source/CMImageView.m +++ b/Source/CMImageView.m @@ -24,7 +24,6 @@ #import "CMImageView.h" - @implementation CMImageView diff --git a/Source/CMMCPConnection.m b/Source/CMMCPConnection.m index bfd30062..58f08810 100644 --- a/Source/CMMCPConnection.m +++ b/Source/CMMCPConnection.m @@ -783,4 +783,5 @@ static void forcePingTimeout(int signalNumber) [theData increaseLengthBy:1]; return (const char *)[theData bytes]; } -@end \ No newline at end of file + +@end diff --git a/Source/CMMCPResult.h b/Source/CMMCPResult.h index d460b361..c756c5a6 100644 --- a/Source/CMMCPResult.h +++ b/Source/CMMCPResult.h @@ -27,9 +27,7 @@ #define FIELD_TYPE_BIT 16 -@interface CMMCPResult : MCPResult { - -} +@interface CMMCPResult : MCPResult - (id)fetchRowAsType:(MCPReturnType)aType; diff --git a/Source/CMMCPResult.m b/Source/CMMCPResult.m index 145825a7..88ec0842 100644 --- a/Source/CMMCPResult.m +++ b/Source/CMMCPResult.m @@ -24,7 +24,6 @@ #import "CMMCPResult.h" - @implementation CMMCPResult /* diff --git a/Source/ImageAndTextCell.m b/Source/ImageAndTextCell.m index a8165f85..345d4aeb 100644 --- a/Source/ImageAndTextCell.m +++ b/Source/ImageAndTextCell.m @@ -132,4 +132,3 @@ } @end - diff --git a/Source/SPDataCellFormatter.h b/Source/SPDataCellFormatter.h index 8c62d83a..3a0766bf 100644 --- a/Source/SPDataCellFormatter.h +++ b/Source/SPDataCellFormatter.h @@ -23,7 +23,6 @@ #import - @interface SPDataCellFormatter : NSFormatter { int textLimit; } diff --git a/Source/SPEditorTokens.h b/Source/SPEditorTokens.h index efa7167c..fe4178f5 100644 --- a/Source/SPEditorTokens.h +++ b/Source/SPEditorTokens.h @@ -1,9 +1,26 @@ -/* - * SPEditorTokens.h - * sequel-pro - * - * Created by Jakob on 3/15/09. - * +// +// SPEditorTokens.h +// sequel-pro +// +// Created by Jakob on 3/15/2009. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// More info at + +/** * This file defines all the tokens used for parsing the source code */ diff --git a/Source/SPEditorTokens.l b/Source/SPEditorTokens.l index 2a2911b6..7df42120 100644 --- a/Source/SPEditorTokens.l +++ b/Source/SPEditorTokens.l @@ -1,8 +1,28 @@ %{ + +// +// SPEditorTokens.m +// sequel-pro +// +// Created by Jakob on 3/15/2009. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// More info at -/* - * SPEditorTokens.l - created by Jakob on 3/15/09 for Sequel Pro - * +/** * This is the lex file used for syntax coloring. * To add new keywords, just add a line where the other * keywords are and replace spaces with {s} diff --git a/Source/SPGrowlController.h b/Source/SPGrowlController.h index 7b604e30..0b037401 100644 --- a/Source/SPGrowlController.h +++ b/Source/SPGrowlController.h @@ -29,7 +29,16 @@ + (SPGrowlController *)sharedGrowlController; // Post notification -- (void)notifyWithTitle:(NSString *)title description:(NSString *)description notificationName:(NSString *)name; -- (void)notifyWithTitle:(NSString *)title description:(NSString *)description notificationName:(NSString *)name iconData:(NSData *)data priority:(int)priority isSticky:(BOOL)sticky clickContext:(id)clickContext; +- (void)notifyWithTitle:(NSString *)title + description:(NSString *)description + notificationName:(NSString *)name; + +- (void)notifyWithTitle:(NSString *)title + description:(NSString *)description + notificationName:(NSString *)name + iconData:(NSData *)data + priority:(int)priority + isSticky:(BOOL)sticky + clickContext:(id)clickContext; @end diff --git a/Source/SPSQLParser.h b/Source/SPSQLParser.h index 317e3e16..623c272a 100644 --- a/Source/SPSQLParser.h +++ b/Source/SPSQLParser.h @@ -251,4 +251,5 @@ typedef enum _SPCommentTypes { - (void) setString:(NSString *)string; - (void) replaceCharactersInRange:(NSRange)range withString:(NSString *)string; - (void) dealloc; -@end \ No newline at end of file + +@end diff --git a/Source/SPSQLParser.m b/Source/SPSQLParser.m index ad3697d6..24adc59b 100644 --- a/Source/SPSQLParser.m +++ b/Source/SPSQLParser.m @@ -767,4 +767,5 @@ if (charCacheEnd != -1) free(stringCharCache); [super dealloc]; } -@end \ No newline at end of file + +@end diff --git a/Source/SPTableRelations.h b/Source/SPTableRelations.h index d7006d0f..5245819a 100644 --- a/Source/SPTableRelations.h +++ b/Source/SPTableRelations.h @@ -20,7 +20,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // More info at -// #import #import diff --git a/Source/SPTableRelations.m b/Source/SPTableRelations.m index 8f7810be..8569243e 100644 --- a/Source/SPTableRelations.m +++ b/Source/SPTableRelations.m @@ -20,7 +20,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // More info at -// #import "SPTableRelations.h" #import "TableDocument.h" diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m index dc3d4c16..a7a164a0 100644 --- a/Source/SPTextViewAdditions.m +++ b/Source/SPTextViewAdditions.m @@ -297,4 +297,3 @@ } @end - diff --git a/Source/TableDocumentSplitView.h b/Source/TableDocumentSplitView.h index 798e8088..2852564c 100644 --- a/Source/TableDocumentSplitView.h +++ b/Source/TableDocumentSplitView.h @@ -18,8 +18,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at -// +// More info at #import @@ -28,8 +27,6 @@ * right col main window content) */ -@interface TableDocumentSplitView : NSSplitView { - -} +@interface TableDocumentSplitView : NSSplitView @end diff --git a/Source/TableDocumentSplitView.m b/Source/TableDocumentSplitView.m index f8784d0e..b7d1d7be 100644 --- a/Source/TableDocumentSplitView.m +++ b/Source/TableDocumentSplitView.m @@ -19,7 +19,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // More info at -// #import "TableDocumentSplitView.h" @@ -27,13 +26,13 @@ - (float)dividerThickness { - return 1; + return 1; } - (void)drawDividerInRect:(NSRect)rect { - [[NSColor controlShadowColor] set]; - NSRectFill(rect); + [[NSColor controlShadowColor] set]; + NSRectFill(rect); } @end diff --git a/Source/TableStatus.h b/Source/TableStatus.h index 51c8b132..5478b549 100644 --- a/Source/TableStatus.h +++ b/Source/TableStatus.h @@ -1,5 +1,5 @@ // -// TableContent.h +// TableStatus.h // sequel-pro // // Created by Jason Hallford (jason.hallford@byu.edu) on Th July 08 2004. diff --git a/Source/TableStatus.m b/Source/TableStatus.m index 9d4cf03f..8bba597c 100644 --- a/Source/TableStatus.m +++ b/Source/TableStatus.m @@ -1,3 +1,27 @@ +// +// TableStatus.m +// sequel-pro +// +// Created by Jason Hallford (jason.hallford@byu.edu) on Th July 08 2004. +// sequel-pro Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// More info at +// Or mail to + #import "TableStatus.h" #import "SPTableData.h" #import "SPStringAdditions.h" diff --git a/Source/sequel-pro_Prefix.pch b/Source/sequel-pro_Prefix.pch index 0fa8023c..864e88ea 100644 --- a/Source/sequel-pro_Prefix.pch +++ b/Source/sequel-pro_Prefix.pch @@ -12,4 +12,4 @@ #define DLog(...) /* */ #endif -#define ALog(...) NSLog(__VA_ARGS__) \ No newline at end of file +#define ALog(...) NSLog(__VA_ARGS__) -- cgit v1.2.3