Convert to Objective-C ARC

Author: rowanj

ApplicationController.m

@@ -237,7 +237,7 @@ - (NSManagedObjectModel *)managedObjectModel {
         return managedObjectModel;
     }
 
-    managedObjectModel = [[NSManagedObjectModel mergedModelFromBundles:nil] retain];    
+    managedObjectModel = [NSManagedObjectModel mergedModelFromBundles:nil];    
     return managedObjectModel;
 }
 
@@ -392,10 +392,9 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
 
 - (void) dealloc {
 
-    [managedObjectContext release], managedObjectContext = nil;
-    [persistentStoreCoordinator release], persistentStoreCoordinator = nil;
-    [managedObjectModel release], managedObjectModel = nil;
-    [super dealloc];
+    managedObjectContext = nil;
+    persistentStoreCoordinator = nil;
+    managedObjectModel = nil;
 }
 
 

DBPrefsWindowController.m

@@ -74,14 +74,14 @@ - (void)windowDidLoad
 		// Create a new window to display the preference views.
 		// If the developer attached a window to this controller
 		// in Interface Builder, it gets replaced with this one.
-	NSPanel *panel = [[[NSPanel alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
+	NSPanel *panel = [[NSPanel alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
 												    styleMask:(NSTitledWindowMask |
 															   NSClosableWindowMask |
 															   NSMiniaturizableWindowMask)
 													  backing:NSBackingStoreBuffered
-													    defer:YES] autorelease];
+													    defer:YES];
 	[self setWindow:panel];
-	contentSubview = [[[NSView alloc] initWithFrame:[[[self window] contentView] frame]] autorelease];
+	contentSubview = [[NSView alloc] initWithFrame:[[[self window] contentView] frame]];
 	[contentSubview setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
 	[[[self window] contentView] addSubview:contentSubview];
 	[[self window] setShowsToolbarButton:NO];
@@ -90,13 +90,6 @@ - (void)windowDidLoad
 
 
 
-- (void) dealloc {
-	[toolbarIdentifiers release];
-	[toolbarViews release];
-	[toolbarItems release];
-	[viewAnimation release];
-	[super dealloc];
-}
 
 
 
@@ -129,12 +122,12 @@ - (void)addView:(NSView *)view label:(NSString *)label image:(NSImage *)image
 	NSAssert (view != nil,
 			  @"Attempted to add a nil view when calling -addView:label:image:.");
 
-	NSString *identifier = [[label copy] autorelease];
+	NSString *identifier = [label copy];
 
 	[toolbarIdentifiers addObject:identifier];
 	[toolbarViews setObject:view forKey:identifier];
 
-	NSToolbarItem *item = [[[NSToolbarItem alloc] initWithItemIdentifier:identifier] autorelease];
+	NSToolbarItem *item = [[NSToolbarItem alloc] initWithItemIdentifier:identifier];
 	[item setLabel:label];
 	[item setImage:image];
 	[item setTarget:self];
@@ -208,7 +201,6 @@ - (IBAction)showWindow:(id)sender
 		[toolbar setDisplayMode:NSToolbarDisplayModeIconAndLabel];
 		[toolbar setDelegate:self];
 		[[self window] setToolbar:toolbar];
-		[toolbar release];
 	}
 
 	NSString *identifier = [self defaultViewIdentifier];

GLFileView.h

@@ -29,7 +29,7 @@
 - (NSString *)parseBlame:(NSString *)txt;
 - (NSString *)parseHTML:(NSString *)txt;
 
-@property(retain) NSMutableArray *groups;
-@property(retain) NSString *logFormat;
+@property NSMutableArray *groups;
+@property NSString *logFormat;
 
 @end

GitX.xcodeproj/project.pbxproj

@@ -1442,10 +1442,12 @@
 		26FC0A850875C7B200E6366F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = "\"$(SOURCE_ROOT)\"";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = unsupported;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1464,8 +1466,10 @@
 		26FC0A860875C7B200E6366F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = "\"$(SOURCE_ROOT)\"";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = unsupported;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = GitX_Prefix.pch;

MGScopeBar/MGRecessedPopUpButtonCell.m

@@ -27,11 +27,6 @@ - (id)initTextCell:(NSString *)title pullsDown:(BOOL)pullsDown
 }
 
 
-- (void)dealloc
-{
-	[recessedButton release];
-	[super dealloc];
-}
 
 
 - (void)drawTitleWithFrame:(NSRect)cellFrame inView:(NSView *)controlView

MGScopeBar/MGScopeBar.h

@@ -24,7 +24,7 @@
 	BOOL _smartResizeEnabled; // whether to do our clever collapsing/expanding of buttons when resizing (Smart Resizing).
 }
 
-@property(assign) id delegate; // should implement the MGScopeBarDelegate protocol.
+@property id delegate; // should implement the MGScopeBarDelegate protocol.
 
 - (void)reloadData; // causes the scope-bar to reload all groups/items from its delegate.
 - (void)sizeToFit; // only resizes vertically to optimum height; does not affect width.

MGScopeBar/MGScopeBar.m

@@ -96,12 +96,7 @@ - (void)dealloc
 		[_accessoryView removeFromSuperview];
 		_accessoryView = nil; // weak ref
 	}
-	[_separatorPositions release];
-	[_groups release];
-	[_identifiers release];
-	[_selectedItems release];
 
-	[super dealloc];
 }
 
 
@@ -121,15 +116,11 @@ - (void)reloadData
 
 	NSArray *subviews = [[self subviews] copy]; // so we don't mutate the collection we're iterating over.
 	[subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-	[subviews release]; // because copies are retained.
+	 // because copies are retained.
 
-	[_separatorPositions release];
 	_separatorPositions = nil;
-	[_groups release];
 	_groups = nil;
-	[_identifiers release];
 	_identifiers = nil;
-	[_selectedItems release];
 	_selectedItems = nil;
 	_firstCollapsedGroup = NSNotFound;
 	_lastWidth = NSNotFound;
@@ -185,7 +176,6 @@ - (void)reloadData
 					ctrlRect.size = [labelField frame].size;
 					[labelField setFrame:ctrlRect];
 					[self addSubview:labelField];
-					[labelField release];
 
 					xCoord += ctrlRect.size.width + SCOPE_BAR_ITEM_SPACING;
 
@@ -713,7 +703,7 @@ - (NSButton *)buttonForItem:(NSString *)identifier inGroup:(int)groupNumber
 
 	[self setControl:button forIdentifier:identifier inGroup:groupNumber];
 
-	return [button autorelease];
+	return button;
 }
 
 
@@ -728,7 +718,7 @@ - (NSMenuItem *)menuItemForItem:(NSString *)identifier inGroup:(int)groupNumber
 
 	[self setControl:menuItem forIdentifier:identifier inGroup:groupNumber];
 
-	return [menuItem autorelease];
+	return menuItem;
 }
 
 
@@ -743,12 +733,10 @@ - (NSPopUpButton *)popupButtonForGroup:(NSDictionary *)group
 	if (multiSelect) {
 		MGRecessedPopUpButtonCell *cell = [[MGRecessedPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO];
 		[popup setCell:cell];
-		[cell release];
 
 		[[popup cell] setUsesItemFromMenu:NO];
 		NSMenuItem *titleItem = [[NSMenuItem alloc] init];
 		[[popup cell] setMenuItem:titleItem];
-		[titleItem release];
 	}
 
 	// Configure appearance and behaviour.
@@ -784,7 +772,7 @@ - (NSPopUpButton *)popupButtonForGroup:(NSDictionary *)group
 	popFrame.origin.y = ceil(([self frame].size.height - popFrame.size.height) / 2.0);
 	[popup setFrame:popFrame];
 
-	return [popup autorelease];
+	return popup;
 }
 
 
@@ -796,7 +784,7 @@ - (void)setControl:(NSObject *)control forIdentifier:(NSString *)identifier inGr
 
 	NSMutableArray *identArray = [_identifiers objectForKey:identifier];
 	if (!identArray) {
-		identArray = [[[NSMutableArray alloc] initWithCapacity:groupNumber + 1] autorelease];
+		identArray = [[NSMutableArray alloc] initWithCapacity:groupNumber + 1];
 		[_identifiers setObject:identArray forKey:identifier];
 	}
 
@@ -875,8 +863,8 @@ - (void)updateMenuTitleForGroupAtIndex:(int)groupNumber
 - (void)drawRect:(NSRect)rect
 {
     // Draw gradient background.
-	NSGradient *gradient = [[[NSGradient alloc] initWithStartingColor:SCOPE_BAR_START_COLOR_GRAY 
-														  endingColor:SCOPE_BAR_END_COLOR_GRAY] autorelease];
+	NSGradient *gradient = [[NSGradient alloc] initWithStartingColor:SCOPE_BAR_START_COLOR_GRAY 
+														  endingColor:SCOPE_BAR_END_COLOR_GRAY];
 	[gradient drawInRect:[self bounds] angle:90.0];
 
 	// Draw border.
@@ -935,7 +923,6 @@ - (void)setSelected:(BOOL)selected forItem:(NSString *)identifier inGroup:(int)g
 		BOOL informDelegate = YES;
 
 		if (group) {
-			[group retain];
 			NSDisableScreenUpdates();
 
 			// We found the group which this item belongs to. Obtain selection-mode and identifiers.
@@ -959,7 +946,6 @@ - (void)setSelected:(BOOL)selected forItem:(NSString *)identifier inGroup:(int)g
 						informDelegate = NO;
 					}
 				}
-				[groupSelections release];	
 			}
 
 			// Change selected state of this item.
@@ -970,7 +956,6 @@ - (void)setSelected:(BOOL)selected forItem:(NSString *)identifier inGroup:(int)g
 				[self updateMenuTitleForGroupAtIndex:groupNumber];
 			}
 
-			[group release];
 			NSEnableScreenUpdates();
 		}
 	}
@@ -1015,7 +1000,7 @@ - (void)updateSelectedState:(BOOL)selected forItem:(NSString *)identifier inGrou
 
 - (NSArray *)selectedItems
 {
-	return [[_selectedItems copy] autorelease];
+	return [_selectedItems copy];
 }
 
 

NSString_RegEx.m

@@ -57,9 +57,9 @@ - (NSArray *) substringsMatchingRegularExpression:(NSString *)pattern count:(int
 			break;
 
 		NSRange range = NSMakeRange(pmatch[i].rm_so, pmatch[i].rm_eo - pmatch[i].rm_so);
-		NSString * substring = [[[NSString alloc] initWithBytes:[self UTF8String] + range.location
+		NSString * substring = [[NSString alloc] initWithBytes:[self UTF8String] + range.location
 														 length:range.length
-													   encoding:NSUTF8StringEncoding] autorelease];
+													   encoding:NSUTF8StringEncoding];
 		[outMatches addObject:substring];
 
 		if (ranges)

OpenRecentController.m

@@ -18,9 +18,9 @@ + (bool)run
 {
 	OpenRecentController* new = [[OpenRecentController alloc] init];
 	new->currentResults = [NSMutableArray array];
-	[new->currentResults retain]; //FIXME: why ???
+	 //FIXME: why ???
 	new->possibleResults = [NSMutableArray array];
-	[new->possibleResults retain]; //FIXME: why ???
+	 //FIXME: why ???
 
 	for (NSURL *url in [[NSDocumentController sharedDocumentController] recentDocumentURLs]) {
 		[new->possibleResults addObject: url];

PBCloneRepositoryPanel.h

@@ -34,10 +34,10 @@
 - (IBAction) showHideHiddenFiles:(id)sender;
 - (IBAction) browseDestination:(id)sender;
 
-@property (assign) IBOutlet NSTextField *repositoryURL;
-@property (assign) IBOutlet NSTextField *destinationPath;
-@property (assign) IBOutlet NSTextField *errorMessage;
-@property (assign) IBOutlet NSView      *repositoryAccessoryView;
+@property  IBOutlet NSTextField *repositoryURL;
+@property  IBOutlet NSTextField *destinationPath;
+@property  IBOutlet NSTextField *errorMessage;
+@property  IBOutlet NSView      *repositoryAccessoryView;
 
 @property (assign) BOOL isBare;