aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPConnectionController.h
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2012-02-23 02:13:56 +0000
committerrowanbeentje <rowan@beent.je>2012-02-23 02:13:56 +0000
commit05f1612cbb7e33cf9135a346fc2505cc0e87e853 (patch)
tree785824be4e44a61389271343d958851fa4ff7dd0 /Source/SPConnectionController.h
parenta889340b9cb1eca0d3ff022e8e6e2c718480bf44 (diff)
downloadsequelpro-05f1612cbb7e33cf9135a346fc2505cc0e87e853.tar.gz
sequelpro-05f1612cbb7e33cf9135a346fc2505cc0e87e853.tar.bz2
sequelpro-05f1612cbb7e33cf9135a346fc2505cc0e87e853.zip
Warning: this branch commit is largely untested, and known to throw exceptions as database structure retrieval is currently missing!
Further work on SPMySQLFramework integration: - Improve SPMySQL framework build settings including correct ppc builds and a Distribution configuration for the build distributions to match - Add new convenience querying and result methods to the framework - Amend Sequel Pro source to use the new SPMySQL.framework methods everywhere, replacing MCPKit methods where they differ and improving some functions - Remove MCPKit from the source - Fix a number of warnings on Release-style builds
Diffstat (limited to 'Source/SPConnectionController.h')
-rw-r--r--Source/SPConnectionController.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index 4ecff7e5..a6b63b41 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -23,14 +23,13 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <MCPKit/MCPKit.h>
#import "SPConnectionControllerDelegateProtocol.h"
#ifndef SP_REFACTOR /* headers */
#import "SPFavoritesOutlineView.h"
#endif
-@class SPDatabaseDocument, SPSSHTunnel, SPKeychain
+@class SPDatabaseDocument, SPSSHTunnel, SPKeychain, SPMySQLConnection
#ifndef SP_REFACTOR /* class decl */
, BWAnchoredButtonBar, SPFavoriteNode
#endif
@@ -67,7 +66,7 @@
NSMutableArray *favorites;
#endif
SPSSHTunnel *sshTunnel;
- MCPConnection *mySQLConnection;
+ SPMySQLConnection *mySQLConnection;
#ifndef SP_REFACTOR /* ivars */
BOOL automaticFavoriteSelection;
#endif
@@ -207,7 +206,7 @@
- (void)addConnectionToDocument;
// Interface interaction
-- (IBAction)chooseKeyLocation:(id)sender;
+- (IBAction)chooseKeyLocation:(NSButton *)sender;
#ifndef SP_REFACTOR /* method decls */
- (IBAction)editFavorites:(id)sender;
- (IBAction)showHelp:(id)sender;
@@ -215,7 +214,7 @@
- (IBAction)updateKeyLocationFileVisibility:(id)sender;
- (void)resizeTabViewToConnectionType:(NSUInteger)theType animating:(BOOL)animate;
- (IBAction)sortFavorites:(id)sender;
-- (IBAction)reverseSortFavorites:(id)sender;
+- (IBAction)reverseSortFavorites:(NSMenuItem *)sender;
#endif
// Connection details interaction