Skip to content

Commit c66ff84

Browse files
committed
Reformat SPDatabaseDocument source
Also fixed some threading issues reported by Xcode
1 parent 0a22284 commit c66ff84

File tree

3 files changed

+596
-680
lines changed

3 files changed

+596
-680
lines changed

Source/SPDatabaseDocument.h

+9-13
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
@class SPCharsetCollationHelper;
5858
@class SPGotoDatabaseController;
5959
@class SPCreateDatabaseInfo;
60+
@class SPExtendedTableInfo;
61+
@class SPTableTriggers;
62+
@class SPTableRelations;
6063

6164
#import "SPDatabaseContentViewDelegate.h"
6265
#import "SPConnectionControllerDelegateProtocol.h"
@@ -76,14 +79,14 @@
7679

7780
// IBOutlets
7881
IBOutlet SPTablesList *tablesListInstance;
79-
IBOutlet SPTableStructure *tableSourceInstance;
82+
IBOutlet SPTableStructure *tableSourceInstance;
8083
IBOutlet SPTableContent <SPDatabaseContentViewDelegate> *tableContentInstance;
81-
IBOutlet id tableRelationsInstance;
82-
IBOutlet id tableTriggersInstance;
84+
IBOutlet SPTableRelations *tableRelationsInstance;
85+
IBOutlet SPTableTriggers *tableTriggersInstance;
8386
IBOutlet id customQueryInstance;
8487
IBOutlet id tableDumpInstance;
8588
IBOutlet SPTableData *tableDataInstance;
86-
IBOutlet id extendedTableInfoInstance;
89+
IBOutlet SPExtendedTableInfo *extendedTableInfoInstance;
8790
IBOutlet id databaseDataInstance;
8891
#ifndef SP_CODA
8992
IBOutlet id spHistoryControllerInstance;
@@ -126,8 +129,6 @@
126129
IBOutlet id taskProgressIndicator;
127130
IBOutlet id taskDescriptionText;
128131
IBOutlet NSButton *taskCancelButton;
129-
130-
IBOutlet id favoritesButton;
131132
#endif
132133

133134
IBOutlet id databaseNameField;
@@ -194,8 +195,6 @@
194195
#ifndef SP_CODA /* ivars */
195196
SPProcessListController *processListController;
196197
SPServerVariablesController *serverVariablesController;
197-
198-
NSInteger currentTabIndex;
199198
#endif
200199
NSString *selectedTableName;
201200
SPTableType selectedTableType;
@@ -305,9 +304,7 @@
305304
@property (assign) id databaseRenameNameField;
306305
@property (assign) id renameDatabaseButton;
307306
@property (assign) id databaseRenameSheet;
308-
#endif
309307

310-
#ifdef SP_CODA /* ivars */
311308
@property (assign) id delegate;
312309
@property (readonly) NSMutableArray* allDatabases;
313310
@property (assign) NSProgressIndicator* queryProgressBar;
@@ -335,9 +332,9 @@
335332

336333
#ifndef SP_CODA /* method decls */
337334
- (void)initQueryEditorWithString:(NSString *)query;
335+
#endif
338336

339337
// Connection callback and methods
340-
#endif
341338
- (void)setConnection:(SPMySQLConnection *)theConnection;
342339
- (SPMySQLConnection *)getConnection;
343340

@@ -357,7 +354,7 @@
357354
- (IBAction)renameDatabase:(id)sender;
358355
#ifndef SP_CODA /* method decls */
359356
- (IBAction)showMySQLHelp:(id)sender;
360-
- (IBAction) makeTableListFilterHaveFocus:(id)sender;
357+
- (IBAction)makeTableListFilterHaveFocus:(id)sender;
361358
- (IBAction)showServerVariables:(id)sender;
362359
- (IBAction)showServerProcesses:(id)sender;
363360
- (IBAction)shutdownServer:(id)sender;
@@ -530,7 +527,6 @@
530527
- (void)connect;
531528
- (void)setTableSourceInstance:(SPTableStructure*)source;
532529
- (void)setTableContentInstance:(SPTableContent*)content;
533-
534530
#endif
535531

536532
#pragma mark - SPDatabaseViewController

0 commit comments

Comments
 (0)