From 3fc60027351fc2ef06ba48ed74b80598700c2b13 Mon Sep 17 00:00:00 2001 From: Adam Linkhart Date: Wed, 12 Mar 2014 13:37:26 -0400 Subject: [PATCH] Upgraded to ARC and supporting Xcode 5.1 --- Classes/OMColorFrameView.h | 2 +- Classes/OMColorFrameView.m | 8 +------ Classes/OMColorHelper.h | 6 ++--- Classes/OMColorHelper.m | 32 +++++++++----------------- Classes/OMPlainColorWell.h | 2 +- Classes/OMPlainColorWell.m | 8 +------ Info.plist | 1 + OMColorSense.xcodeproj/project.pbxproj | 4 +++- 8 files changed, 22 insertions(+), 41 deletions(-) diff --git a/Classes/OMColorFrameView.h b/Classes/OMColorFrameView.h index ddceb72..e724878 100644 --- a/Classes/OMColorFrameView.h +++ b/Classes/OMColorFrameView.h @@ -13,6 +13,6 @@ NSColor *_color; } -@property (nonatomic, retain) NSColor *color; +@property (nonatomic, strong) NSColor *color; @end diff --git a/Classes/OMColorFrameView.m b/Classes/OMColorFrameView.m index db14d0c..413b766 100644 --- a/Classes/OMColorFrameView.m +++ b/Classes/OMColorFrameView.m @@ -21,16 +21,10 @@ - (void)drawRect:(NSRect)dirtyRect - (void)setColor:(NSColor *)color { if (color != _color) { - [_color release]; - _color = [color retain]; + _color = color; [self setNeedsDisplay:YES]; } } -- (void)dealloc -{ - [_color release]; - [super dealloc]; -} @end diff --git a/Classes/OMColorHelper.h b/Classes/OMColorHelper.h index 43beb84..51b663a 100644 --- a/Classes/OMColorHelper.h +++ b/Classes/OMColorHelper.h @@ -48,9 +48,9 @@ BOOL OMColorTypeIsNSColor(OMColorType colorType) { return colorType >= OMColorTy NSRegularExpression *_constantColorRegex; } -@property (nonatomic, retain) OMPlainColorWell *colorWell; -@property (nonatomic, retain) OMColorFrameView *colorFrameView; -@property (nonatomic, retain) NSTextView *textView; +@property (nonatomic, strong) OMPlainColorWell *colorWell; +@property (nonatomic, strong) OMColorFrameView *colorFrameView; +@property (nonatomic, strong) NSTextView *textView; @property (nonatomic, assign) NSRange selectedColorRange; @property (nonatomic, assign) OMColorType selectedColorType; diff --git a/Classes/OMColorHelper.m b/Classes/OMColorHelper.m index 713ed68..a2e0a03 100755 --- a/Classes/OMColorHelper.m +++ b/Classes/OMColorHelper.m @@ -50,11 +50,11 @@ - (id)init [NSColor brownColor], @"brown", [[NSColor clearColor] colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]], @"clear", nil]; - _rgbaUIColorRegex = [[NSRegularExpression regularExpressionWithPattern:@"(\\[\\s*UIColor\\s+colorWith|\\[\\s*\\[\\s*UIColor\\s+alloc\\]\\s*initWith)Red:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+green:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+blue:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*alpha:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*\\]" options:0 error:NULL] retain]; - _whiteUIColorRegex = [[NSRegularExpression regularExpressionWithPattern:@"(\\[\\s*UIColor\\s+colorWith|\\[\\s*\\[\\s*UIColor\\s+alloc\\]\\s*initWith)White:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+alpha:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*\\]" options:0 error:NULL] retain]; - _rgbaNSColorRegex = [[NSRegularExpression regularExpressionWithPattern:@"\\[\\s*NSColor\\s+colorWith(Calibrated|Device)Red:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+green:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+blue:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+alpha:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*\\]" options:0 error:NULL] retain]; - _whiteNSColorRegex = [[NSRegularExpression regularExpressionWithPattern:@"\\[\\s*NSColor\\s+colorWith(Calibrated|Device)White:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+alpha:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*\\]" options:0 error:NULL] retain]; - _constantColorRegex = [[NSRegularExpression regularExpressionWithPattern:@"\\[\\s*(UI|NS)Color\\s+(black|darkGray|lightGray|white|gray|red|green|blue|cyan|yellow|magenta|orange|purple|brown|clear)Color\\s*\\]" options:0 error:NULL] retain]; + _rgbaUIColorRegex = [NSRegularExpression regularExpressionWithPattern:@"(\\[\\s*UIColor\\s+colorWith|\\[\\s*\\[\\s*UIColor\\s+alloc\\]\\s*initWith)Red:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+green:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+blue:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*alpha:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*\\]" options:0 error:NULL]; + _whiteUIColorRegex = [NSRegularExpression regularExpressionWithPattern:@"(\\[\\s*UIColor\\s+colorWith|\\[\\s*\\[\\s*UIColor\\s+alloc\\]\\s*initWith)White:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+alpha:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*\\]" options:0 error:NULL]; + _rgbaNSColorRegex = [NSRegularExpression regularExpressionWithPattern:@"\\[\\s*NSColor\\s+colorWith(Calibrated|Device)Red:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+green:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+blue:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+alpha:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*\\]" options:0 error:NULL]; + _whiteNSColorRegex = [NSRegularExpression regularExpressionWithPattern:@"\\[\\s*NSColor\\s+colorWith(Calibrated|Device)White:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s+alpha:\\s*([0-9]*\\.?[0-9]*f?)\\s*(\\/\\s*[0-9]*\\.?[0-9]*f?)?\\s*\\]" options:0 error:NULL]; + _constantColorRegex = [NSRegularExpression regularExpressionWithPattern:@"\\[\\s*(UI|NS)Color\\s+(black|darkGray|lightGray|white|gray|red|green|blue|cyan|yellow|magenta|orange|purple|brown|clear)Color\\s*\\]" options:0 error:NULL]; } return self; } @@ -65,23 +65,23 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification if (editMenuItem) { [[editMenuItem submenu] addItem:[NSMenuItem separatorItem]]; - NSMenuItem *toggleColorHighlightingMenuItem = [[[NSMenuItem alloc] initWithTitle:@"Show Colors Under Caret" action:@selector(toggleColorHighlightingEnabled:) keyEquivalent:@""] autorelease]; + NSMenuItem *toggleColorHighlightingMenuItem = [[NSMenuItem alloc] initWithTitle:@"Show Colors Under Caret" action:@selector(toggleColorHighlightingEnabled:) keyEquivalent:@""]; [toggleColorHighlightingMenuItem setTarget:self]; [[editMenuItem submenu] addItem:toggleColorHighlightingMenuItem]; - NSMenuItem *colorInsertionModeItem = [[[NSMenuItem alloc] initWithTitle:@"Color Insertion Mode" action:nil keyEquivalent:@""] autorelease]; - NSMenuItem *colorInsertionModeNSItem = [[[NSMenuItem alloc] initWithTitle:@"NSColor" action:@selector(selectNSColorInsertionMode:) keyEquivalent:@""] autorelease]; + NSMenuItem *colorInsertionModeItem = [[NSMenuItem alloc] initWithTitle:@"Color Insertion Mode" action:nil keyEquivalent:@""]; + NSMenuItem *colorInsertionModeNSItem = [[NSMenuItem alloc] initWithTitle:@"NSColor" action:@selector(selectNSColorInsertionMode:) keyEquivalent:@""]; [colorInsertionModeNSItem setTarget:self]; - NSMenuItem *colorInsertionModeUIItem = [[[NSMenuItem alloc] initWithTitle:@"UIColor" action:@selector(selectUIColorInsertionMode:) keyEquivalent:@""] autorelease]; + NSMenuItem *colorInsertionModeUIItem = [[NSMenuItem alloc] initWithTitle:@"UIColor" action:@selector(selectUIColorInsertionMode:) keyEquivalent:@""]; [colorInsertionModeUIItem setTarget:self]; - NSMenu *colorInsertionModeMenu = [[[NSMenu alloc] initWithTitle:@"Color Insertion Mode"] autorelease]; + NSMenu *colorInsertionModeMenu = [[NSMenu alloc] initWithTitle:@"Color Insertion Mode"]; [colorInsertionModeItem setSubmenu:colorInsertionModeMenu]; [[colorInsertionModeItem submenu] addItem:colorInsertionModeUIItem]; [[colorInsertionModeItem submenu] addItem:colorInsertionModeNSItem]; [[editMenuItem submenu] addItem:colorInsertionModeItem]; - NSMenuItem *insertColorMenuItem = [[[NSMenuItem alloc] initWithTitle:@"Insert Color..." action:@selector(insertColor:) keyEquivalent:@""] autorelease]; + NSMenuItem *insertColorMenuItem = [[NSMenuItem alloc] initWithTitle:@"Insert Color..." action:@selector(insertColor:) keyEquivalent:@""]; [insertColorMenuItem setTarget:self]; [[editMenuItem submenu] addItem:insertColorMenuItem]; } @@ -502,16 +502,6 @@ - (NSString *)colorStringForColor:(NSColor *)color withType:(OMColorType)colorTy - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - [_colorWell release]; - [_colorFrameView release]; - [_textView release]; - [_constantColorsByName release]; - [_rgbaUIColorRegex release]; - [_whiteUIColorRegex release]; - [_constantColorsByName release]; - [_whiteNSColorRegex release]; - [_rgbaNSColorRegex release]; - [super dealloc]; } @end diff --git a/Classes/OMPlainColorWell.h b/Classes/OMPlainColorWell.h index 888177a..32254b4 100644 --- a/Classes/OMPlainColorWell.h +++ b/Classes/OMPlainColorWell.h @@ -13,6 +13,6 @@ NSColor *_strokeColor; } -@property (nonatomic, retain) NSColor *strokeColor; +@property (nonatomic, strong) NSColor *strokeColor; @end diff --git a/Classes/OMPlainColorWell.m b/Classes/OMPlainColorWell.m index 765b9f2..c9c69a4 100644 --- a/Classes/OMPlainColorWell.m +++ b/Classes/OMPlainColorWell.m @@ -36,16 +36,10 @@ - (void)deactivate - (void)setStrokeColor:(NSColor *)strokeColor { if (strokeColor != _strokeColor) { - [_strokeColor release]; - _strokeColor = [strokeColor retain]; + _strokeColor = strokeColor; [self setNeedsDisplay:YES]; } } -- (void)dealloc -{ - [_strokeColor release]; - [super dealloc]; -} @end diff --git a/Info.plist b/Info.plist index 1510bcc..55f3084 100755 --- a/Info.plist +++ b/Info.plist @@ -26,6 +26,7 @@ DVTPlugInCompatibilityUUIDs + A2E4D43F-41F4-4FB9-BB94-7177011C9AED 640F884E-CE55-4B40-87C0-8869546CAB7A 63FC1C47-140D-42B0-BB4D-A10B2D225574 37B30044-3B14-46BA-ABAA-F01000C27B63 diff --git a/OMColorSense.xcodeproj/project.pbxproj b/OMColorSense.xcodeproj/project.pbxproj index 2843686..9bcef85 100755 --- a/OMColorSense.xcodeproj/project.pbxproj +++ b/OMColorSense.xcodeproj/project.pbxproj @@ -154,13 +154,15 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = "$(HOME)"; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_GC = supported; + GCC_ENABLE_OBJC_GC = unsupported; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist;