Tidy up.

38 files changed, 45 insertions, 71 deletions

diff --git a/Source/CMCopyTable.h b/Source/CMCopyTable.h
index eefc0608..288edafb 100644
--- a/Source/CMCopyTable.h
+++ b/Source/CMCopyTable.h
@@ -35,7 +35,6 @@
 */
 @interface CMCopyTable : SPTableView 
 {
-
 	id tableInstance;				// the table content view instance
 	id tableData;					// the actual table data source
 	id mySQLConnection;				// current MySQL connection
@@ -43,7 +42,6 @@
 	NSString* selectedTable;		// the name of the current selected table
 	
 	NSUserDefaults *prefs;
-
 }
 
 /*!
diff --git a/Source/CMCopyTable.m b/Source/CMCopyTable.m
index 0c276b72..98556a8d 100644
--- a/Source/CMCopyTable.m
+++ b/Source/CMCopyTable.m
@@ -424,7 +424,6 @@ int MENU_EDIT_COPY_AS_SQL      = 2002;
 
 - (void)keyDown:(NSEvent *)theEvent
 {
-
 	// RETURN or ENTER invoke editing mode for selected row
 	// by calling tableView:shouldEditTableColumn: to validate
 	if([[[[self delegate] class] description] isEqualToString:@"TableContent"]) {
@@ -441,6 +440,4 @@ int MENU_EDIT_COPY_AS_SQL      = 2002;
 	[super keyDown:theEvent];		
 }
 
-
-
 @end
diff --git a/Source/CMTextView.h b/Source/CMTextView.h
index ce064470..4f9daa88 100644
--- a/Source/CMTextView.h
+++ b/Source/CMTextView.h
@@ -39,7 +39,6 @@ static inline void NSMutableAttributedStringAddAttributeValueRange (NSMutableAtt
 	return;
 }
 
-
 @interface CMTextView : NSTextView {
 	BOOL autoindentEnabled;
 	BOOL autopairEnabled;
diff --git a/Source/CustomQuery.h b/Source/CustomQuery.h
index 32d5be19..d9963799 100644
--- a/Source/CustomQuery.h
+++ b/Source/CustomQuery.h
@@ -46,7 +46,6 @@
 #define SP_SAVE_SELECTION_FAVORTITE_MENUITEM_TAG      100000
 #define SP_FAVORITE_HEADER_MENUITEM_TAG               200000
 
-
 @class SPQueryFavoriteManager;
 
 @interface CustomQuery : NSObject 
@@ -136,7 +135,6 @@
 
 	NSUInteger numberOfQueries;
 	NSUInteger queryTextViewStartPosition;
-	
 }
 
 // IBAction methods
diff --git a/Source/ImageAndTextCell.h b/Source/ImageAndTextCell.h
index bf0ef753..f652d3fe 100644
--- a/Source/ImageAndTextCell.h
+++ b/Source/ImageAndTextCell.h
@@ -56,4 +56,5 @@
 
 - (void)setIndentationLevel:(int)level;
 - (int)IndentationLevel;
+
 @end
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index d435d351..3fe45e9a 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -101,7 +101,6 @@ enum spconnection_types
 	IBOutlet NSButton *helpButton;
 	IBOutlet NSProgressIndicator *progressIndicator;
 	IBOutlet NSTextField *progressIndicatorText;
-
 }
 
 @property (readwrite, assign) int type;
diff --git a/Source/SPContentFilterManager.h b/Source/SPContentFilterManager.h
index c6942ba5..441e8b43 100644
--- a/Source/SPContentFilterManager.h
+++ b/Source/SPContentFilterManager.h
@@ -70,7 +70,6 @@
 - (IBAction)duplicateContentFilter:(id)sender;
 - (IBAction)exportContentFilter:(id)sender;
 - (IBAction)importContentFilterByAdding:(id)sender;
-// - (IBAction)importContentFilterByReplacing:(id)sender;
 - (IBAction)closeContentFilterManagerSheet:(id)sender;
 
 @end
diff --git a/Source/SPDataAdditions.m b/Source/SPDataAdditions.m
index 7069866c..332cb7ab 100644
--- a/Source/SPDataAdditions.m
+++ b/Source/SPDataAdditions.m
@@ -38,7 +38,6 @@ static char base64encodingTable[64] = {
 'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
 'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/' };
 
-
 @implementation NSData (SPDataAdditions)
 
 /*
diff --git a/Source/SPDataCellFormatter.m b/Source/SPDataCellFormatter.m
index 86cbdce6..f14774f9 100644
--- a/Source/SPDataCellFormatter.m
+++ b/Source/SPDataCellFormatter.m
@@ -43,8 +43,6 @@
 	}
 #endif
 
-
-
 - (NSString *)stringForObjectValue:(id)anObject
 {
 
diff --git a/Source/SPEncodingPopupAccessory.h b/Source/SPEncodingPopupAccessory.h
index 7f594095..7619b783 100644
--- a/Source/SPEncodingPopupAccessory.h
+++ b/Source/SPEncodingPopupAccessory.h
@@ -28,7 +28,8 @@ enum {
 	NoStringEncoding = 0xFFFFFFFF
 };
 
-@interface SPEncodingPopupAccessory : NSObject {
+@interface SPEncodingPopupAccessory : NSObject 
+{
 @public
 	IBOutlet NSPopUpButton *encodingPopUp;
 	IBOutlet NSView *encodingAccessoryView;
diff --git a/Source/SPEncodingPopupAccessory.m b/Source/SPEncodingPopupAccessory.m
index c5b30630..a921e31d 100644
--- a/Source/SPEncodingPopupAccessory.m
+++ b/Source/SPEncodingPopupAccessory.m
@@ -114,5 +114,4 @@
 	[popup selectItemAtIndex:itemToSelect];
 }
 
-
 @end
diff --git a/Source/SPExtendedTableInfo.h b/Source/SPExtendedTableInfo.h
index e9c17b56..bcb69e50 100644
--- a/Source/SPExtendedTableInfo.h
+++ b/Source/SPExtendedTableInfo.h
@@ -69,7 +69,7 @@
 - (void)loadTable:(NSString *)table; 
 
 // Task interaction
-- (void) startDocumentTaskForTab:(NSNotification *)aNotification;
-- (void) endDocumentTaskForTab:(NSNotification *)aNotification;
+- (void)startDocumentTaskForTab:(NSNotification *)aNotification;
+- (void)endDocumentTaskForTab:(NSNotification *)aNotification;
 
 @end
diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m
index 0976aa92..aee45569 100644
--- a/Source/SPExtendedTableInfo.m
+++ b/Source/SPExtendedTableInfo.m
@@ -349,7 +349,7 @@
 /**
  * Disable all content interactive elements during an ongoing task.
  */
-- (void) startDocumentTaskForTab:(NSNotification *)aNotification
+- (void)startDocumentTaskForTab:(NSNotification *)aNotification
 {
 
 	// Only proceed if this view is selected.
@@ -365,7 +365,7 @@
 /**
  * Enable all content interactive elements after an ongoing task.
  */
-- (void) endDocumentTaskForTab:(NSNotification *)aNotification
+- (void)endDocumentTaskForTab:(NSNotification *)aNotification
 {
 
 	// Only proceed if this view is selected.
diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h
index 6349f568..a4142547 100644
--- a/Source/SPFieldEditorController.h
+++ b/Source/SPFieldEditorController.h
@@ -26,7 +26,6 @@
 
 @interface SPFieldEditorController : NSWindowController 
 {
-
 	IBOutlet id editSheetProgressBar;
 	IBOutlet id editSheetSegmentControl;
 	IBOutlet id editSheetQuickLookButton;
@@ -65,7 +64,6 @@
 	int editSheetReturnCode;
 
 	NSUndoManager *esUndoManager;
-
 }
 
 - (IBAction)closeEditSheet:(id)sender;
@@ -76,7 +74,6 @@
 - (IBAction)quickLookFormatButton:(id)sender;
 - (IBAction)dropImage:(id)sender;
 
-
 - (id)editWithObject:(id)data fieldName:(NSString*)fieldName usingEncoding:(NSStringEncoding)anEncoding 
 	isObjectBlob:(BOOL)isFieldBlob isEditable:(BOOL)isEditable withWindow:(NSWindow *)tableWindow;
 
diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m
index 9ecf4815..96631502 100644
--- a/Source/SPFieldEditorController.m
+++ b/Source/SPFieldEditorController.m
@@ -957,6 +957,4 @@
 	[self performSelector:@selector(setAllowedUndo) withObject:nil afterDelay:0.2];
 }
 
-
-
 @end
diff --git a/Source/SPGrowlController.h b/Source/SPGrowlController.h
index cd0f1ded..a0a1e597 100644
--- a/Source/SPGrowlController.h
+++ b/Source/SPGrowlController.h
@@ -60,4 +60,5 @@
 // Timing functions
 - (void) setVisibilityForNotificationName:(NSString *)name;
 - (double) milliTime;
+
 @end
diff --git a/Source/SPGrowlController.m b/Source/SPGrowlController.m
index f96602cd..5322f0b1 100644
--- a/Source/SPGrowlController.m
+++ b/Source/SPGrowlController.m
@@ -191,4 +191,5 @@ static SPGrowlController *sharedGrowlController = nil;
 
 	return (((double)UnsignedWideToUInt64(elapsedTime)) * 1e-6);
 }
+
 @end
diff --git a/Source/SPHistoryController.m b/Source/SPHistoryController.m
index 6fc93e91..7f522b7d 100644
--- a/Source/SPHistoryController.m
+++ b/Source/SPHistoryController.m
@@ -27,7 +27,6 @@
 #import "TablesList.h"
 #import "SPHistoryController.h"
 
-
 @implementation SPHistoryController
 
 @synthesize history;
diff --git a/Source/SPLogger.h b/Source/SPLogger.h
index 168f70b7..ac9b9a04 100644
--- a/Source/SPLogger.h
+++ b/Source/SPLogger.h
@@ -25,8 +25,8 @@
 
 #import <Cocoa/Cocoa.h>
 
-
-@interface SPLogger : NSObject {
+@interface SPLogger : NSObject 
+{
 	BOOL initializedSuccessfully;
 	NSFileHandle *logFileHandle;
 }
diff --git a/Source/SPNarrowDownCompletion.h b/Source/SPNarrowDownCompletion.h
index 35ef7f1f..bfff4d21 100644
--- a/Source/SPNarrowDownCompletion.h
+++ b/Source/SPNarrowDownCompletion.h
@@ -48,7 +48,6 @@
 	id theView;
 	
 	NSMutableCharacterSet* textualInputCharacters;
-
 }
 
 - (id)initWithItems:(NSArray*)someSuggestions alreadyTyped:(NSString*)aUserString staticPrefix:(NSString*)aStaticPrefix additionalWordCharacters:(NSString*)someAdditionalWordCharacters caseSensitive:(BOOL)isCaseSensitive charRange:(NSRange)initRange inView:(id)aView dictMode:(BOOL)mode;
diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m
index 10274d73..e47a128a 100644
--- a/Source/SPNarrowDownCompletion.m
+++ b/Source/SPNarrowDownCompletion.m
@@ -34,10 +34,24 @@
 #import "SPConstants.h"
 
 @interface NSTableView (MovingSelectedRow)
+
 - (BOOL)SP_NarrowDownCompletion_canHandleEvent:(NSEvent*)anEvent;
+
+@end
+
+@interface SPNarrowDownCompletion (Private)
+
+- (NSRect)rectOfMainScreen;
+- (NSString*)filterString;
+- (void)setupInterface;
+- (void)filter;
+- (void)insertCommonPrefix;
+- (void)completeAndInsertSnippet;
+
 @end
 
 @implementation NSTableView (MovingSelectedRow)
+
 - (BOOL)SP_NarrowDownCompletion_canHandleEvent:(NSEvent*)anEvent
 {
 	int visibleRows = (int)floorf(NSHeight([self visibleRect]) / ([self rowHeight]+[self intercellSpacing].height)) - 1;
@@ -77,15 +91,6 @@
 
 @end
 
-@interface SPNarrowDownCompletion (Private)
-- (NSRect)rectOfMainScreen;
-- (NSString*)filterString;
-- (void)setupInterface;
-- (void)filter;
-- (void)insertCommonPrefix;
-- (void)completeAndInsertSnippet;
-@end
-
 @implementation SPNarrowDownCompletion
 // =============================
 // = Setup/tear-down functions =
@@ -502,4 +507,5 @@
 	}
 	closeMe = YES;
 }
+
 @end
diff --git a/Source/SPQueryController.h b/Source/SPQueryController.h
index e5b4c557..79d1ea8c 100644
--- a/Source/SPQueryController.h
+++ b/Source/SPQueryController.h
@@ -53,7 +53,6 @@
 	NSUInteger numberOfMaxAllowedHistory;
 
 	NSUserDefaults *prefs;
-	
 }
 
 @property (readwrite, retain) NSFont *consoleFont;
@@ -98,5 +97,4 @@
 
 - (NSArray *)queryFavoritesForFileURL:(NSURL *)fileURL andTabTrigger:(NSString *)tabTrigger includeGlobals:(BOOL)includeGlobals;
 
-
 @end
diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m
index c499f742..5a766853 100644
--- a/Source/SPQueryFavoriteManager.m
+++ b/Source/SPQueryFavoriteManager.m
@@ -33,7 +33,9 @@
 #define SP_NO_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[no selection]", @"[no selection]")
 
 @interface SPQueryFavoriteManager (Private)
+
 - (void)_initWithNoSelection;
+
 @end
 
 @implementation SPQueryFavoriteManager
@@ -828,4 +830,5 @@
 	[favoriteNameTextField setStringValue:@""];
 	[favoriteQueryTextView setString:@""];
 }
+
 @end
diff --git a/Source/SPSQLParser.h b/Source/SPSQLParser.h
index 76105e27..40d23e6d 100644
--- a/Source/SPSQLParser.h
+++ b/Source/SPSQLParser.h
@@ -71,7 +71,6 @@
 	BOOL ignoreCommentStrings;
 }
 
-
 typedef enum _SPCommentTypes {
 	SPHashComment = 0,
 	SPDoubleDashComment = 1,
diff --git a/Source/SPSQLParser.m b/Source/SPSQLParser.m
index 792d998e..68000722 100644
--- a/Source/SPSQLParser.m
+++ b/Source/SPSQLParser.m
@@ -981,7 +981,6 @@ TO_BUFFER_STATE to_scan_string (const char *);
 
 @end
 
-
 /*
  * As splitStringByCharacter: ..., but allows control over quoting
  * - it recognises CREATE ... BEGIN ... END statements
diff --git a/Source/SPTableData.h b/Source/SPTableData.h
index 928d2b54..0d248e15 100644
--- a/Source/SPTableData.h
+++ b/Source/SPTableData.h
@@ -64,5 +64,4 @@
 - (NSDictionary *) parseFieldDefinitionStringParts:(NSArray *)definitionParts;
 - (NSArray *) primaryKeyColumnNames;
 
-
 @end
diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m
index 166a7634..b8b8820a 100644
--- a/Source/SPTableInfo.m
+++ b/Source/SPTableInfo.m
@@ -241,8 +241,6 @@
 	} else {
 		[(ImageAndTextCell*)aCell setImage:nil];
 		[(ImageAndTextCell*)aCell setIndentationLevel:0];
-		//[(ImageAndTextCell*)aCell setDrawsBackground:YES];
-		//[(ImageAndTextCell*)aCell setBackgroundColor:[NSColor colorWithDeviceRed:0.894 green:0.917 blue:0.945 alpha:1]];
 	}
 }
 
diff --git a/Source/SPTableRelations.h b/Source/SPTableRelations.h
index 6d4315e2..66424d20 100644
--- a/Source/SPTableRelations.h
+++ b/Source/SPTableRelations.h
@@ -69,7 +69,7 @@
 - (IBAction)refreshRelations:(id)sender;
 
 // Task interaction
-- (void) startDocumentTaskForTab:(NSNotification *)aNotification;
-- (void) endDocumentTaskForTab:(NSNotification *)aNotification;
+- (void)startDocumentTaskForTab:(NSNotification *)aNotification;
+- (void)endDocumentTaskForTab:(NSNotification *)aNotification;
 
 @end
diff --git a/Source/SPTableRelations.m b/Source/SPTableRelations.m
index bdc1c418..1f37f8f7 100644
--- a/Source/SPTableRelations.m
+++ b/Source/SPTableRelations.m
@@ -299,7 +299,7 @@
 /**
  * Disable all content interactive elements during an ongoing task.
  */
-- (void) startDocumentTaskForTab:(NSNotification *)aNotification
+- (void)startDocumentTaskForTab:(NSNotification *)aNotification
 {
 
 	// Only proceed if this view is selected.
@@ -314,7 +314,7 @@
 /**
  * Enable all content interactive elements after an ongoing task.
  */
-- (void) endDocumentTaskForTab:(NSNotification *)aNotification
+- (void)endDocumentTaskForTab:(NSNotification *)aNotification
 {
 
 	// Only proceed if this view is selected.
diff --git a/Source/SPTextAndLinkCell.h b/Source/SPTextAndLinkCell.h
index 7cd34c3f..76604092 100644
--- a/Source/SPTextAndLinkCell.h
+++ b/Source/SPTextAndLinkCell.h
@@ -31,7 +31,6 @@ enum sptextandlinkcell_drawstates
 	SP_LINKDRAWSTATE_BACKGROUNDHIGHLIGHT = 2
 };
 
-
 @interface SPTextAndLinkCell : NSTextFieldCell {
 	BOOL hasLink;
 
diff --git a/Source/SPTextAndLinkCell.m b/Source/SPTextAndLinkCell.m
index 90012fa9..244cd379 100644
--- a/Source/SPTextAndLinkCell.m
+++ b/Source/SPTextAndLinkCell.m
@@ -25,13 +25,13 @@
 
 #import "SPTextAndLinkCell.h"
 
-
 @implementation SPTextAndLinkCell
 
 /**
  * Provide a method to derive the link rect from a cell rect.
  */
-static inline NSRect SPTextLinkRectFromCellRect(NSRect inRect) {
+static inline NSRect SPTextLinkRectFromCellRect(NSRect inRect) 
+{
 	return NSMakeRect(inRect.origin.x + inRect.size.width - 15, inRect.origin.y - 1, 12, inRect.size.height);
 }
 
diff --git a/Source/SPTextViewAdditions.h b/Source/SPTextViewAdditions.h
index 2ced6555..f224a4e0 100644
--- a/Source/SPTextViewAdditions.h
+++ b/Source/SPTextViewAdditions.h
@@ -45,5 +45,4 @@
 - (void)makeTextSizeLarger;
 - (void)makeTextSizeSmaller;
 
-
-@end
\ No newline at end of file
+@end
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m
index c547c4a5..28fe7371 100644
--- a/Source/SPTextViewAdditions.m
+++ b/Source/SPTextViewAdditions.m
@@ -446,5 +446,4 @@
 
 }
 
-
 @end
diff --git a/Source/SPTooltip.h b/Source/SPTooltip.h
index aac20447..a537e45d 100644
--- a/Source/SPTooltip.h
+++ b/Source/SPTooltip.h
@@ -29,7 +29,6 @@
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
 
-
 @interface SPTooltip : NSWindow
 {
 	WebView*		webView;
@@ -43,7 +42,6 @@
 	NSPoint			mousePositionWhenOpened;
 	
 	NSString* 		SPTooltipPreferencesIdentifier;
-
 }
 
 + (void)showWithObject:(id)content atLocation:(NSPoint)point ofType:(NSString *)type displayOptions:(NSDictionary *)displayOptions;
diff --git a/Source/SPTooltip.m b/Source/SPTooltip.m
index cf047aad..9b321005 100644
--- a/Source/SPTooltip.m
+++ b/Source/SPTooltip.m
@@ -26,7 +26,6 @@
 //
 //  More info at <http://code.google.com/p/sequel-pro/>
 
-
 //	Usage:
 //	#import "SPTooltip.h"
 //	
@@ -68,8 +67,8 @@ static float slow_in_out (float t)
 	return t;
 }
 
-
 @interface SPTooltip (Private)
+
 - (void)setContent:(NSString *)content withOptions:(NSDictionary *)displayOptions;
 - (void)runUntilUserActivity;
 - (void)stopAnimation:(id)sender;
@@ -77,13 +76,17 @@ static float slow_in_out (float t)
 + (NSPoint)caretPosition;
 + (void)setDisplayOptions:(NSDictionary *)aDict;
 - (void)initMeWithOptions:(NSDictionary *)displayOptions;
+
 @end
 
 @interface WebView (LeopardOnly)
+
 - (void)setDrawsBackground:(BOOL)drawsBackground;
+
 @end
 
 @implementation SPTooltip
+
 // ==================
 // = Setup/teardown =
 // ==================
@@ -456,4 +459,5 @@ static float slow_in_out (float t)
 		[self setAlphaValue:0.97f];
 	}
 }
+
 @end
diff --git a/Source/SPUserMO.m b/Source/SPUserMO.m
index 05d699ae..8b6af9b2 100644
--- a/Source/SPUserMO.m
+++ b/Source/SPUserMO.m
@@ -32,11 +32,7 @@
 
 - (NSString *)displayName
 {
-	if ([self valueForKey:@"parent"] == nil) {
-		return self.user;
-	} else {
-		return self.host;
-	}
+	return ([self valueForKey:@"parent"] == nil) ? self.user : self.host;
 }
 
 - (void)setDisplayName:(NSString *)value
@@ -66,7 +62,5 @@
     
     [changedObjects release];
 }
-@end
-
-
 
+@end
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index 414b7d4e..f0e43fef 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -57,7 +57,6 @@ enum sp_current_query_mode
 	IBOutlet id exportControllerInstance;
 	IBOutlet SPUserManager *userManagerInstance;
 
-
 	IBOutlet NSSearchField *listFilterField;
 
 	IBOutlet id tableWindow;
@@ -276,9 +275,6 @@ enum sp_current_query_mode
 - (void)setupToolbar;
 - (NSString *)selectedToolbarItemIdentifier;
 - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;
-- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar;
-- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar;
-- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem;
 - (void)updateChooseDatabaseToolbarItemWidth;
 
 @end
diff --git a/Source/sequel-pro_Prefix.pch b/Source/sequel-pro_Prefix.pch
index 75f66099..6801cbd0 100644
--- a/Source/sequel-pro_Prefix.pch
+++ b/Source/sequel-pro_Prefix.pch
@@ -1,5 +1,5 @@
 //
-// Prefix header for all source files of the 'sequel-pro' target in the 'sequel-pro' project
+// Prefix header for all source files of the 'sequel-pro' target in the 'sequel-pro' project.
 //
 
 #ifdef __OBJC__