From 524e8c356b4074f5be5933b0551374a130a8f6d1 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 18 Mar 2012 20:05:36 +0000 Subject: Bring outline view branch up to date with trunk (r3471:r3517). --- Source/SPConnectionController.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'Source/SPConnectionController.h') diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index e8ee5e9d..dcf1c6d7 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -23,8 +23,6 @@ // // More info at -#import - #import "SPConnectionControllerDelegateProtocol.h" #ifndef SP_REFACTOR /* headers */ @@ -34,7 +32,8 @@ SPFavoritesController, SPSSHTunnel, SPTreeNode, - SPFavoritesOutlineView + SPFavoritesOutlineView, + SPMySQLConnection #ifndef SP_REFACTOR /* class decl */ ,SPKeychain, BWAnchoredButtonBar, @@ -58,14 +57,10 @@ SPDatabaseDocument *dbDocument; SPSSHTunnel *sshTunnel; + SPMySQLConnection *mySQLConnection; #ifndef SP_REFACTOR /* ivars */ SPKeychain *keychain; -#endif - - MCPConnection *mySQLConnection; - -#ifndef SP_REFACTOR /* ivars */ NSView *databaseConnectionSuperview; NSSplitView *databaseConnectionView; NSOpenPanel *keySelectionPanel; @@ -73,11 +68,11 @@ NSUserDefaults *prefs; NSMutableArray *favorites; +#ifndef SP_REFACTOR /* ivars */ BOOL automaticFavoriteSelection; BOOL cancellingConnection; BOOL isConnecting; -#ifndef SP_REFACTOR /* ivars */ // Standard details NSInteger previousType; #endif @@ -227,7 +222,7 @@ - (IBAction)updateKeyLocationFileVisibility:(id)sender; - (void)resizeTabViewToConnectionType:(NSUInteger)theType animating:(BOOL)animate; - (IBAction)sortFavorites:(id)sender; -- (IBAction)reverseSortFavorites:(id)sender; +- (IBAction)reverseSortFavorites:(NSMenuItem *)sender; - (void)resizeTabViewToConnectionType:(NSUInteger)theType animating:(BOOL)animate; -- cgit v1.2.3