diff options
| author | Johannes Schickel | 2016-01-07 12:31:49 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-01-07 12:44:48 +0100 |
| commit | 8fc03872c4a7d79f984a08163515f206f61ce4d4 (patch) | |
| tree | fd52d361eadd0f2da0954eb03e8b5e90442cf433 | |
| parent | 17a57443aea26bf51cc7992049f2503e6cecb672 (diff) | |
| download | scummvm-rg350-8fc03872c4a7d79f984a08163515f206f61ce4d4.tar.gz scummvm-rg350-8fc03872c4a7d79f984a08163515f206f61ce4d4.tar.bz2 scummvm-rg350-8fc03872c4a7d79f984a08163515f206f61ce4d4.zip | |
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.
| -rw-r--r-- | backends/platform/ios7/iOS7AppDelegate.h | 2 | ||||
| -rw-r--r-- | backends/platform/ios7/iOS7AppDelegate.mm | 6 | ||||
| -rw-r--r-- | backends/platform/ios7/iOS7ScummVMViewController.h | 2 | ||||
| -rw-r--r-- | backends/platform/ios7/iOS7ScummVMViewController.mm | 2 | ||||
| -rw-r--r-- | backends/platform/ios7/ios7_osys_video.mm | 2 | ||||
| -rw-r--r-- | backends/platform/ios7/ios7_video.h | 2 | ||||
| -rw-r--r-- | backends/platform/ios7/ios7_video.mm | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h index 224989880d..08696c7b61 100644 --- 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 index 9d1cb9ed44..dbc81725a4 100644 --- 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 index 54eac142a6..39168aaee7 100644 --- 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 index f92fd0115c..8dfa0122dd 100644 --- 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 index 0d183ce834..908d0bf23c 100644 --- 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 index b530bad5a2..d2161d6e7a 100644 --- 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 index 2cfc3e05f7..337d4603f2 100644 --- 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; |