From 06498672ab0b0cb828fbcab31f22fc8797bdab30 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 28 Mar 2019 14:29:50 -0700 Subject: [PATCH 1/4] Fixed: Changed CPColor parameter type from string to CPString Parameter type in CPColor was string, changed here to CPString, to make it more inline with other string parameter types. --- AppKit/CPColor.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPColor.j b/AppKit/CPColor.j index 2ba97a1cc..5866fb0d4 100644 --- a/AppKit/CPColor.j +++ b/AppKit/CPColor.j @@ -267,7 +267,7 @@ var cachedBlackColor, @return an initialized RGB color */ -+ (CPColor)colorWithHexString:(string)hex ++ (CPColor)colorWithHexString:(CPString)hex { var rgba = hexToRGB(hex); return rgba ? [[CPColor alloc] _initWithRGBA: rgba] : null; From 3699a31f2843610f267d0d7901a49bc163ace478 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 28 Mar 2019 14:31:17 -0700 Subject: [PATCH 2/4] Revert "Formatting: Removed extra semi-colon ThemeDescriptors.j" This reverts commit 75cd5a75e1b750879c51cc7800a0820f1753aac2. --- AppKit/Themes/Aristo/ThemeDescriptors.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 1b87eef24..6902f92c7 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -2152,7 +2152,7 @@ var themedButtonValues = nil, [segmentedControl setTag:3 forSegment:2]; return segmentedControl; -} +}; + (CPSegmentedControl)themedSegmentedControl { From 8598fe8ad9e1e5524ad153058b9ef5a571f343b9 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 28 Mar 2019 14:32:00 -0700 Subject: [PATCH 3/4] Revert "Fixed: Changed CPColor parameter type from string to CPString" This reverts commit 06498672ab0b0cb828fbcab31f22fc8797bdab30. --- AppKit/CPColor.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPColor.j b/AppKit/CPColor.j index 5866fb0d4..2ba97a1cc 100644 --- a/AppKit/CPColor.j +++ b/AppKit/CPColor.j @@ -267,7 +267,7 @@ var cachedBlackColor, @return an initialized RGB color */ -+ (CPColor)colorWithHexString:(CPString)hex ++ (CPColor)colorWithHexString:(string)hex { var rgba = hexToRGB(hex); return rgba ? [[CPColor alloc] _initWithRGBA: rgba] : null; From 34ac4cd23bd8722fae20101fd45cbc1abcf7c5f8 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 28 Mar 2019 14:33:00 -0700 Subject: [PATCH 4/4] Fixed: Changed CPColor parameter from string to CPString Parameter type in CPColor was string, changed here to CPString, to make it more inline with other string parameter types. --- AppKit/CPColor.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPColor.j b/AppKit/CPColor.j index 2ba97a1cc..5866fb0d4 100644 --- a/AppKit/CPColor.j +++ b/AppKit/CPColor.j @@ -267,7 +267,7 @@ var cachedBlackColor, @return an initialized RGB color */ -+ (CPColor)colorWithHexString:(string)hex ++ (CPColor)colorWithHexString:(CPString)hex { var rgba = hexToRGB(hex); return rgba ? [[CPColor alloc] _initWithRGBA: rgba] : null;