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

1 files changed, 5 insertions, 9 deletions

diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h
index 63ac74b8..a97f70b2 100644
--- a/Source/SPTableStructure.h
+++ b/Source/SPTableStructure.h
@@ -23,9 +23,7 @@
 //
 //  More info at <http://code.google.com/p/sequel-pro/>
 
-#import <MCPKit/MCPKit.h>
-
-@class SPDatabaseDocument, SPTableFieldValidation, SPTableData, SPDatabaseData, SPTablesList, SPIndexesController, SPTableView;
+@class SPDatabaseDocument, SPTableFieldValidation, SPTableData, SPDatabaseData, SPTablesList, SPIndexesController, SPTableView, SPMySQLConnection, SPMySQLResult;
 
 @interface SPTableStructure : NSObject 
 #ifdef SP_REFACTOR
@@ -70,9 +68,7 @@
 #endif
 	IBOutlet NSPopUpButtonCell *encodingPopupCell;
 
-	MCPConnection *mySQLConnection;
-	MCPResult *tableSourceResult;
-	MCPResult *indexResult;
+	SPMySQLConnection *mySQLConnection;
 	
 	SPTableFieldValidation *fieldValidation;
 
@@ -123,15 +119,15 @@
 - (IBAction)resetAutoIncrement:(id)sender;
 - (void)resetAutoincrementSheetDidEnd:(NSWindow *)theSheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
 - (IBAction)showOptimizedFieldType:(id)sender;
-- (IBAction)toggleColumnView:(id)sender;
+- (IBAction)toggleColumnView:(NSMenuItem *)sender;
 - (BOOL)cancelRowEditing;
 
 // Index sheet methods
 - (IBAction)closeSheet:(id)sender;
 
 // Additional methods
-- (void)setConnection:(MCPConnection *)theConnection;
-- (NSArray *)fetchResultAsArray:(MCPResult *)theResult;
+- (void)setConnection:(SPMySQLConnection *)theConnection;
+- (NSArray *)convertIndexResultToArray:(SPMySQLResult *)theResult;
 - (BOOL)saveRowOnDeselect;
 - (BOOL)addRowToDB;
 - (void)addRowErrorSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;