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/SPTableContent.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/SPTableContent.h')
| -rw-r--r-- | Source/SPTableContent.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index 90cfc40c..a95dbae3 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -25,9 +25,7 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import <MCPKit/MCPKit.h> - -@class SPDatabaseDocument, SPCopyTable, SPTextAndLinkCell, SPHistoryController, SPTableInfo, SPDataStorage, SPTextView, SPFieldEditorController; +@class SPDatabaseDocument, SPCopyTable, SPTextAndLinkCell, SPHistoryController, SPTableInfo, SPDataStorage, SPTextView, SPFieldEditorController, SPMySQLConnection, SPMySQLFastStreamingResult; @class SPTableData, SPDatabaseDocument, SPTablesList, SPTableStructure, SPTableList, SPContentFilterManager; @interface SPTableContent : NSObject @@ -55,7 +53,7 @@ IBOutlet id removeButton; IBOutlet id reloadButton; #ifndef SP_REFACTOR - IBOutlet id multipleLineEditingButton; + IBOutlet NSButton *multipleLineEditingButton; IBOutlet id countText; IBOutlet id limitRowsField; IBOutlet id limitRowsButton; @@ -90,7 +88,7 @@ IBOutlet NSPanel *filterTableSetDefaultOperatorSheet; IBOutlet NSComboBox* filterTableSetDefaultOperatorValue; #endif - MCPConnection *mySQLConnection; + SPMySQLConnection *mySQLConnection; BOOL _mainNibLoaded; BOOL isWorking; @@ -182,7 +180,7 @@ // Pagination - (IBAction) navigatePaginationFromButton:(id)sender; #ifndef SP_REFACTOR -- (IBAction) togglePagination:(id)sender; +- (IBAction) togglePagination:(NSButton *)sender; #endif - (void) setPaginationViewVisibility:(BOOL)makeVisible; - (void) updatePaginationState; @@ -213,11 +211,11 @@ - (void) endDocumentTaskForTab:(NSNotification *)aNotification; // Additional methods -- (void)setConnection:(MCPConnection *)theConnection; +- (void)setConnection:(SPMySQLConnection *)theConnection; - (void)clickLinkArrow:(SPTextAndLinkCell *)theArrowCell; - (void)clickLinkArrowTask:(SPTextAndLinkCell *)theArrowCell; - (IBAction)setCompareTypes:(id)sender; -- (void)processResultIntoDataStorage:(MCPStreamingResult *)theResult approximateRowCount:(NSUInteger)targetRowCount; +- (void)processResultIntoDataStorage:(SPMySQLFastStreamingResult *)theResult approximateRowCount:(NSUInteger)targetRowCount; - (BOOL)saveRowToTable; - (void) addRowErrorSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; - (NSString *)argumentForRow:(NSInteger)row; |