Merge pull request #3 from objectiveSee/arc

Converted to ARC.

Author: objectiveSee

DRKonamiCode.xcodeproj/project.pbxproj

@@ -226,6 +226,7 @@
 		3098B2E71504515300F743BD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DRKonamiCode-Prefix.pch";
 				INFOPLIST_FILE = "DRKonamiCode-Info.plist";
@@ -237,6 +238,7 @@
 		3098B2E81504515300F743BD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DRKonamiCode-Prefix.pch";
 				INFOPLIST_FILE = "DRKonamiCode-Info.plist";

Sources/DRAppDelegate.m

@@ -13,18 +13,12 @@ @implementation DRAppDelegate
 @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]];
 
-    self.viewController = [[[DRViewController alloc] initWithNibName:@"DRViewController" bundle:nil] autorelease];
+    self.viewController = [[DRViewController alloc] initWithNibName:@"DRViewController" bundle:nil];
     self.window.rootViewController = self.viewController;
     [self.window makeKeyAndVisible];
     return YES;

Sources/DRKonamiGestureRecognizer.h

@@ -6,7 +6,7 @@
 //
 
 /**
- DRKonamiGestureProtocol is optional!
+ DRKonamiGestureProtocol is optional! If you are using the delegate then you must implement all of the required methods.
  
  The Konami Gesture protocol implements communication between the gesture recognizer and the delegate when the A+B+Enter action is required to complete the gesture. If the A+B+Enter sequence is not used then none of the protocol methods are required.
  */
@@ -53,27 +53,21 @@ typedef enum DRKonamiGestureState
  @todo Reset the state of self.konamiState on gesture fails due to timeout between swipes in sequence.
  */
 @interface DRKonamiGestureRecognizer : UIGestureRecognizer
-{
-    NSDate* _lastGestureDate;
-    CGPoint _lastGestureStartPoint;
-    BOOL _requiresABEnterToUnlock;
-    id<DRKonamiGestureProtocol> _konamiDelegate;
-}
 
 /**
  Indicates whether the konami sequence requires A+B+Enter to finish the sequence. If NO then the sequence is finished successfully after the final RIGHT gesture. Default value is NO.
  */
-@property (nonatomic, assign, readwrite) BOOL requiresABEnterToUnlock;
+@property (nonatomic, readwrite) BOOL requiresABEnterToUnlock;
 
 /**
  The current state of the konami gesture.
  */
-@property (nonatomic, assign, readonly) DRKonamiGestureState konamiState;
+@property (nonatomic, readonly) DRKonamiGestureState konamiState;
 
 /**
  The delegate of the gesture. If the delegate is set then the delegate must conform to DRKonamiGestureRecognizer. The delegate does not need to be used if requiresABEnterToUnlock is set to NO.
  */
-@property (nonatomic, assign, readwrite) id<DRKonamiGestureProtocol> konamiDelegate;
+@property (nonatomic, weak, readwrite) id<DRKonamiGestureProtocol> konamiDelegate;
 
 /**
  Methods used by the delegate (if delegate exists) to specify when the A, B, and Enter actions occur.

Sources/DRKonamiGestureRecognizer.m

@@ -30,19 +30,14 @@
 ///////////////////////////////////////////////////////////////
 
 @interface DRKonamiGestureRecognizer ()
-@property (nonatomic, assign, readwrite) DRKonamiGestureState konamiState;
-@property (nonatomic, retain, readwrite) NSDate* lastGestureDate;
-@property (nonatomic, assign, readwrite) CGPoint lastGestureStartPoint;
+@property (nonatomic, readwrite) DRKonamiGestureState konamiState;
+@property (nonatomic, strong, readwrite) NSDate* lastGestureDate;
+@property (nonatomic, readwrite) CGPoint lastGestureStartPoint;
 @end
 
 ///////////////////////////////////////////////////////////////
 
 @implementation DRKonamiGestureRecognizer
-@synthesize konamiState = _konamiState;
-@synthesize lastGestureDate = _lastGestureDate;
-@synthesize lastGestureStartPoint = lastGestureStartPoint;
-@synthesize requiresABEnterToUnlock = _requiresABEnterToUnlock;
-@synthesize konamiDelegate = _konamiDelegate;
 
 #pragma mark -
 #pragma mark Lifecycle
@@ -52,28 +47,15 @@ - (id) initWithTarget:(id)target action:(SEL)action
     self = [super initWithTarget:target action:action];
     if ( self != nil )
     {
-        _konamiState = DRKonamiGestureStateNone;
-        _lastGestureDate = [NSDate new];
-        _lastGestureStartPoint = CGPointZero;
-        _requiresABEnterToUnlock = NO;
-        _konamiDelegate = nil;
+        self.konamiState = DRKonamiGestureStateNone;
+        self.lastGestureDate = [NSDate new];
+        self.lastGestureStartPoint = CGPointZero;
+        self.requiresABEnterToUnlock = NO;
         self.cancelsTouchesInView = NO;
     }
     return self;
 }
 
-- (id) init
-{
-    NSLog(@"Invalid initalizer: %s", __FUNCTION__);
-    return nil;
-}
-
-- (void) dealloc
-{
-    self.lastGestureDate = nil;
-    [super dealloc];
-}
-
 #pragma mark -
 #pragma mark Touches
 
@@ -124,7 +106,7 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
             [self setState:UIGestureRecognizerStateFailed];
             return;
         }        
-        self.lastGestureDate = [[NSDate new] autorelease];  // autorelease because it's retained twice (new & in setter)
+        self.lastGestureDate = [NSDate new];
         UITouch *touch = [touches anyObject];
         UIView *view = [self view];    
         self.lastGestureStartPoint = [touch locationInView:view];
@@ -266,7 +248,7 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
     }
 
     self.konamiState++;
-    self.lastGestureDate = [[NSDate new] autorelease];  // autorelease because it's retained twice (new & by setter)
+    self.lastGestureDate = [NSDate new];  // autorelease because it's retained twice (new & by setter)
 
     [self setState:UIGestureRecognizerStateChanged];
 

Sources/DRViewController.h

@@ -13,12 +13,12 @@
     DRKonamiGestureRecognizer* _konamiGestureRecognizer;
 
 @protected
-    UIView* _NESControllerView;
-    UILabel *_statusLabel;
+    UIView* __weak _NESControllerView;
+    UILabel *__weak _statusLabel;
 }
 
-@property (nonatomic, readonly) IBOutlet UIView *NESControllerView;
-@property (nonatomic, readonly) IBOutlet UILabel *statusLabel;
+@property (weak, nonatomic, readonly) IBOutlet UIView *NESControllerView;
+@property (weak, nonatomic, readonly) IBOutlet UILabel *statusLabel;
 @property (nonatomic, readonly) DRKonamiGestureRecognizer* konamiGestureRecognizer;
 
 - (IBAction)aButtonWasPressed:(id)sender;

Sources/DRViewController.m

@@ -38,7 +38,6 @@ - (void)viewDidLoad
 - (void)viewDidUnload
 {
     [self.view removeGestureRecognizer:self.konamiGestureRecognizer];
-    [_konamiGestureRecognizer release];
     _konamiGestureRecognizer = nil;
     [super viewDidUnload];
 }
@@ -98,7 +97,6 @@ - (void)_konamiGestureRecognized:(DRKonamiGestureRecognizer*)gesture
     {
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:nil message:@"Konami!" delegate:nil cancelButtonTitle:nil otherButtonTitles:@"Dismiss",nil];
         [alert show];
-        [alert release];
     }
     else if ( gesture.state == UIGestureRecognizerStateChanged )
     {