From 47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9 Mon Sep 17 00:00:00 2001
From: sqlprodev <sqlprodev@northofthree.com>
Date: Thu, 14 Feb 2013 19:25:27 +0000
Subject: Changes required to merge Sequel Pro r4011 into Coda

---
 Source/SPQueryFavoriteManager.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Source/SPQueryFavoriteManager.h')

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
-- 
cgit v1.2.3