aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPConnectionController.h
diff options
context:
space:
mode:
authorsqlprodev <sqlprodev@northofthree.com>2011-05-19 22:47:53 +0000
committersqlprodev <sqlprodev@northofthree.com>2011-05-19 22:47:53 +0000
commitc80db3a0d26b394b9c88fc6ef19a90cda5340440 (patch)
treed79af344b053e24393864382958e490f4b844735 /Source/SPConnectionController.h
parent838faafed7af37723e8f900a6cba846a29507db2 (diff)
downloadsequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.gz
sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.bz2
sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.zip
merging SP_REFACTOR branch with trunk
Diffstat (limited to 'Source/SPConnectionController.h')
-rw-r--r--Source/SPConnectionController.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index bded0b66..3f9cf866 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -30,9 +30,9 @@
#import "SPFavoritesOutlineView.h"
#endif
-@class SPDatabaseDocument, SPSSHTunnel
+@class SPDatabaseDocument, SPSSHTunnel, SPKeychain
#ifndef SP_REFACTOR /* class decl */
-, SPKeychain, BWAnchoredButtonBar, SPFavoriteNode
+, BWAnchoredButtonBar, SPFavoriteNode
#endif
;
@@ -59,8 +59,10 @@
#ifndef SP_REFACTOR /* ivars */
NSView *databaseConnectionSuperview;
NSSplitView *databaseConnectionView;
+#endif
SPKeychain *keychain;
NSUserDefaults *prefs;
+#ifndef SP_REFACTOR
NSMutableArray *favorites;
#endif
SPSSHTunnel *sshTunnel;
@@ -100,11 +102,11 @@
NSString *connectionKeychainID;
NSString *connectionKeychainItemName;
-#ifndef SP_REFACTOR /* ivars */
NSString *connectionKeychainItemAccount;
NSString *connectionSSHKeychainItemName;
NSString *connectionSSHKeychainItemAccount;
+#ifndef SP_REFACTOR /* ivars */
NSMutableArray *nibObjectsToRelease;
IBOutlet NSView *connectionView;
@@ -181,13 +183,10 @@
@property (readwrite, assign) int sshKeyLocationEnabled;
@property (readwrite, retain) NSString *sshKeyLocation;
@property (readwrite, retain) NSString *sshPort;
-#ifndef SP_REFACTOR /* ivars */
-
@property (readwrite, retain) NSString *connectionKeychainItemName;
@property (readwrite, retain) NSString *connectionKeychainItemAccount;
@property (readwrite, retain) NSString *connectionSSHKeychainItemName;
@property (readwrite, retain) NSString *connectionSSHKeychainItemAccount;
-#endif
@property (readonly, assign) BOOL isConnecting;
#ifndef SP_REFACTOR /* ivars */
@@ -198,7 +197,6 @@
// Connection processes
- (IBAction)initiateConnection:(id)sender;
-#ifndef SP_REFACTOR /* method decls */
- (IBAction)cancelMySQLConnection:(id)sender;
- (void)initiateSSHTunnelConnection;
- (void)sshTunnelCallback:(SPSSHTunnel *)theTunnel;
@@ -209,16 +207,19 @@
// Interface interaction
- (IBAction)chooseKeyLocation:(id)sender;
+#ifndef SP_REFACTOR /* method decls */
- (IBAction)editFavorites:(id)sender;
- (IBAction)showHelp:(id)sender;
- (IBAction)updateSSLInterface:(id)sender;
- (void)resizeTabViewToConnectionType:(NSUInteger)theType animating:(BOOL)animate;
- (IBAction)sortFavorites:(id)sender;
- (IBAction)reverseSortFavorites:(id)sender;
+#endif
// Connection details interaction
- (BOOL)checkHost;
+#ifndef SP_REFACTOR
// Favorites interaction
- (void)updateFavorites;
- (void)updateFavoriteSelection:(id)sender;