Migrated to ARC

zuil7 · May 9, 2012 · 433e29e · 433e29e
1 parent fd2f8ea
commit 433e29e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 52 deletions.
diff --git a/StreamView.xcodeproj/project.pbxproj b/StreamView.xcodeproj/project.pbxproj
@@ -364,6 +364,7 @@
 		459542FF14C55616002BFF69 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "StreamView/StreamView-Prefix.pch";
 				INFOPLIST_FILE = "StreamView/StreamView-Info.plist";
@@ -376,6 +377,7 @@
 		4595430014C55616002BFF69 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "StreamView/StreamView-Prefix.pch";
 				INFOPLIST_FILE = "StreamView/StreamView-Info.plist";
@@ -389,6 +391,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/StreamView.app/StreamView";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
@@ -406,6 +409,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/StreamView.app/StreamView";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(DEVELOPER_LIBRARY_DIR)/Frameworks",

diff --git a/StreamView/EKAppDelegate.m b/StreamView/EKAppDelegate.m
@@ -15,18 +15,12 @@ @implementation EKAppDelegate
 @synthesize window = _window;
 @synthesize viewController = _viewController;
 
-- (void)dealloc
-{
-    [_window release];
-    [_viewController release];
-    [super dealloc];
-}
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     // Override point for customization after application launch.
-    self.viewController = [[[EKViewController alloc] initWithNibName:@"EKViewController" bundle:nil] autorelease];
+    self.viewController = [[EKViewController alloc] initWithNibName:@"EKViewController" bundle:nil];
     self.window.rootViewController = self.viewController;
     [self.window makeKeyAndVisible];
     return YES;

diff --git a/StreamView/EKStreamView.h b/StreamView/EKStreamView.h
@@ -22,7 +22,7 @@
 @property (nonatomic, assign) NSUInteger index;
 
 // You SHOULD ONLY access this property when this object is in visibleCellInfo!
-@property (nonatomic, assign) UIView<EKResusableCell> *cell;
+@property (nonatomic, unsafe_unretained) UIView<EKResusableCell> *cell;
 
 @end
 
@@ -49,7 +49,7 @@
 
 
 @interface EKStreamViewUIScrollViewDelegate : NSObject<UIScrollViewDelegate>
-@property (nonatomic, assign) EKStreamView *streamView;
+@property (nonatomic, unsafe_unretained) EKStreamView *streamView;
 
 @end
 
@@ -65,9 +65,10 @@
     NSSet *visibleCellInfo;
     UIView *headerView, *footerView;
     CGFloat columnWidth;
+    EKStreamViewUIScrollViewDelegate *delegateObj;
 }
 
-@property (nonatomic, assign) id<EKStreamViewDelegate> delegate;
+@property (nonatomic, unsafe_unretained) id<EKStreamViewDelegate> delegate;
 @property (nonatomic, assign) CGFloat columnPadding;
 @property (nonatomic, assign) CGFloat cellPadding;
 

diff --git a/StreamView/EKStreamView.m b/StreamView/EKStreamView.m
@@ -26,7 +26,7 @@ - (NSUInteger)hash
 
 - (NSString *)description
 {
-    return [NSString stringWithFormat:@"<EKWaterfallCellInfo: index: %d>", index];
+    return [NSString stringWithFormat:@"<%@: index: %d>",NSStringFromClass([self class]), index];
 }
 
 @end
@@ -39,8 +39,8 @@ - (void)setup;
 - (NSSet *)getVisibleCellInfo;
 - (void)layoutCellWithCellInfo:(EKStreamViewCellInfo *)info;
 
-@property (nonatomic, retain) NSSet *visibleCellInfo;
-@property (nonatomic, retain) NSMutableDictionary *cellCache;
+@property (nonatomic) NSSet *visibleCellInfo;
+@property (nonatomic) NSMutableDictionary *cellCache;
 
 @end
 
@@ -79,19 +79,6 @@ - (id)initWithCoder:(NSCoder *)coder
     return self;
 }
 
-- (void)dealloc
-{
-    [[super delegate] release];
-    [cellHeightsByIndex release];
-    [cellHeightsByColumn release];
-    [rectsForCells release];
-    [visibleCellInfo release];
-    [cellCache release];
-
-    [headerView release];
-    [footerView release];
-    [super dealloc];
-}
 
 - (void)reloadData
 {
@@ -107,7 +94,7 @@ - (void)reloadData
     }
 
     if ([delegate respondsToSelector:@selector(headerForStreamView:)]) {
-        headerView = [[delegate headerForStreamView:self] retain];
+        headerView = [delegate headerForStreamView:self];
         CGRect f = headerView.frame;
         f.origin = CGPointMake(columnPadding, cellPadding);
         headerView.frame = f;
@@ -118,7 +105,7 @@ - (void)reloadData
     }
 
     if ([delegate respondsToSelector:@selector(footerForStreamView:)]) {
-        footerView = [[delegate footerForStreamView:self] retain];
+        footerView = [delegate footerForStreamView:self];
         [self addSubview:footerView];
     } else {
         footerView = nil;
@@ -161,7 +148,7 @@ - (void)reloadData
         NSMutableArray *cellHeightsInCol = [cellHeightsByColumn objectAtIndex:shortestCol];
         [cellHeightsInCol addObject:[NSNumber numberWithFloat:height]];
         NSMutableArray *rectsForCellsInCol = [rectsForCells objectAtIndex:shortestCol];
-        EKStreamViewCellInfo *info = [[EKStreamViewCellInfo new] autorelease];
+        EKStreamViewCellInfo *info = [EKStreamViewCellInfo new];
         info.frame = CGRectMake(cellX[shortestCol], columnHeights[shortestCol] + cellPadding, columnWidth, height);
         info.index = i;
         [rectsForCellsInCol addObject:info];
@@ -171,8 +158,7 @@ - (void)reloadData
 
 
     // determine the visible cells' range
-    [visibleCellInfo release];
-    visibleCellInfo = [[self getVisibleCellInfo] retain];
+    visibleCellInfo = [self getVisibleCellInfo];
 
     // draw the visible cells
 
@@ -208,7 +194,7 @@ - (void)reloadData
     NSMutableArray *cellArray = [cellCache objectForKey:identifier];
     id<EKResusableCell> cell = nil;
     if ([cellArray count] > 0) {
-        cell = [[[cellArray lastObject] retain] autorelease];
+        cell = [cellArray lastObject];
         [cellArray removeLastObject];
     } 
 
@@ -260,7 +246,7 @@ - (void)layoutCellWithCellInfo:(EKStreamViewCellInfo *)info
 
 - (void)setup
 {
-    EKStreamViewUIScrollViewDelegate *delegateObj = [EKStreamViewUIScrollViewDelegate new];
+    delegateObj = [EKStreamViewUIScrollViewDelegate new];
     delegateObj.streamView = self;
     [super setDelegate:delegateObj];
 

diff --git a/StreamView/EKViewController.h b/StreamView/EKViewController.h
@@ -15,6 +15,6 @@
     int page;
 }
 
-@property (retain, nonatomic) IBOutlet EKStreamView *stream;
+@property ( nonatomic) IBOutlet EKStreamView *stream;
 
 @end
diff --git a/StreamView/EKViewController.m b/StreamView/EKViewController.m
@@ -14,12 +14,6 @@
 @implementation EKViewController
 @synthesize stream;
 
-- (void)dealloc
-{
-    [randomHeights release];
-    [stream release];
-    [super dealloc];
-}
 
 - (void)didReceiveMemoryWarning
 {
@@ -34,7 +28,6 @@ - (void)viewDidLoad
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
 
-    [randomHeights release];
     randomHeights = [[NSMutableArray alloc] initWithCapacity:100];
     for (int i = 0; i < 100; i++) {
         CGFloat h = arc4random() % 200 + 50.f;
@@ -86,7 +79,7 @@ - (UIView *)streamView:(EKStreamView *)streamView cellAtIndex:(NSInteger)index
     cell = (MyCell *)[streamView dequeueReusableCellWithIdentifier:CellID];
 
     if (cell == nil) {
-        cell = [[[MyCell alloc] initWithFrame:CGRectMake(0, 0, 100, 100)] autorelease];
+        cell = [[MyCell alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
         cell.reuseIdentifier = CellID;
         if (redCell) cell.label.textColor = [UIColor redColor];
     }
@@ -103,7 +96,7 @@ - (CGFloat)streamView:(EKStreamView *)streamView heightForCellAtIndex:(NSInteger
 
 - (UIView *)headerForStreamView:(EKStreamView *)streamView
 {
-    MyCell *header = [[[MyCell alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width - stream.columnPadding * 2, 60)] autorelease];
+    MyCell *header = [[MyCell alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width - stream.columnPadding * 2, 60)];
     header.label.text = @"This is the header";
 
     return header;
@@ -112,7 +105,7 @@ - (UIView *)headerForStreamView:(EKStreamView *)streamView
 - (UIView *)footerForStreamView:(EKStreamView *)streamView
 {
     if (page <= MaxPage) {
-        MyCell *footer = [[[MyCell alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width - stream.columnPadding * 2, 60)] autorelease];
+        MyCell *footer = [[MyCell alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width - stream.columnPadding * 2, 60)];
         footer.label.text = @"This is the footer";
 
         return footer;

diff --git a/StreamView/MyCell.m b/StreamView/MyCell.m
@@ -14,20 +14,14 @@ @implementation MyCell
 @synthesize label, reuseIdentifier;
 
 
-- (void)dealloc
-{
-    [label release];
-    [reuseIdentifier release];
-    [super dealloc];
-}
 
 - (id)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
         CGRect bgFrame = CGRectInset(self.bounds, 0.0f, 0.0f);
-        UIView *bgView = [[[UIView alloc] initWithFrame:bgFrame] autorelease];
+        UIView *bgView = [[UIView alloc] initWithFrame:bgFrame];
         bgView.layer.borderColor = [UIColor blackColor].CGColor;
         bgView.layer.borderWidth = 2.0f;
         [self addSubview:bgView];