iOS: convert all obj-c source code to ARC

hrydgard · Jan 1, 2018 · 152dc21 · 152dc21
1 parent 4a119be
commit 152dc21
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -692,6 +692,11 @@ elseif(IOS)
 
 	set_source_files_properties(ios/AppDelegate.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 	set_source_files_properties(ios/ViewController.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
+	set_source_files_properties(ios/iOSCoreAudio.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
+	set_source_files_properties(ios/PPSSPPUIApplication.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
+	set_source_files_properties(ios/iCade/iCadeReaderView.m PROPERTIES COMPILE_FLAGS -fobjc-arc)
+	set_source_files_properties(ios/main.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
+
 
 	set(TargetBin PPSSPP)
 elseif(USING_QT_UI)

diff --git a/ios/iCade/iCadeReaderView.h b/ios/iCade/iCadeReaderView.h
@@ -50,7 +50,7 @@
 @interface iCadeReaderView : UIView<UIKeyInput> {
     UIView                  *inputView;
     iCadeState              _iCadeState;
-    id<iCadeEventDelegate>  _delegate;
+    id<iCadeEventDelegate>  __weak _delegate;
 
     struct {
         bool stateChanged:1;
@@ -60,7 +60,7 @@
 }
 
 @property (nonatomic, assign) iCadeState iCadeState;
-@property (nonatomic, assign) id<iCadeEventDelegate> delegate;
+@property (nonatomic, weak) id<iCadeEventDelegate> delegate;
 @property (nonatomic, assign) BOOL active;
 
 @end
diff --git a/ios/iCade/iCadeReaderView.m b/ios/iCade/iCadeReaderView.m
@@ -49,7 +49,6 @@ - (id)initWithFrame:(CGRect)frame {
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidEnterBackgroundNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
-    [super dealloc];
 }
 
 - (void)didEnterBackground {