diff options
| author | rowanbeentje <rowan@beent.je> | 2011-06-21 00:16:15 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2011-06-21 00:16:15 +0000 |
| commit | 3c8046db92fea519d31a36c09904e1368cfec8b8 (patch) | |
| tree | 08b39ebae10709419eb4a22fe8f8d8da1a62a14f /Source | |
| parent | c350a26bdb4b1532e755074770d0546915cd83f0 (diff) | |
| download | sequelpro-3c8046db92fea519d31a36c09904e1368cfec8b8.tar.gz sequelpro-3c8046db92fea519d31a36c09904e1368cfec8b8.tar.bz2 sequelpro-3c8046db92fea519d31a36c09904e1368cfec8b8.zip | |
- Rework a number of protocol defintions when refactoring to fix IB compilation warnings
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/SPContentFilterManager.h | 5 | ||||
| -rw-r--r-- | Source/SPCustomQuery.h | 5 | ||||
| -rw-r--r-- | Source/SPFieldEditorController.h | 5 | ||||
| -rw-r--r-- | Source/SPIndexesController.h | 5 | ||||
| -rw-r--r-- | Source/SPQueryFavoriteManager.h | 5 | ||||
| -rw-r--r-- | Source/SPTableContent.h | 5 | ||||
| -rw-r--r-- | Source/SPTableStructure.h | 5 |
7 files changed, 14 insertions, 21 deletions
diff --git a/Source/SPContentFilterManager.h b/Source/SPContentFilterManager.h index ec23afe6..dda8995c 100644 --- a/Source/SPContentFilterManager.h +++ b/Source/SPContentFilterManager.h @@ -31,10 +31,9 @@ @end -#ifndef SP_REFACTOR /* ivars */ @interface SPContentFilterManager : NSWindowController -#else -@interface SPContentFilterManager : NSWindowController <NSOpenSavePanelDelegate> +#ifdef SP_REFACTOR /* ivars */ +<NSOpenSavePanelDelegate> #endif { #ifndef SP_REFACTOR /* ivars */ diff --git a/Source/SPCustomQuery.h b/Source/SPCustomQuery.h index 16aaca14..8d289f70 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> +#ifdef SP_REFACTOR +<NSTableViewDataSource, NSWindowDelegate, NSTableViewDelegate> #endif { IBOutlet id tableDocumentInstance; diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h index e2cc3195..29d4c445 100644 --- a/Source/SPFieldEditorController.h +++ b/Source/SPFieldEditorController.h @@ -32,10 +32,9 @@ * This class offers a sheet for editing different kind of data such as text, blobs (including images) as * editSheet and bit fields as bitSheet. */ -#ifndef SP_REFACTOR @interface SPFieldEditorController : NSWindowController -#else -@interface SPFieldEditorController : NSWindowController <NSComboBoxDataSource> +#ifdef SP_REFACTOR +<NSComboBoxDataSource> #endif { IBOutlet id editSheetProgressBar; diff --git a/Source/SPIndexesController.h b/Source/SPIndexesController.h index 6b755bcc..b91481bc 100644 --- a/Source/SPIndexesController.h +++ b/Source/SPIndexesController.h @@ -29,10 +29,9 @@ @class SPDatabaseDocument, SPTablesList, SPTableData, SPTableStructure, MCPConnection, SPTableView; #endif -#ifndef SP_REFACTOR @interface SPIndexesController : NSWindowController -#else -@interface SPIndexesController : NSWindowController <NSTableViewDelegate, NSTableViewDataSource> +#ifdef SP_REFACTOR +<NSTableViewDelegate, NSTableViewDataSource> #endif { // Controllers diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h index 0ebdc837..66d43778 100644 --- a/Source/SPQueryFavoriteManager.h +++ b/Source/SPQueryFavoriteManager.h @@ -31,10 +31,9 @@ @end -#ifndef SP_REFACTOR @interface SPQueryFavoriteManager : NSWindowController -#else -@interface SPQueryFavoriteManager : NSWindowController <NSOpenSavePanelDelegate> +#ifdef SP_REFACTOR +<NSOpenSavePanelDelegate> #endif { #ifndef SP_REFACTOR /* ivars */ diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index 9220b21d..4b7def6f 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -31,10 +31,9 @@ @class SPTableData, SPDatabaseDocument, SPTablesList, SPTableStructure, SPTableList; -#ifndef SP_REFACTOR @interface SPTableContent : NSObject -#else -@interface SPTableContent : NSObject <NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate> +#ifdef SP_REFACTOR +<NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate> #endif { IBOutlet SPDatabaseDocument *tableDocumentInstance; diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h index b8657273..9b09b847 100644 --- a/Source/SPTableStructure.h +++ b/Source/SPTableStructure.h @@ -27,10 +27,9 @@ @class SPDatabaseDocument, SPTableFieldValidation, SPTableData, SPDatabaseData, SPTablesList, SPIndexesController, SPTableView; -#ifndef SP_REFACTOR @interface SPTableStructure : NSObject -#else -@interface SPTableStructure : NSObject <NSTableViewDelegate, NSTableViewDataSource> +#ifdef SP_REFACTOR +<NSTableViewDelegate, NSTableViewDataSource> #endif { IBOutlet SPTablesList* tablesListInstance; |