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/SPTextView.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/SPTextView.m')
-rw-r--r-- | Source/SPTextView.m | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/SPTextView.m b/Source/SPTextView.m index f6ee4efc..de1ddc04 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -33,7 +33,6 @@ #import "SPDatabaseDocument.h" #import "SPNarrowDownCompletion.h" #import "SPQueryController.h" -#import "SPQueryDocumentsController.h" #import "SPTooltip.h" #import "SPTablesList.h" #import "SPNavigatorController.h" @@ -42,7 +41,6 @@ #ifndef SP_CODA /* headers */ #import "SPBundleHTMLOutputController.h" #endif -#import "SPDatabaseViewController.h" #ifndef SP_CODA /* headers */ #import "SPAppController.h" #endif @@ -81,7 +79,7 @@ #pragma mark - -@interface SPTextView (Private_API) +@interface SPTextView () NSInteger _alphabeticSort(id string1, id string2, void *reverse); #ifndef SP_CODA @@ -1062,7 +1060,7 @@ retry: - (IBAction)printDocument:(id)sender { - // If Extended Table Info tab is active delegate the print call to the SPPrintController + // If Extended Table Info tab is active delegate the print call to the SPDatabaseDocument // if the user doesn't select anything in self if([[[[self delegate] class] description] isEqualToString:@"SPExtendedTableInfo"] && ![self selectedRange].length) { [[(NSObject*)[self delegate] valueForKeyPath:@"tableDocumentInstance"] printDocument:sender]; @@ -3727,13 +3725,9 @@ retry: [super dealloc]; } -@end - #pragma mark - #pragma mark Private API -@implementation SPTextView (Private_API) - /** * Sort function (mainly used to sort the words in the textView) */ |