diff options
| author | rowanbeentje <rowan@beent.je> | 2011-05-08 16:13:11 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2011-05-08 16:13:11 +0000 |
| commit | 75ef02696f362f408efece70ede90a6575abfb5a (patch) | |
| tree | a170db676548a71ea40f5af955fc380f06b6d878 /Source | |
| parent | 4dfa685461faec53e709afaba1323c8384d1c412 (diff) | |
| download | sequelpro-75ef02696f362f408efece70ede90a6575abfb5a.tar.gz sequelpro-75ef02696f362f408efece70ede90a6575abfb5a.tar.bz2 sequelpro-75ef02696f362f408efece70ede90a6575abfb5a.zip | |
- Fix a number of warnings for DBView.xib by moving some 10.6-only code from a #ifndef SP_REFACTOR/#else/#endif to just a #ifdef SP_REFACTOR/<protocol declaration>/#endif, and remarking a few items as IBOutlets
- Update localisable strings
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/SPCustomQuery.h | 7 | ||||
| -rw-r--r-- | Source/SPDatabaseDocument.h | 8 | ||||
| -rw-r--r-- | Source/SPTableContent.h | 5 | ||||
| -rw-r--r-- | Source/SPTablesList.h | 2 | ||||
| -rw-r--r-- | Source/SPTextView.h | 5 |
5 files changed, 12 insertions, 15 deletions
diff --git a/Source/SPCustomQuery.h b/Source/SPCustomQuery.h index 8a1ad793..f001d364 100644 --- a/Source/SPCustomQuery.h +++ b/Source/SPCustomQuery.h @@ -52,10 +52,9 @@ @class SPCopyTable, SPQueryFavoriteManager, SPDataStorage, NSSplitView, SPFieldEditorController; #endif -#ifndef SP_REFACTOR -@interface SPCustomQuery : NSObject -#else -@interface SPCustomQuery : NSObject <NSTableViewDataSource, NSWindowDelegate, NSTableViewDelegate> +@interface SPCustomQuery : NSObject +#ifdef SP_REFACTOR +<NSTableViewDataSource, NSWindowDelegate, NSTableViewDelegate> #endif { IBOutlet id tableDocumentInstance; diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h index d70a7a40..ebdac213 100644 --- a/Source/SPDatabaseDocument.h +++ b/Source/SPDatabaseDocument.h @@ -48,14 +48,14 @@ SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport; #endif // IBOutlets - SPTablesList* tablesListInstance; - SPTableStructure* tableSourceInstance; - SPTableContent* tableContentInstance; + IBOutlet SPTablesList* tablesListInstance; + IBOutlet SPTableStructure* tableSourceInstance; + IBOutlet SPTableContent* tableContentInstance; IBOutlet id tableRelationsInstance; IBOutlet id tableTriggersInstance; IBOutlet id customQueryInstance; IBOutlet id tableDumpInstance; - SPTableData* tableDataInstance; + IBOutlet SPTableData* tableDataInstance; IBOutlet id extendedTableInfoInstance; IBOutlet id databaseDataInstance; IBOutlet id spHistoryControllerInstance; diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index 2b125acd..9045772e 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -31,10 +31,9 @@ @class SPTableData, SPDatabaseDocument, SPTablesList; -#ifndef SP_REFACTOR @interface SPTableContent : NSObject -#else -@interface SPTableContent : NSObject <NSTableViewDelegate, NSTableViewDataSource> +#ifdef SP_REFACTOR +<NSTableViewDelegate, NSTableViewDataSource> #endif { IBOutlet SPDatabaseDocument *tableDocumentInstance; diff --git a/Source/SPTablesList.h b/Source/SPTablesList.h index 497fe620..50a5f4c0 100644 --- a/Source/SPTablesList.h +++ b/Source/SPTablesList.h @@ -39,7 +39,7 @@ @interface SPTablesList : NSObject { - SPDatabaseDocument* tableDocumentInstance; + IBOutlet SPDatabaseDocument* tableDocumentInstance; #ifndef SP_REFACTOR /* ivars */ IBOutlet id tableSourceInstance; IBOutlet id tableContentInstance; diff --git a/Source/SPTextView.h b/Source/SPTextView.h index bc4a3eb8..3309ed1d 100644 --- a/Source/SPTextView.h +++ b/Source/SPTextView.h @@ -32,10 +32,9 @@ @class SPNarrowDownCompletion, SPDatabaseDocument, SPTablesList, SPCustomQuery; -#ifndef SP_REFACTOR @interface SPTextView : NSTextView -#else -@interface SPTextView : NSTextView <NSTextStorageDelegate> +#ifdef SP_REFACTOR +<NSTextStorageDelegate> #endif { IBOutlet SPDatabaseDocument *tableDocumentInstance; |