aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPUserManager.h
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2012-04-16 20:16:52 +0000
committerstuconnolly <stuart02@gmail.com>2012-04-16 20:16:52 +0000
commit4cad6f0e6e4fb497b480256c2abe3de34ebf225c (patch)
treeb66d6a72a1537cf98624acf3c685f1a4d916fd86 /Source/SPUserManager.h
parent0d3b69f964a8d9d93ca794d457b461463f1ec95d (diff)
downloadsequelpro-4cad6f0e6e4fb497b480256c2abe3de34ebf225c.tar.gz
sequelpro-4cad6f0e6e4fb497b480256c2abe3de34ebf225c.tar.bz2
sequelpro-4cad6f0e6e4fb497b480256c2abe3de34ebf225c.zip
Bring outline view branch up to date with trunk.
Diffstat (limited to 'Source/SPUserManager.h')
-rw-r--r--Source/SPUserManager.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/SPUserManager.h b/Source/SPUserManager.h
index 11bb736e..319d83b5 100644
--- a/Source/SPUserManager.h
+++ b/Source/SPUserManager.h
@@ -31,9 +31,7 @@
NSManagedObjectContext *managedObjectContext;
NSDictionary *privColumnToGrantMap;
- BOOL isInitializing;
-
- SPMySQLConnection *mySqlConnection;
+ SPMySQLConnection *connection;
SPServerSupport *serverSupport;
IBOutlet NSOutlineView *outlineView;
@@ -70,10 +68,11 @@
NSSortDescriptor *treeSortDescriptor;
BOOL isSaving;
+ BOOL isInitializing;
NSMutableString *errorsString;
}
-@property (nonatomic, retain) SPMySQLConnection *mySqlConnection;
+@property (nonatomic, retain) SPMySQLConnection *connection;
@property (nonatomic, retain) SPServerSupport *serverSupport;
@property (nonatomic, retain) NSPersistentStoreCoordinator *persistentStoreCoordinator;
@property (nonatomic, retain, readonly) NSManagedObjectModel *managedObjectModel;