Converted to arc

appunite · Nov 15, 2011 · 3207ee3 · 3207ee3
1 parent 5ebfa86
commit 3207ee3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 45 deletions.
diff --git a/SVWebViewController/SVModalWebViewController.h b/SVWebViewController/SVModalWebViewController.h
@@ -23,7 +23,7 @@ typedef NSUInteger SVWebViewControllerAvailableActions;
 - (id)initWithAddress:(NSString*)urlString;
 - (id)initWithURL:(NSURL *)URL;
 
-@property (nonatomic, retain) UIColor *barsTintColor;
+@property (nonatomic, strong) UIColor *barsTintColor;
 @property (nonatomic, assign) SVWebViewControllerAvailableActions availableActions;
 
 @end
diff --git a/SVWebViewController/SVModalWebViewController.m b/SVWebViewController/SVModalWebViewController.m
@@ -11,7 +11,7 @@
 
 @interface SVModalWebViewController ()
 
-@property (nonatomic, assign) SVWebViewController *webViewController;
+@property (nonatomic, strong) SVWebViewController *webViewController;
 
 @end
 
@@ -22,19 +22,14 @@ @implementation SVModalWebViewController
 
 #pragma mark - Initialization
 
-- (void)dealloc {
-    self.barsTintColor = nil;
-    [super dealloc];
-}
-
 - (id)initWithAddress:(NSString*)urlString {
     return [self initWithURL:[NSURL URLWithString:urlString]];
 }
 
 - (id)initWithURL:(NSURL *)URL {
-    self.webViewController = [[[SVWebViewController alloc] initWithURL:URL] autorelease];
+    self.webViewController = [[SVWebViewController alloc] initWithURL:URL];
     if (self = [super initWithRootViewController:self.webViewController]) {
-        self.webViewController.navigationItem.leftBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:webViewController action:@selector(doneButtonClicked:)] autorelease];
+        self.webViewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:webViewController action:@selector(doneButtonClicked:)];
     }
     return self;
 }

diff --git a/SVWebViewController/SVWebViewController.m b/SVWebViewController/SVWebViewController.m
@@ -10,15 +10,15 @@
 
 @interface SVWebViewController ()
 
-@property (nonatomic, retain, readonly) UIBarButtonItem *backBarButtonItem;
-@property (nonatomic, retain, readonly) UIBarButtonItem *forwardBarButtonItem;
-@property (nonatomic, retain, readonly) UIBarButtonItem *refreshBarButtonItem;
-@property (nonatomic, retain, readonly) UIBarButtonItem *stopBarButtonItem;
-@property (nonatomic, retain, readonly) UIBarButtonItem *actionBarButtonItem;
-@property (nonatomic, retain, readonly) UIActionSheet *pageActionSheet;
+@property (nonatomic, strong, readonly) UIBarButtonItem *backBarButtonItem;
+@property (nonatomic, strong, readonly) UIBarButtonItem *forwardBarButtonItem;
+@property (nonatomic, strong, readonly) UIBarButtonItem *refreshBarButtonItem;
+@property (nonatomic, strong, readonly) UIBarButtonItem *stopBarButtonItem;
+@property (nonatomic, strong, readonly) UIBarButtonItem *actionBarButtonItem;
+@property (nonatomic, strong, readonly) UIActionSheet *pageActionSheet;
 
-@property (nonatomic, retain, readonly) UIWebView *mainWebView;
-@property (nonatomic, retain) NSURL *URL;
+@property (nonatomic, strong, readonly) UIWebView *mainWebView;
+@property (nonatomic, strong) NSURL *URL;
 
 - (id)initWithAddress:(NSString*)urlString;
 - (id)initWithURL:(NSURL*)URL;
@@ -133,19 +133,7 @@ - (id)initWithURL:(NSURL*)pageURL {
 #pragma mark - Memory management
 
 - (void)dealloc {
-    mainWebView.delegate = nil;
-    [mainWebView release];
-
-    [URL release];
-    [backBarButtonItem release];
-    [forwardBarButtonItem release];
-    [refreshBarButtonItem release];
-    [stopBarButtonItem release];
-    [actionBarButtonItem release];
-
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-
-    [super dealloc];
 }
 
 #pragma mark - View lifecycle
@@ -166,15 +154,6 @@ - (void)viewDidLoad {
 
 - (void)viewDidUnload {
     [super viewDidUnload];
-
-    [mainWebView release], mainWebView = nil;
-
-    [backBarButtonItem release], backBarButtonItem = nil;
-    [forwardBarButtonItem release], forwardBarButtonItem = nil;
-    [refreshBarButtonItem release], refreshBarButtonItem = nil;
-    [stopBarButtonItem release], stopBarButtonItem = nil;
-    [actionBarButtonItem release], actionBarButtonItem = nil;
-    [pageActionSheet release], pageActionSheet = nil;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -212,9 +191,9 @@ - (void)updateToolbarItems {
 
     UIBarButtonItem *refreshStopBarButtonItem = self.mainWebView.isLoading ? self.stopBarButtonItem : self.refreshBarButtonItem;
 
-    UIBarButtonItem *fixedSpace = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil] autorelease];
+    UIBarButtonItem *fixedSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
     fixedSpace.width = 5.0f;
-    UIBarButtonItem *flexibleSpace = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil] autorelease];
+    UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
 
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
         NSArray *items;
@@ -245,9 +224,9 @@ - (void)updateToolbarItems {
                      nil];
         }
 
-        UIToolbar *toolbar = [[[UIToolbar alloc] initWithFrame:CGRectMake(0.0f, 0.0f, toolbarWidth, 44.0f)] autorelease];
+        UIToolbar *toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0.0f, 0.0f, toolbarWidth, 44.0f)];
         toolbar.items = items;
-        self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithCustomView:toolbar] autorelease];
+        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:toolbar];
     } 
 
     else {
@@ -332,8 +311,6 @@ - (void)actionButtonClicked:(id)sender {
         [self.pageActionSheet showFromBarButtonItem:self.actionBarButtonItem animated:YES];
     else
         [self.pageActionSheet showFromToolbar:self.navigationController.toolbar];
-
-    [pageActionSheet release];
 }
 
 - (void)doneButtonClicked:(id)sender {
@@ -356,7 +333,7 @@ - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger
 
     else if([title isEqualToString:NSLocalizedString(@"Mail Link to this Page", @"")]) {
 
-		MFMailComposeViewController *mailViewController = [[[MFMailComposeViewController alloc] init] autorelease];
+		MFMailComposeViewController *mailViewController = [[MFMailComposeViewController alloc] init];
 
 		mailViewController.mailComposeDelegate = self;
         [mailViewController setSubject:[self.mainWebView stringByEvaluatingJavaScriptFromString:@"document.title"]];