aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPConstants.h
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2009-12-12 16:35:04 +0000
committerstuconnolly <stuart02@gmail.com>2009-12-12 16:35:04 +0000
commit367f3c398a7f83e99d8383af8ce2fdeae5ba9f69 (patch)
treedb36900932707ef65d84961853df6d9f419f9328 /Source/SPConstants.h
parentad93154f88120c37081fc9f816b25a9410b3b89c (diff)
downloadsequelpro-367f3c398a7f83e99d8383af8ce2fdeae5ba9f69.tar.gz
sequelpro-367f3c398a7f83e99d8383af8ce2fdeae5ba9f69.tar.bz2
sequelpro-367f3c398a7f83e99d8383af8ce2fdeae5ba9f69.zip
Replace the main toolbar's #define'd identifier constants with extern's. This completes the conversion of all constants in SPConstants to extern's.
Diffstat (limited to 'Source/SPConstants.h')
-rw-r--r--Source/SPConstants.h28
1 files changed, 12 insertions, 16 deletions
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index 44675888..73f363c8 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -23,24 +23,8 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-// TODO: change #defines
-// see http://developer.apple.com/mac/library/documentation/Cocoa/Conceptual/CodingGuidelines/Articles/NamingIvarsAndTypes.html#//apple_ref/doc/uid/20001284-1003095
-
#import <Cocoa/Cocoa.h>
-// Main toolbar constants
-#define MAIN_TOOLBAR_DATABASE_SELECTION @"DatabaseSelectToolbarItemIdentifier"
-#define MAIN_TOOLBAR_HISTORY_NAVIGATION @"HistoryNavigationToolbarItemIdentifier"
-#define MAIN_TOOLBAR_SHOW_CONSOLE @"ShowConsoleIdentifier"
-#define MAIN_TOOLBAR_CLEAR_CONSOLE @"ClearConsoleIdentifier"
-#define MAIN_TOOLBAR_FLUSH_PRIVILEGES @"FlushPrivilegesIdentifier"
-#define MAIN_TOOLBAR_TABLE_STRUCTURE @"SwitchToTableStructureToolbarItemIdentifier"
-#define MAIN_TOOLBAR_TABLE_CONTENT @"SwitchToTableContentToolbarItemIdentifier"
-#define MAIN_TOOLBAR_CUSTOM_QUERY @"SwitchToRunQueryToolbarItemIdentifier"
-#define MAIN_TOOLBAR_TABLE_INFO @"SwitchToTableInfoToolbarItemIdentifier"
-#define MAIN_TOOLBAR_TABLE_RELATIONS @"SwitchToTableRelationsToolbarItemIdentifier"
-#define MAIN_TOOLBAR_USER_MANAGER @"SwitchToUserManagerToolbarItemIdentifier"
-
// View modes
typedef enum {
SPStructureViewMode = 1,
@@ -186,6 +170,18 @@ extern NSString *SPContactURL;
// Toolbar constants
+// Main window toolbar
+extern NSString *SPMainToolbarDatabaseSelection;
+extern NSString *SPMainToolbarHistoryNavigation;
+extern NSString *SPMainToolbarShowConsole;
+extern NSString *SPMainToolbarClearConsole;
+extern NSString *SPMainToolbarTableStructure;
+extern NSString *SPMainToolbarTableContent;
+extern NSString *SPMainToolbarCustomQuery;
+extern NSString *SPMainToolbarTableInfo;
+extern NSString *SPMainToolbarTableRelations;
+extern NSString *SPMainToolbarUserManager;
+
// Preferences toolbar
extern NSString *SPPreferenceToolbarGeneral;
extern NSString *SPPreferenceToolbarTables;