aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPQueryController.h
diff options
context:
space:
mode:
authorsqlprodev <sqlprodev@northofthree.com>2011-05-19 22:47:53 +0000
committersqlprodev <sqlprodev@northofthree.com>2011-05-19 22:47:53 +0000
commitc80db3a0d26b394b9c88fc6ef19a90cda5340440 (patch)
treed79af344b053e24393864382958e490f4b844735 /Source/SPQueryController.h
parent838faafed7af37723e8f900a6cba846a29507db2 (diff)
downloadsequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.gz
sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.bz2
sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.zip
merging SP_REFACTOR branch with trunk
Diffstat (limited to 'Source/SPQueryController.h')
-rw-r--r--Source/SPQueryController.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/SPQueryController.h b/Source/SPQueryController.h
index c80da762..27756708 100644
--- a/Source/SPQueryController.h
+++ b/Source/SPQueryController.h
@@ -25,6 +25,7 @@
@interface SPQueryController : NSWindowController
{
+#ifndef SP_REFACTOR /* ivars */
// QueryConsoleController
IBOutlet NSView *saveLogView;
IBOutlet NSTableView *consoleTableView;
@@ -48,6 +49,7 @@
NSMutableDictionary *historyContainer;
NSMutableDictionary *contentFilterContainer;
NSUInteger numberOfMaxAllowedHistory;
+#endif
NSArray *completionKeywordList;
NSArray *completionFunctionList;
@@ -55,10 +57,10 @@
#ifndef SP_REFACTOR /* ivars */
NSUserDefaults *prefs;
-#endif
NSDateFormatter *dateFormatter;
pthread_mutex_t consoleLock;
+#endif
}
@property (readwrite, retain) NSFont *consoleFont;