[#449] use weak instead of unsafe_unretained

hivewallet · Mar 29, 2015 · 28b7ee2 · 28b7ee2
1 parent 5ab89d0
commit 28b7ee2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Hive/Controllers/HIExportPrivateKeyWindowController.m b/Hive/Controllers/HIExportPrivateKeyWindowController.m
@@ -51,7 +51,7 @@ - (void)showPasswordPopoverOnButton:(id)button {
             NSLocalizedString(@"Confirm", @"Confirm button in password entry form");
     }
 
-    __unsafe_unretained id weakSelf = self;
+    __weak id weakSelf = self;
     self.passwordInputViewController.onSubmit = ^(HIPasswordHolder *passwordHolder) {
         [weakSelf exportKeyWithPassword:passwordHolder];
     };

diff --git a/Hive/Controllers/HILockScreenViewController.m b/Hive/Controllers/HILockScreenViewController.m
@@ -48,7 +48,7 @@ - (void)awakeFromNib {
                                                                name:NSWorkspaceWillSleepNotification
                                                              object:nil];
 
-    __unsafe_unretained typeof(self) lwc = self;
+    __weak typeof(self) lwc = self;
     self.passwordInputViewController.onSubmit = ^(HIPasswordHolder *passwordHolder) {
         [lwc onPasswordEntered:passwordHolder];
     };

diff --git a/Hive/Controllers/HISendBitcoinsWindowController.m b/Hive/Controllers/HISendBitcoinsWindowController.m
@@ -1208,7 +1208,7 @@ - (void)showPasswordPopover:(NSButton *)sender forSendingBitcoin:(uint64)bitcoin
 
     _passwordPopover = [self preparePasswordPopover];
 
-    __unsafe_unretained __typeof__ (self) weakSelf = self;
+    __weak __typeof__ (self) weakSelf = self;
     self.passwordInputViewController.onSubmit = ^(HIPasswordHolder *passwordHolder) {
         [weakSelf sendBitcoin:bitcoin toTarget:target password:passwordHolder];
     };
@@ -1219,7 +1219,7 @@ - (void)showPasswordPopover:(NSButton *)sender forSendingBitcoin:(uint64)bitcoin
 - (void)showPasswordPopover:(NSButton *)sender forPaymentRequest:(int)sessionId {
     _passwordPopover = [self preparePasswordPopover];
 
-    __unsafe_unretained __typeof__ (self) weakSelf = self;
+    __weak __typeof__ (self) weakSelf = self;
     self.passwordInputViewController.onSubmit = ^(HIPasswordHolder *passwordHolder) {
         [weakSelf sendPaymentRequest:sessionId password:passwordHolder];
     };

diff --git a/Hive/Controllers/HISignMessageWindowController.m b/Hive/Controllers/HISignMessageWindowController.m
@@ -52,7 +52,7 @@ - (void)showPasswordPopoverOnButton:(id)button {
             NSLocalizedString(@"Confirm", @"Confirm button in password entry form");
     }
 
-    __unsafe_unretained id weakSelf = self;
+    __weak id weakSelf = self;
     self.passwordInputViewController.onSubmit = ^(HIPasswordHolder *passwordHolder) {
         [weakSelf signMessageWithPassword:passwordHolder];
     };

diff --git a/Hive/Controllers/HIViewController.h b/Hive/Controllers/HIViewController.h
@@ -18,7 +18,7 @@
 
 @property (nonatomic, copy) NSString *iconName;
 @property (nonatomic, assign) NSUInteger badgeNumber;
-@property (nonatomic, unsafe_unretained) HINavigationController *navigationController;
+@property (nonatomic, weak) HINavigationController *navigationController;
 @property (nonatomic, readonly) NSView *titleBarView;
 @property (nonatomic, readonly) NSView *rightNavigationView;