Modernize property syntax and don't use viewDidUnload (deprecated in …

…iOS 6)
hrydgard · Jan 1, 2018 · c563166 · c563166
1 parent 5b857f0
commit c563166
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/ios/ViewController.mm b/ios/ViewController.mm
@@ -74,10 +74,10 @@ @interface ViewController ()
 	std::map<uint16_t, uint16_t> iCadeToKeyMap;
 }
 
-@property (nonatomic) EAGLContext* context;
+@property (nonatomic, strong) EAGLContext* context;
-@property (nonatomic) NSString* documentsPath;
+@property (nonatomic, strong) NSString* documentsPath;
-@property (nonatomic) NSString* bundlePath;
+@property (nonatomic, strong) NSString* bundlePath;
-@property (nonatomic) NSMutableArray* touches;
+@property (nonatomic, strong) NSMutableArray<NSDictionary *>* touches;
 @property (nonatomic) AudioEngine* audioEngine;
 //@property (nonatomic) iCadeReaderView* iCadeView;
 #if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1
@@ -214,24 +214,17 @@ - (void)viewDidLoad {
 #endif
 }
 
-- (void)viewDidUnload
-{
-	[super viewDidUnload];
-
-	if ([EAGLContext currentContext] == self.context) {
-		[EAGLContext setCurrentContext:nil];
-	}
-	self.context = nil;
-}
-
 - (void)didReceiveMemoryWarning
 {
 	[super didReceiveMemoryWarning];
 }
 
 - (void)dealloc
 {
-	[self viewDidUnload];
+	if ([EAGLContext currentContext] == self.context) {
+		[EAGLContext setCurrentContext:nil];
+	}
+	self.context = nil;
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1
 	if ([GCController class]) {