10.14 Build Target

SubEthaEdit-Mac/Source/AdvancedPreferences.m

@@ -36,8 +36,8 @@ - (NSString *)mainNibName {
 - (void)mainViewDidLoad {
     NSUserDefaults *defaults=[NSUserDefaults standardUserDefaults];
     BOOL disableState=([defaults objectForKey:@"AppleScreenAdvanceSizeThreshold"] && [[defaults objectForKey:@"AppleScreenAdvanceSizeThreshold"] floatValue]<=1.);
-    [self.O_disableScreenFontsButton setState:disableState?NSOnState:NSOffState];
-    [self.O_synthesiseFontsButton setState:[defaults boolForKey:SynthesiseFontsPreferenceKey]?NSOnState:NSOffState];
+    [self.O_disableScreenFontsButton setState:disableState?NSControlStateValueOn:NSControlStateValueOff];
+    [self.O_synthesiseFontsButton setState:[defaults boolForKey:SynthesiseFontsPreferenceKey]?NSControlStateValueOn:NSControlStateValueOff];
 
     NSString *absolutePath = [[AppController sharedInstance].URLOfInstallCommand path];
     [self.commandLineInstallTextField setStringValue:[@"sudo " stringByAppendingString:[absolutePath stringByReplacingOccurrencesOfString:@" " withString:@"\\ "]]];
@@ -59,15 +59,15 @@ - (IBAction)revealInstallCommandInFinder:(id)sender {
 #pragma mark -
 
 - (IBAction)changeDisableScreenFonts:(id)aSender {
-    if ([aSender state]==NSOnState) {
+    if ([aSender state]==NSControlStateValueOn) {
         [[NSUserDefaults standardUserDefaults] setFloat:1. forKey:@"AppleScreenAdvanceSizeThreshold"];
     } else {
         [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"AppleScreenAdvanceSizeThreshold"];
     }
 }
 
 - (IBAction)changeSynthesiseFonts:(id)aSender {
-    [[NSUserDefaults standardUserDefaults] setBool:[aSender state]==NSOnState forKey:SynthesiseFontsPreferenceKey];
+    [[NSUserDefaults standardUserDefaults] setBool:[aSender state]==NSControlStateValueOn forKey:SynthesiseFontsPreferenceKey];
     // trigger update
     [[[SEEDocumentController sharedInstance] documents] makeObjectsPerformSelector:@selector(applyStylePreferences)];
 }

SubEthaEdit-Mac/Source/AppController.m

@@ -704,7 +704,7 @@ - (void)addDocumentNewSubmenuEntriesToMenu:(NSMenu *)aMenu {
 			}
 			item.keyEquivalent = @"";
 			if (isSelectedModeItem) {
-				item.state = NSOnState;
+				item.state = NSControlStateValueOn;
 			}
 			item;
 		})];
@@ -715,7 +715,7 @@ - (void)addDocumentNewSubmenuEntriesToMenu:(NSMenu *)aMenu {
 			[alternateItem setKeyEquivalentModifierMask:NSEventModifierFlagOption];
 			[alternateItem setTitle:[NSString stringWithFormat:NSLocalizedString(!inTabs?@"MODE_IN_NEW_TAB_CONTEXT_MENU_TEXT":@"MODE_IN_NEW_WINDOW_CONTEXT_MENU_TEXT",@""),[normalItem title]]];
 			if (isSelectedModeItem) {
-				alternateItem.state = NSOnState;
+				alternateItem.state = NSControlStateValueOn;
 			}
 			[aMenu addItem:alternateItem];
 

SubEthaEdit-Mac/Source/Debug/DebugPreferences.m

@@ -75,9 +75,9 @@ - (void)mainViewDidLoad {
     // Initialize user interface elements to reflect current preference settings
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     BOOL enableDebugMenu = [defaults boolForKey:@"EnableDebugMenu"];
-	[toggleDebugMenuCheckBox setState:(enableDebugMenu ? NSOnState : NSOffState)];
+	[toggleDebugMenuCheckBox setState:(enableDebugMenu ? NSControlStateValueOn : NSControlStateValueOff)];
 	BOOL enableBEEPLogging = [defaults boolForKey:@"EnableBEEPLogging"];
-	[toggleBEEPLoggingCheckBox setState:(enableBEEPLogging ? NSOnState : NSOffState)];
+	[toggleBEEPLoggingCheckBox setState:(enableBEEPLogging ? NSControlStateValueOn : NSControlStateValueOff)];
     [[DebugController sharedInstance] enableDebugMenu:enableDebugMenu];
 }
 
@@ -89,20 +89,20 @@ - (void)didUnselect {
 
 - (IBAction)toggleDebugMenu:(id)sender {
     int state = [sender state];
-    if (state == NSOnState) {
+    if (state == NSControlStateValueOn) {
         [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"EnableDebugMenu"];
         [[DebugController sharedInstance] enableDebugMenu:YES];
-    } else if (state == NSOffState) {
+    } else if (state == NSControlStateValueOff) {
         [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"EnableDebugMenu"];        
         [[DebugController sharedInstance] enableDebugMenu:NO];
     }
 }
 
 - (IBAction)toggleBEEPLogging:(id)sender {
     int state = [sender state];
-    if (state == NSOnState) {
+    if (state == NSControlStateValueOn) {
         [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"EnableBEEPLogging"];
-    } else if (state == NSOffState) {
+    } else if (state == NSControlStateValueOff) {
         [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"EnableBEEPLogging"];        
     }
 }

SubEthaEdit-Mac/Source/DocumentMode.m

@@ -341,7 +341,7 @@ - (instancetype)initWithBundle:(NSBundle *)aBundle {
             [_defaults setObject:@NO forKey:DocumentModeUTF8BOMPreferenceKey];
 
 			// ignore deprecated color settings, but still set them for backwards compatability
-			NSValueTransformer *transformer=[NSValueTransformer valueTransformerForName:NSUnarchiveFromDataTransformerName];
+            NSValueTransformer *transformer=[NSValueTransformer valueTransformerForName:NSSecureUnarchiveFromDataTransformerName];
 			[_defaults setObject:[transformer reverseTransformedValue:[NSColor blackColor]] forKey:DocumentModeForegroundColorPreferenceKey];
             [_defaults setObject:[transformer reverseTransformedValue:[NSColor whiteColor]] forKey:DocumentModeBackgroundColorPreferenceKey];
             [[EncodingManager sharedInstance] registerEncoding:NoStringEncoding];
@@ -568,13 +568,13 @@ - (SyntaxStyle *)defaultSyntaxStyle {
 
 		SEEStyleSheet *styleSheet = [self styleSheetForLanguageContext:nil];
 		NSColor *highlightColor = styleSheet?[[styleSheet styleAttributesForScope:@"meta.highlight.currentline"] objectForKey:@"color"]:[NSColor yellowColor];
-		[_defaults setObject:[[NSValueTransformer valueTransformerForName:NSUnarchiveFromDataTransformerName] reverseTransformedValue:highlightColor] forKey:DocumentModeCurrentLineHighlightColorPreferenceKey];
+        [_defaults setObject:[[NSValueTransformer valueTransformerForName:NSSecureUnarchiveFromDataTransformerName] reverseTransformedValue:highlightColor] forKey:DocumentModeCurrentLineHighlightColorPreferenceKey];
 
         if (![_defaults objectForKey:DocumentModeBackgroundColorIsDarkPreferenceKey]) {
             [_defaults setObject:@NO forKey:DocumentModeBackgroundColorIsDarkPreferenceKey];
             if ([self isBaseMode] && [_defaults objectForKey:DocumentModeBackgroundColorPreferenceKey]) {
                 // take old background and foreground color settings
-                NSValueTransformer *transformer=[NSValueTransformer valueTransformerForName:NSUnarchiveFromDataTransformerName];
+                NSValueTransformer *transformer=[NSValueTransformer valueTransformerForName:NSSecureUnarchiveFromDataTransformerName];
                 NSColor *color=nil;
 
                 color=[transformer transformedValue:[_defaults objectForKey:DocumentModeBackgroundColorPreferenceKey]];

SubEthaEdit-Mac/Source/EditPreferences.m

@@ -44,9 +44,9 @@ - (void)documentModeListChanged:(NSNotification *)aNotification {
 - (IBAction)validateDefaultsState:(id)aSender {
     DocumentMode *baseMode=[[DocumentModeManager sharedInstance] baseMode];
     DocumentMode *selectedMode=[O_modeController content];
-    [O_viewController setContent:([O_viewDefaultButton state]==NSOnState)?baseMode:selectedMode];
-    [O_editController setContent:([O_editDefaultButton state]==NSOnState)?baseMode:selectedMode];
-    [O_fileController setContent:([O_fileDefaultButton state]==NSOnState)?baseMode:selectedMode];
+    [O_viewController setContent:([O_viewDefaultButton state]==NSControlStateValueOn)?baseMode:selectedMode];
+    [O_editController setContent:([O_editDefaultButton state]==NSControlStateValueOn)?baseMode:selectedMode];
+    [O_fileController setContent:([O_fileDefaultButton state]==NSControlStateValueOn)?baseMode:selectedMode];
 }
 
 - (IBAction)changeMode:(id)aSender {

SubEthaEdit-Mac/Source/EncodingManager.m

@@ -344,7 +344,7 @@ - (void)noteEncodingListChange:(BOOL)writeDefault updateList:(BOOL)updateList po
         int cnt, numEncodings = [self.encodingMatrix numberOfRows];
         for (cnt = 0; cnt < numEncodings; cnt++) {
             NSCell *cell = [self.encodingMatrix cellAtRow:cnt column:0];
-            [cell setState:[encodings containsObject:[NSNumber numberWithUnsignedInt:[cell tag]]] ? NSOnState : NSOffState];
+            [cell setState:[encodings containsObject:[NSNumber numberWithUnsignedInt:[cell tag]]] ? NSControlStateValueOn : NSControlStateValueOff];
             if ([registeredEncodings containsObject:[NSNumber numberWithUnsignedInt:[cell tag]]] ||
                 [cell tag] == NSUTF8StringEncoding || [cell tag] == NSUnicodeStringEncoding) {
                 [cell setEnabled:NO];
@@ -377,7 +377,7 @@ - (IBAction)encodingListChanged:(id)sender {
 
     for (cnt = 0; cnt < numRows; cnt++) {
         NSCell *cell = [self.encodingMatrix cellAtRow:cnt column:0];
-        if (((NSUInteger)[cell tag] != NoStringEncoding) && ([cell state] == NSOnState)) [encs addObject:[NSNumber numberWithUnsignedInt:[cell tag]]];
+        if (((NSUInteger)[cell tag] != NoStringEncoding) && ([cell state] == NSControlStateValueOn)) [encs addObject:[NSNumber numberWithUnsignedInt:[cell tag]]];
     }
 
     encodings = encs;

SubEthaEdit-Mac/Source/FindAllTableView.m

@@ -28,10 +28,10 @@ - (void)copy:(id)sender {
         }
     }
 
-    [pb declareTypes: [NSArray arrayWithObject:NSStringPboardType] 
+    [pb declareTypes: [NSArray arrayWithObject:NSPasteboardTypeString]
         owner:nil];
 
-    [pb setString:string forType: NSStringPboardType];
+    [pb setString:string forType:NSPasteboardTypeString];
 }
 
 - (void)paste:(id)sender {

SubEthaEdit-Mac/Source/FindReplaceController.m

@@ -426,8 +426,8 @@ - (void)applicationWillResign:(NSNotification *)notification {
 - (NSString *)pasteboardFindString {
 	NSString *result = nil;
     NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSPasteboardNameFind];
-    if ([[pasteboard types] containsObject:NSStringPboardType]) {
-        result = [pasteboard stringForType:NSStringPboardType];
+    if ([[pasteboard types] containsObject:NSPasteboardTypeString]) {
+        result = [pasteboard stringForType:NSPasteboardTypeString];
 	}
 	return result;
 }
@@ -444,8 +444,8 @@ - (void)saveFindStringToPasteboard {
 	NSString *pasteboardFindString = [self pasteboardFindString];
 	if (currentFindString && ![currentFindString isEqualToString:pasteboardFindString]) {
 		NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSPasteboardNameFind];
-		[pasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
-		[pasteboard setString:currentFindString forType:NSStringPboardType];
+		[pasteboard declareTypes:[NSArray arrayWithObject:NSPasteboardTypeString] owner:nil];
+		[pasteboard setString:currentFindString forType:NSPasteboardTypeString];
 	}
 }
 

SubEthaEdit-Mac/Source/GeneralPreferences.m

@@ -56,7 +56,7 @@ - (IBAction)toggleLocalHighlightDefault:(id)aSender {
 
 	if ([aSender isKindOfClass:[NSButton class]]) {
 		NSButton *button = (NSButton *)aSender;
-		isEnabled = (button.state == NSOnState);
+		isEnabled = (button.state == NSControlStateValueOn);
 	} else {
 		isEnabled = ![defaults boolForKey:HighlightChangesAlonePreferenceKey];
 	}
@@ -125,9 +125,9 @@ - (void)setLocalChangesHighlightButtonStateFromDefaults {
 
 - (void)setLocalChangesHighlightButtonState:(BOOL)isEnabled {
 	if (isEnabled) {
-		[self.O_highlightLocalChangesButton setState:NSOnState];
+		[self.O_highlightLocalChangesButton setState:NSControlStateValueOn];
 	} else {
-		[self.O_highlightLocalChangesButton setState:NSOffState];
+		[self.O_highlightLocalChangesButton setState:NSControlStateValueOff];
 	}
 }
 

SubEthaEdit-Mac/Source/HueToColorValueTransformer.m

@@ -30,7 +30,7 @@ - (id)transformedValue:(id)aValue {
 - (id)reverseTransformedValue:(id)value {
     if (![value isKindOfClass:[NSColor class]]) return nil;
 
-	NSColor *color = [(NSColor *)value colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+	NSColor *color = [(NSColor *)value colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
     CGFloat hue = 0.0;
     [color getHue:&hue saturation:NULL brightness:NULL alpha:NULL];
 

SubEthaEdit-Mac/Source/NSColorTCMAdditions.m

@@ -54,7 +54,7 @@ + (NSColor *)colorForHTMLString:(NSString *) htmlString
 }
 
 - (NSString *)shortHTMLString {
-    NSColor *color=[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+    NSColor *color=[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
     NSString *result=[NSString stringWithFormat:@"#%01x%01x%01x",
                                   (int)([color   redComponent]*15.+.5),
                                   (int)([color greenComponent]*15.+.5),
@@ -63,7 +63,7 @@ - (NSString *)shortHTMLString {
 }
 
 - (NSString *)HTMLString {
-    NSColor *color=[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+    NSColor *color=[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
     NSString *result=[NSString stringWithFormat:@"#%02x%02x%02x",
                                   (int)([color   redComponent]*255.+.5),
                                   (int)([color greenComponent]*255.+.5),
@@ -72,19 +72,19 @@ - (NSString *)HTMLString {
 }
 
 - (BOOL)isDark {
-    float brightness=[[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace] brightnessComponent];
+    float brightness=[[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]] brightnessComponent];
     return (brightness<.5);
 }
 
 - (NSColor *)brightnessInvertedColor {
     CGFloat alpha = self.alphaComponent;
-    NSColor *color=[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+    NSColor *color=[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
     NSColor *invertedColor=[NSColor colorWithCalibratedRed:1.0-[color redComponent] green:1.0-[color greenComponent] blue:1.0-[color blueComponent] alpha:1.0];
     return [NSColor colorWithCalibratedHue:[color hueComponent] saturation:[invertedColor saturationComponent] brightness:[invertedColor brightnessComponent] alpha:alpha];
 }
 
 - (NSColor *)brightnessInvertedSelectionColor {
-    NSColor *color=[self colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+    NSColor *color=[self colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
     NSColor *invertedColor=[NSColor colorWithCalibratedRed:1.0-[color redComponent] green:1.0-[color greenComponent] blue:1.0-[color blueComponent] alpha:1.0];
     return [NSColor colorWithCalibratedHue:[color hueComponent] saturation:[invertedColor saturationComponent] brightness:MAX([invertedColor brightnessComponent],0.6) alpha:1.0];
 }

SubEthaEdit-Mac/Source/NSImageTCMAdditions.m

@@ -112,7 +112,7 @@ + (NSImage *)highResolutionImageWithSize:(NSSize)inSize usingDrawingBlock:(void
 																							   hasAlpha:YES
 																							   isPlanar:NO
 																						 colorSpaceName:NSCalibratedRGBColorSpace
-																						   bitmapFormat:NSAlphaFirstBitmapFormat
+                                                                                           bitmapFormat:NSBitmapFormatAlphaFirst
 																							bytesPerRow:0
 																						   bitsPerPixel:0];
 
@@ -136,7 +136,7 @@ + (NSImage *)highResolutionImageWithSize:(NSSize)inSize usingDrawingBlock:(void
 																								hasAlpha:YES
 																								isPlanar:NO
 																						  colorSpaceName:NSCalibratedRGBColorSpace
-																							bitmapFormat:NSAlphaFirstBitmapFormat
+                                                                                            bitmapFormat:NSBitmapFormatAlphaFirst
 																							 bytesPerRow:0
 																							bitsPerPixel:0];
 
@@ -210,7 +210,7 @@ + (NSImage *)pdfBasedImageNamed:(NSString *)aName {
 			[[NSColor clearColor] set];
 			NSRectFill(dstRect);
 
-			CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
+            CGContextRef context = [[NSGraphicsContext currentContext] CGContext];
 
 			CGSize layerScale = CGSizeMake(CGBitmapContextGetWidth(context) / fullRect.size.width,
 										   CGBitmapContextGetHeight(context) / fullRect.size.height);
@@ -396,7 +396,7 @@ - (NSImage *)dimmedImage {
             NSBezierPath *roundedRectanglePath = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(roundRect, strokeWidth/2.0, strokeWidth/2.0) xRadius:strokeWidth * 1.5 yRadius:strokeWidth * 1.5];
 
             // getting a good dark background for this hue
-            CGFloat hue = [[aColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace] hueComponent];
+            CGFloat hue = [[aColor colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]] hueComponent];
             [[NSColor colorWithHue:hue saturation:1.0 brightness:0.25 alpha:1.0] set];
             [roundedRectanglePath fill];
 
@@ -410,7 +410,7 @@ - (NSImage *)dimmedImage {
             [aColor set];
             [roundedRectanglePath stroke];
         }
-		CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
+        CGContextRef context = [[NSGraphicsContext currentContext] CGContext];
 
 		[[NSColor whiteColor] setFill];
 		CGContextSetLineCap(context, kCGLineCapRound);

SubEthaEdit-Mac/Source/NSMenuTCMAdditions.m

@@ -30,11 +30,11 @@ - (void)setMark:(BOOL)aMark {
 
 		if (image) {
 			[self setMixedStateImage:image];
-			[self setState:NSMixedState];
+			[self setState:NSControlStateValueMixed];
 		}
 	} else {
 		[self setMixedStateImage:[NSImage imageNamed:NSImageNameMenuMixedStateTemplate]];
-		[self setState:NSOffState];
+		[self setState:NSControlStateValueOff];
 	}
 }