aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/SPEditorPreferencePane.m2
-rw-r--r--Source/SPExportFileUtilities.m5
-rw-r--r--Source/SPPreferencesUpgrade.m4
-rw-r--r--Source/SPTextView.m6
4 files changed, 7 insertions, 10 deletions
diff --git a/Source/SPEditorPreferencePane.m b/Source/SPEditorPreferencePane.m
index 0cae1217..51ffacf6 100644
--- a/Source/SPEditorPreferencePane.m
+++ b/Source/SPEditorPreferencePane.m
@@ -757,7 +757,7 @@ static NSString *SPDefaultExportColourSchemeName = @"MyTheme";
nil,
NSLocalizedString(@"Unsaved Theme", @"unsaved theme message"),
NSLocalizedString(@"The current color theme is unsaved. Do you want to proceed without saving it?", @"unsaved theme informative message"),
- checkForUnsavedThemeSheetStatus
+ &checkForUnsavedThemeSheetStatus
);
return (checkForUnsavedThemeSheetStatus == NSAlertDefaultReturn);
diff --git a/Source/SPExportFileUtilities.m b/Source/SPExportFileUtilities.m
index d39aee17..efa824f8 100644
--- a/Source/SPExportFileUtilities.m
+++ b/Source/SPExportFileUtilities.m
@@ -139,15 +139,10 @@
}
}
- // Compare the count of exported files to the count of failed files
- NSUInteger totalFilesExported = [exportFiles count];
-
// If all the files failed, show a simplified export dialog
-
// If only some of the files failed, show an export dialog with the option to ignore the failed files.
-
// For single files, show a dialog very close to the OS dialog
if (i > 0) {
diff --git a/Source/SPPreferencesUpgrade.m b/Source/SPPreferencesUpgrade.m
index edeb9b10..1583d5fb 100644
--- a/Source/SPPreferencesUpgrade.m
+++ b/Source/SPPreferencesUpgrade.m
@@ -34,8 +34,8 @@
*/
void SPApplyRevisionChanges(void)
{
- NSInteger i;
- NSInteger currentVersionNumber, recordedVersionNumber = 0;
+ NSUInteger i;
+ NSUInteger currentVersionNumber, recordedVersionNumber = 0;
NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
diff --git a/Source/SPTextView.m b/Source/SPTextView.m
index 769d4be8..d009d03c 100644
--- a/Source/SPTextView.m
+++ b/Source/SPTextView.m
@@ -74,6 +74,8 @@ YY_BUFFER_STATE yy_scan_string (const char *);
#pragma mark -
+NSInteger _alphabeticSort(id string1, id string2, void *reverse);
+
// some helper functions for handling rectangles and points
// needed in roundedBezierPathAroundRange:
static inline CGFloat SPRectTop(NSRect rectangle) { return rectangle.origin.y; }
@@ -102,7 +104,7 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS
/**
* Sort function (mainly used to sort the words in the textView)
*/
-NSInteger alphabeticSort(id string1, id string2, void *reverse)
+NSInteger _alphabeticSort(id string1, id string2, void *reverse)
{
return [string1 localizedCaseInsensitiveCompare:string2];
}
@@ -284,7 +286,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
NSInteger reverseSort = NO;
- for(id w in [[uniqueArray allObjects] sortedArrayUsingFunction:alphabeticSort context:&reverseSort])
+ for(id w in [[uniqueArray allObjects] sortedArrayUsingFunction:_alphabeticSort context:&reverseSort])
[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:w, @"display", @"dummy-small", @"image", nil]];
}