IOS7: Use #include instead of #import.

We always use #include. #import is a nice ObjC feature (in theory), but can lead to odd results in corner cases.
scummvm · Jan 7, 2016 · 8fc0387 · 8fc0387
1 parent 17a5744
commit 8fc0387
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h
@@ -23,7 +23,7 @@
 #ifndef BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
 #define BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
 
-#import <UIKit/UIKit.h>
+#include <UIKit/UIKit.h>
 
 @class iPhoneView;
 

diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/iOS7AppDelegate.mm
@@ -21,9 +21,9 @@
  */
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
-#import "iOS7AppDelegate.h"
-#import "iOS7ScummVMViewController.h"
-#import "ios7_video.h"
+#include "iOS7AppDelegate.h"
+#include "iOS7ScummVMViewController.h"
+#include "ios7_video.h"
 
 @implementation iOS7AppDelegate {
 	UIWindow *_window;

diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/iOS7ScummVMViewController.h
@@ -23,7 +23,7 @@
 #ifndef BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
 #define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
 
-#import <UIKit/UIKit.h>
+#include <UIKit/UIKit.h>
 
 
 @interface iOS7ScummVMViewController : UIViewController

diff --git a/backends/platform/ios7/iOS7ScummVMViewController.mm b/backends/platform/ios7/iOS7ScummVMViewController.mm
@@ -20,7 +20,7 @@
  *
  */
 
-#import "iOS7ScummVMViewController.h"
+#include "iOS7ScummVMViewController.h"
 
 
 @implementation iOS7ScummVMViewController

diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
@@ -27,7 +27,7 @@
 #include "ios7_video.h"
 
 #include "graphics/conversion.h"
-#import "iOS7AppDelegate.h"
+#include "iOS7AppDelegate.h"
 
 @interface iOS7AlertHandler : NSObject<UIAlertViewDelegate>
 @end

diff --git a/backends/platform/ios7/ios7_video.h b/backends/platform/ios7/ios7_video.h
@@ -35,7 +35,7 @@
 #include "ios7_common.h"
 
 #include "common/list.h"
-#import "graphics/scaler.h"
+#include "graphics/scaler.h"
 
 typedef struct {
 	GLfloat x, y;

diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm
@@ -27,7 +27,7 @@
 
 #include "graphics/colormasks.h"
 #include "common/system.h"
-#import "iOS7AppDelegate.h"
+#include "iOS7AppDelegate.h"
 
 static int g_needsScreenUpdate = 0;