Minor changes

sequelpro · May 13, 2018 · 146d45c50163c742b9f028bb994feaa179c4a505 · 146d45c
1 parent c2fe67b
commit 146d45c50163c742b9f028bb994feaa179c4a505
Unified Split

Showing with 10 additions and 11 deletions.

+1 −1 Source/SPContentFilterManager.m

+0 −1 Source/SPDataImport.m

+1 −0 Source/SPHistoryController.m

+0 −1 Source/SPIndexesController.m

+1 −1 Source/SPTableContent.h

+7 −7 Source/SPTableContent.m
diff --git 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 @@ - (NSMutableArray *)contentFilterForFileURL:(NSURL *)fileURL
  */
 - (id)customQueryInstance
 {
+#warning private ivar accessed from outside
 	return [tableDocumentInstance valueForKey:@"customQueryInstance"];
 }
 

diff --git 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
@@ -58,6 +58,7 @@ - (id) init
 
 - (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
@@ -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
@@ -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
@@ -1809,10 +1809,10 @@ - (IBAction)removeRow:(id)sender
 	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 @@ - (IBAction)removeRow:(id)sender
 /**
  * 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 @@ - (void)clickLinkArrowTask:(SPTextAndLinkCell *)theArrowCell
 
 		// 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]) {