diff options
| author | Max <post@wickenrode.com> | 2018-01-20 03:09:01 +0100 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2018-01-20 03:09:01 +0100 |
| commit | d403528b2e2be083fe80f5a915d1f6867ec9074e (patch) | |
| tree | cd4daf91b4dc49c46a07d9223576995c48aaeadd /Source/SPCustomQuery.m | |
| parent | ef21bc5c3749756c21804d1592f3a3fe2faf7cab (diff) | |
| parent | b04243d4d7befb33383d434fe05ea3d7915ef27d (diff) | |
| download | sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.tar.gz sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.tar.bz2 sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.zip | |
Merge remote-tracking branch 'origin/mergeclasses'
Conflicts:
Source/SPQueryControllerInitializer.m
Source/SPQueryDocumentsController.m
Source/SPQueryFavoriteManager.m
Diffstat (limited to 'Source/SPCustomQuery.m')
| -rw-r--r-- | Source/SPCustomQuery.m | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index 374f31db..bddb0b6c 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -46,7 +46,6 @@ #import "SPQueryFavoriteManager.h" #endif #import "SPQueryController.h" -#import "SPQueryDocumentsController.h" #import "SPEncodingPopupAccessory.h" #import "SPDataStorage.h" #import "SPAlertSheets.h" @@ -66,7 +65,7 @@ #import <pthread.h> #import <SPMySQL/SPMySQL.h> -@interface SPCustomQuery (PrivateAPI) +@interface SPCustomQuery () - (id)_resultDataItemAtRow:(NSInteger)row columnIndex:(NSUInteger)column preserveNULLs:(BOOL)preserveNULLs asPreview:(BOOL)asPreview; + (NSString *)linkToHelpTopic:(NSString *)aTopic; @@ -4027,7 +4026,7 @@ */ - (id)_resultDataItemAtRow:(NSInteger)row columnIndex:(NSUInteger)column preserveNULLs:(BOOL)preserveNULLs asPreview:(BOOL)asPreview; { -#warning duplicate code with SPTableContentDataSource.m tableView:objectValueForTableColumn:… +#warning duplicate code with SPTableContent.m tableView:objectValueForTableColumn:… id value = nil; // While the table is being loaded, additional validation is required - data |