Refactoring colorFromHex --> colorFromHexString

sveinbjornt · Feb 26, 2017 · 5385113 · 5385113
1 parent a3dff9e
commit 5385113
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Application/PlatypusWindowController.m b/Application/PlatypusWindowController.m
@@ -625,8 +625,8 @@ - (void)controlsFromAppSpec:(PlatypusAppSpec *)spec {
 
     // text settings
     [textSettingsController setTextFont:[NSFont fontWithName:spec[AppSpecKey_TextFont] size:[spec[AppSpecKey_TextSize] intValue]]];
-    [textSettingsController setTextForegroundColor:[NSColor colorFromHex:spec[AppSpecKey_TextColor]]];
-    [textSettingsController setTextBackgroundColor:[NSColor colorFromHex:spec[AppSpecKey_TextBackgroundColor]]];
+    [textSettingsController setTextForegroundColor:[NSColor colorFromHexString:spec[AppSpecKey_TextColor]]];
+    [textSettingsController setTextBackgroundColor:[NSColor colorFromHexString:spec[AppSpecKey_TextBackgroundColor]]];
 
     // status menu settings
     if (InterfaceTypeForString(spec[AppSpecKey_InterfaceType]) == PlatypusInterfaceType_StatusMenu) {

diff --git a/ScriptExec/ScriptExecController.m b/ScriptExec/ScriptExecController.m
@@ -251,18 +251,18 @@ - (void)loadAppSettings {
 
         // foreground color
         if (appSettingsDict[AppSpecKey_TextColor] != nil) {
-            textForegroundColor = [NSColor colorFromHex:appSettingsDict[AppSpecKey_TextColor]];
+            textForegroundColor = [NSColor colorFromHexString:appSettingsDict[AppSpecKey_TextColor]];
         }
         if (textForegroundColor == nil) {
-            textForegroundColor = [NSColor colorFromHex:DEFAULT_TEXT_FG_COLOR];
+            textForegroundColor = [NSColor colorFromHexString:DEFAULT_TEXT_FG_COLOR];
         }
 
         // background color
         if (appSettingsDict[AppSpecKey_TextBackgroundColor] != nil) {
-            textBackgroundColor = [NSColor colorFromHex:appSettingsDict[AppSpecKey_TextBackgroundColor]];
+            textBackgroundColor = [NSColor colorFromHexString:appSettingsDict[AppSpecKey_TextBackgroundColor]];
         }
         if (textBackgroundColor == nil) {
-            textBackgroundColor = [NSColor colorFromHex:DEFAULT_TEXT_BG_COLOR];
+            textBackgroundColor = [NSColor colorFromHexString:DEFAULT_TEXT_BG_COLOR];
         }
     }