From 152dc2192f377f63056e79545822d074c83567bb Mon Sep 17 00:00:00 2001 From: Kentucky Compass Date: Sun, 31 Dec 2017 19:36:47 -0800 Subject: [PATCH] iOS: convert all obj-c source code to ARC --- CMakeLists.txt | 5 +++++ ios/iCade/iCadeReaderView.h | 4 ++-- ios/iCade/iCadeReaderView.m | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5946a516bb5..a73684bf8e0e 100644 --- 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 index 2f39a3dd5229..8a6bb586f97b 100755 --- a/ios/iCade/iCadeReaderView.h +++ b/ios/iCade/iCadeReaderView.h @@ -50,7 +50,7 @@ @interface iCadeReaderView : UIView { UIView *inputView; iCadeState _iCadeState; - id _delegate; + id __weak _delegate; struct { bool stateChanged:1; @@ -60,7 +60,7 @@ } @property (nonatomic, assign) iCadeState iCadeState; -@property (nonatomic, assign) id delegate; +@property (nonatomic, weak) id delegate; @property (nonatomic, assign) BOOL active; @end diff --git a/ios/iCade/iCadeReaderView.m b/ios/iCade/iCadeReaderView.m index 48a0a59df339..cd0e94fa592e 100755 --- 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 {