diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-03-18 20:05:36 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-03-18 20:05:36 +0000 |
| commit | 524e8c356b4074f5be5933b0551374a130a8f6d1 (patch) | |
| tree | 0dab40735f2d9484930050cd08376cbf15e4ea55 /Source/SPConnectionController.h | |
| parent | be3263f8158cb6f3dfa1005f49beefa7e494b852 (diff) | |
| download | sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.tar.gz sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.tar.bz2 sequelpro-524e8c356b4074f5be5933b0551374a130a8f6d1.zip | |
Bring outline view branch up to date with trunk (r3471:r3517).
Diffstat (limited to 'Source/SPConnectionController.h')
| -rw-r--r-- | Source/SPConnectionController.h | 15 |
1 files changed, 5 insertions, 10 deletions
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 <http://code.google.com/p/sequel-pro/> -#import <MCPKit/MCPKit.h> - #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; |