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/SPDatabaseDocument.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/SPDatabaseDocument.h')
| -rw-r--r-- | Source/SPDatabaseDocument.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h index b56991f5..1c6fe296 100644 --- a/Source/SPDatabaseDocument.h +++ b/Source/SPDatabaseDocument.h @@ -25,7 +25,6 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import <MCPKit/MCPKit.h> #ifndef SP_REFACTOR /* headers */ #import <WebKit/WebKit.h> #endif @@ -34,7 +33,7 @@ #ifndef SP_REFACTOR /* class forward decls */ SPProcessListController, SPServerVariablesController, SPUserManager, SPWindowController, #endif -SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SPCustomQuery; +SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SPCustomQuery, SPDatabaseStructure, SPMySQLConnection; #import "SPConnectionControllerDelegateProtocol.h" @@ -102,7 +101,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS IBOutlet id addDatabaseButton; IBOutlet id databaseCopyNameField; - IBOutlet id copyDatabaseDataButton; + IBOutlet NSButton *copyDatabaseDataButton; IBOutlet id copyDatabaseMessageField; IBOutlet id copyDatabaseButton; @@ -146,14 +145,14 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS IBOutlet id inputTextWindowSecureTextField; NSInteger passwordSheetReturnCode; + // Master connection + SPMySQLConnection *mySQLConnection; + // Controllers SPConnectionController *connectionController; #ifndef SP_REFACTOR /* ivars */ SPProcessListController *processListController; SPServerVariablesController *serverVariablesController; -#endif - MCPConnection *mySQLConnection; -#ifndef SP_REFACTOR /* ivars */ NSInteger currentTabIndex; #endif @@ -222,7 +221,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS #ifndef SP_REFACTOR /* ivars */ NSThread *printThread; - id statusValues; + NSArray *statusValues; NSInteger saveDocPrefSheetStatus; @@ -238,6 +237,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS NSString *processID; BOOL windowTitleStatusViewIsVisible; #endif + SPDatabaseStructure *databaseStructureRetrieval; } #ifdef SP_REFACTOR /* ivars */ @@ -269,6 +269,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS @property (readwrite, retain) NSString *processID; #endif @property (readonly) SPServerSupport *serverSupport; +@property (readonly) SPDatabaseStructure *databaseStructureRetrieval; #ifndef SP_REFACTOR /* method decls */ - (BOOL)isUntitled; @@ -280,8 +281,8 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS // Connection callback and methods #endif -- (void)setConnection:(MCPConnection *)theConnection; -- (MCPConnection *)getConnection; +- (void)setConnection:(SPMySQLConnection *)theConnection; +- (SPMySQLConnection *)getConnection; - (void)setKeychainID:(NSString *)theID; // Database methods |