Permalink
Browse files

Renamed property newPasscode to theNewPasscode to avoid errors in Xco…

…de 4 re 'newX' naming convention
  • Loading branch information...
jawj committed Oct 31, 2011
1 parent 6becec7 commit 0a12297b3783cb688e8335a90965fe1f50bbcc09
Showing with 7 additions and 7 deletions.
  1. +2 −2 PasscodeViewController.h
  2. +5 −5 PasscodeViewController.m
View
@@ -58,7 +58,7 @@ typedef enum {
BOOL ignoringInput;
BOOL mismatch;
NSObject <PasscodeViewControllerDelegate> *passcodeDelegate;
- NSString *newPasscode;
+ NSString *theNewPasscode;
}
@property (nonatomic, retain) IBOutlet UINavigationBar *navBar;
@@ -76,7 +76,7 @@ typedef enum {
@property (nonatomic, retain) IBOutlet UILabel *mismatchLabel;
@property (nonatomic, assign) NSObject *passcodeDelegate;
-@property (nonatomic, retain) NSString *newPasscode;
+@property (nonatomic, retain) NSString *theNewPasscode;
- (IBAction)passcodeChanged;
- (IBAction)cancelled;
View
@@ -25,7 +25,7 @@ @implementation PasscodeViewController
@synthesize navBar, navItem, hiddenEntryField, containingView, slideOutImageView, promptLabel,
delaySpinner, digit1, digit2, digit3, digit4, failureLabel, mismatchLabel, passcodeDelegate,
- newPasscode;
+ theNewPasscode;
- (void)viewDidLoad {
[super viewDidLoad];
@@ -156,15 +156,15 @@ - (void)passcodeEntered {
return; // skip display reconfiguration at end of method
case PasscodeDisplayStateChangeEnterNew1:
- self.newPasscode = hiddenEntryField.text;
+ self.theNewPasscode = hiddenEntryField.text;
state = PasscodeDisplayStateChangeEnterNew2;
break;
case PasscodeDisplayStateChangeEnterNew2:
; // no-op weirdly seems required here to avoid syntax complaint with LLVM
- BOOL passcodeMatches = [hiddenEntryField.text isEqual:newPasscode];
+ BOOL passcodeMatches = [hiddenEntryField.text isEqual:theNewPasscode];
if (passcodeMatches) {
- [PasscodeViewController setPasscode:newPasscode];
+ [PasscodeViewController setPasscode:theNewPasscode];
[self performSelector:@selector(setSucceeded)
withObject:nil
afterDelay:kPasscodeEntryPause];
@@ -268,7 +268,7 @@ - (void)dealloc {
self.digit4 = nil;
self.failureLabel = nil;
self.mismatchLabel = nil;
- self.newPasscode = nil;
+ self.theNewPasscode = nil;
[super dealloc];
}

0 comments on commit 0a12297

Please sign in to comment.