aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <dmoagx@users.noreply.github.com>2018-05-14 01:18:08 +0200
committerMax <dmoagx@users.noreply.github.com>2018-05-14 01:18:08 +0200
commit146d45c50163c742b9f028bb994feaa179c4a505 (patch)
tree62934eaf38db4bcf463e09c2e58c543819ed2189
parentc2fe67ba840a5f4eaa2aed786da3e559b3a8b150 (diff)
downloadsequelpro-146d45c50163c742b9f028bb994feaa179c4a505.tar.gz
sequelpro-146d45c50163c742b9f028bb994feaa179c4a505.tar.bz2
sequelpro-146d45c50163c742b9f028bb994feaa179c4a505.zip
Minor changes
-rw-r--r--Source/SPContentFilterManager.m2
-rw-r--r--Source/SPDataImport.m1
-rw-r--r--Source/SPHistoryController.m1
-rw-r--r--Source/SPIndexesController.m1
-rw-r--r--Source/SPTableContent.h2
-rw-r--r--Source/SPTableContent.m14
6 files changed, 10 insertions, 11 deletions
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index 71013dc7..6ab50876 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -33,7 +33,6 @@
#import "RegexKitLite.h"
#import "SPQueryController.h"
#import "SPDatabaseDocument.h"
-#import "SPTableContent.h"
#import "SPConnectionController.h"
#import "SPSplitView.h"
#import "SPAppController.h"
@@ -218,6 +217,7 @@ static NSString *SPExportFilterAction = @"SPExportFilter";
*/
- (id)customQueryInstance
{
+#warning private ivar accessed from outside
return [tableDocumentInstance valueForKey:@"customQueryInstance"];
}
diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m
index f350ae0f..17e083f1 100644
--- a/Source/SPDataImport.m
+++ b/Source/SPDataImport.m
@@ -34,7 +34,6 @@
#import "SPTablesList.h"
#import "SPTableStructure.h"
#import "SPDatabaseStructure.h"
-#import "SPTableContent.h"
#import "SPCustomQuery.h"
#import "SPGrowlController.h"
#import "SPSQLParser.h"
diff --git a/Source/SPHistoryController.m b/Source/SPHistoryController.m
index 31db15ee..7f1d3ffd 100644
--- a/Source/SPHistoryController.m
+++ b/Source/SPHistoryController.m
@@ -58,6 +58,7 @@
- (void) awakeFromNib
{
+#warning private ivar accessed from outside
tableContentInstance = [theDocument valueForKey:@"tableContentInstance"];
tablesListInstance = [theDocument valueForKey:@"tablesListInstance"];
toolbarItemVisible = NO;
diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m
index ace6d882..89dd01b4 100644
--- a/Source/SPIndexesController.m
+++ b/Source/SPIndexesController.m
@@ -31,7 +31,6 @@
#import "SPIndexesController.h"
#import "SPAlertSheets.h"
#import "SPServerSupport.h"
-#import "SPTableContent.h"
#import "SPTableData.h"
#import "SPDatabaseDocument.h"
#import "SPTablesList.h"
diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h
index 30b4c587..209b804a 100644
--- a/Source/SPTableContent.h
+++ b/Source/SPTableContent.h
@@ -231,7 +231,7 @@ typedef NS_ENUM(NSInteger, SPTableContentFilterSource) {
- (IBAction)addRow:(id)sender;
- (IBAction)duplicateRow:(id)sender;
- (IBAction)removeRow:(id)sender;
-- (void)removeRowSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo;
+- (void)removeRowSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
// Filter Table
- (IBAction)showFilterTable:(id)sender;
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index 750a4a52..d600f6e2 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -1809,10 +1809,10 @@ static void *TableContentKVOContext = &TableContentKVOContext;
if (![tableContentView numberOfSelectedRows]) return;
NSAlert *alert = [NSAlert alertWithMessageText:@""
- defaultButton:NSLocalizedString(@"Delete", @"delete button")
- alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
- otherButton:nil
- informativeTextWithFormat:@""];
+ defaultButton:NSLocalizedString(@"Delete", @"delete button")
+ alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
+ otherButton:nil
+ informativeTextWithFormat:@""];
[alert setAlertStyle:NSCriticalAlertStyle];
@@ -1869,7 +1869,7 @@ static void *TableContentKVOContext = &TableContentKVOContext;
/**
* Perform the requested row deletion action.
*/
-- (void)removeRowSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo
+- (void)removeRowSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
{
NSMutableIndexSet *selectedRows = [NSMutableIndexSet indexSet];
NSString *wherePart;
@@ -2389,8 +2389,8 @@ static void *TableContentKVOContext = &TableContentKVOContext;
// Store the filter details to use when loading the target table
NSDictionary *filterSettings = [SPRuleFilterController makeSerializedFilterForColumn:[refDictionary objectForKey:@"column"]
- operator:filterComparison
- values:@[targetFilterValue]];
+ operator:filterComparison
+ values:@[targetFilterValue]];
// If the link is within the current table, apply filter settings manually
if ([[refDictionary objectForKey:@"table"] isEqualToString:selectedTable]) {