diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-04-22 17:44:57 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-04-22 17:44:57 +0000 |
| commit | 4611475c5b255eed9202474dd3bdee147e932946 (patch) | |
| tree | 39bdc50e046f802265950c6e2607ca9ebda453be /Source/SPNavigatorController.h | |
| parent | 3ed8b33deeadcc98185911f41bc6bcb4e53b4719 (diff) | |
| download | sequelpro-4611475c5b255eed9202474dd3bdee147e932946.tar.gz sequelpro-4611475c5b255eed9202474dd3bdee147e932946.tar.bz2 sequelpro-4611475c5b255eed9202474dd3bdee147e932946.zip | |
Bring outline view branch up to date with trunk (r3234:3277).
Diffstat (limited to 'Source/SPNavigatorController.h')
| -rw-r--r-- | Source/SPNavigatorController.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/SPNavigatorController.h b/Source/SPNavigatorController.h index cdac2706..20b3a796 100644 --- a/Source/SPNavigatorController.h +++ b/Source/SPNavigatorController.h @@ -26,6 +26,7 @@ @interface SPNavigatorController : NSWindowController { +#ifndef SP_REFACTOR /* ivars */ IBOutlet id outlineSchema2; IBOutlet id navigatorWindow; IBOutlet id infoTable; @@ -36,7 +37,7 @@ IBOutlet id schema12SplitView; NSUserDefaults *prefs; - +#endif NSMutableDictionary *schemaData; NSMutableDictionary *schemaDataFiltered; NSMutableDictionary *allSchemaKeys; @@ -44,7 +45,7 @@ NSMutableArray *updatingConnections; NSMutableDictionary *expandStatus2; NSMutableDictionary *cachedSortedKeys; - +#ifndef SP_REFACTOR /* ivars */ NSString *selectedKey2; NSRect selectionViewPort2; BOOL ignoreUpdate; @@ -60,11 +61,12 @@ NSImage *fieldIcon; Class NSDictionaryClass; - +#endif } + (SPNavigatorController *)sharedNavigatorController; +#ifndef SP_REFACTOR /* method decls */ - (IBAction)outlineViewAction:(id)sender; - (IBAction)reloadAllStructures:(id)sender; - (IBAction)filterTree:(id)sender; @@ -74,11 +76,13 @@ - (NSString*)tableInfoLabelForIndex:(NSInteger)index ofType:(NSInteger)type; - (void)updateNavigator:(NSNotification *)aNotification; +#endif - (NSDictionary *)dbStructureForConnection:(NSString*)connectionID; - (NSArray *)allSchemaKeysForConnection:(NSString*)connectionID; - (NSArray *)getUniqueDbIdentifierFor:(NSString*)term andConnection:(NSString*)connectionID ignoreFields:(BOOL)ignoreFields; +#ifndef SP_REFACTOR /* method decls */ - (BOOL)isUpdatingConnection:(NSString*)connectionID; - (BOOL)isUpdating; @@ -91,5 +95,6 @@ - (BOOL)schemaPathExistsForConnection:(NSString*)connectionID andDatabase:(NSString*)dbname; - (void)removeDatabase:(NSString*)db_id forConnectionID:(NSString*)connectionID; +#endif @end |