diff options
author | sqlprodev <sqlprodev@northofthree.com> | 2013-02-14 19:25:27 +0000 |
---|---|---|
committer | sqlprodev <sqlprodev@northofthree.com> | 2013-02-14 19:25:27 +0000 |
commit | 47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9 (patch) | |
tree | c135c5b21ece6bb5bd8f63d56f7e95fa9852abb4 /Source/SPQueryFavoriteManager.h | |
parent | c37936d71c9c8ad9b721e33899bb118032466896 (diff) | |
download | sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.tar.gz sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.tar.bz2 sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.zip |
Changes required to merge Sequel Pro r4011 into Coda
Diffstat (limited to 'Source/SPQueryFavoriteManager.h')
-rw-r--r-- | Source/SPQueryFavoriteManager.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h index 017e3cc1..cb5c4dd5 100644 --- a/Source/SPQueryFavoriteManager.h +++ b/Source/SPQueryFavoriteManager.h @@ -44,9 +44,9 @@ { #ifndef SP_REFACTOR /* ivars */ NSUserDefaults *prefs; -#endif NSURL *delegatesFileURL; +#endif SPDatabaseDocument *tableDocumentInstance; IBOutlet NSPopUpButton *encodingPopUp; IBOutlet NSTableView *favoritesTableView; @@ -65,6 +65,8 @@ - (id)initWithDelegate:(id)managerDelegate; +#ifndef SP_REFACTOR + // Accessors - (NSMutableArray *)queryFavoritesForFileURL:(NSURL *)fileURL; - (id)customQueryInstance; @@ -85,5 +87,6 @@ - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo; - (void)importPanelDidEnd:(NSOpenPanel *)panel returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo; - (void)savePanelDidEnd:(NSSavePanel *)panel returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo; +#endif @end |