Skip to content

Commit

Permalink
IOS7: Make includes match our style.
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes Schickel committed Jan 7, 2016
1 parent 3130b22 commit f8ef5e2
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions backends/platform/ios7/ios7_app_delegate.mm
Expand Up @@ -21,9 +21,9 @@
*/

#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include "ios7_app_delegate.h"
#include "ios7_scummvm_view_controller.h"
#include "ios7_video.h"
#include "backends/platform/ios7/ios7_app_delegate.h"
#include "backends/platform/ios7/ios7_scummvm_view_controller.h"
#include "backends/platform/ios7/ios7_video.h"

@implementation iOS7AppDelegate {
UIWindow *_window;
Expand Down
2 changes: 1 addition & 1 deletion backends/platform/ios7/ios7_keyboard.mm
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "ios7_keyboard.h"
#include "backends/platform/ios7/ios7_keyboard.h"

@interface UITextInputTraits
- (void)setAutocorrectionType:(int)type;
Expand Down
2 changes: 1 addition & 1 deletion backends/platform/ios7/ios7_main.mm
Expand Up @@ -26,7 +26,7 @@
#include <UIKit/UIKit.h>
#include <Foundation/NSThread.h>

#include "ios7_video.h"
#include "backends/platform/ios7/ios7_video.h"


int iOS7_argc;
Expand Down
2 changes: 1 addition & 1 deletion backends/platform/ios7/ios7_osys_events.cpp
Expand Up @@ -26,7 +26,7 @@
#include "gui/message.h"
#include "common/translation.h"

#include "ios7_osys_main.h"
#include "backends/platform/ios7/ios7_osys_main.h"

static const int kQueuedInputEventDelay = 50;

Expand Down
2 changes: 1 addition & 1 deletion backends/platform/ios7/ios7_osys_main.cpp
Expand Up @@ -48,7 +48,7 @@
#include "graphics/scaler.h"
#include "graphics/scaler/aspect.h"

#include "ios7_osys_main.h"
#include "backends/platform/ios7/ios7_osys_main.h"


const OSystem::GraphicsMode OSystem_iOS7::s_supportedGraphicsModes[] = {
Expand Down
2 changes: 1 addition & 1 deletion backends/platform/ios7/ios7_osys_main.h
Expand Up @@ -24,7 +24,7 @@
#define BACKENDS_PLATFORM_IOS7_IOS7_OSYS_MAIN_H

#include "graphics/surface.h"
#include "ios7_common.h"
#include "backends/platform/ios7/ios7_common.h"
#include "backends/base-backend.h"
#include "common/events.h"
#include "audio/mixer_intern.h"
Expand Down
2 changes: 1 addition & 1 deletion backends/platform/ios7/ios7_osys_sound.cpp
Expand Up @@ -23,7 +23,7 @@
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_ALLOW_ALL

#include "ios7_osys_main.h"
#include "backends/platform/ios7/ios7_osys_main.h"

void OSystem_iOS7::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBufferRef outQB) {
//printf("AQBufferCallback()\n");
Expand Down
6 changes: 3 additions & 3 deletions backends/platform/ios7/ios7_osys_video.mm
Expand Up @@ -23,11 +23,11 @@
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_ALLOW_ALL

#include "ios7_osys_main.h"
#include "ios7_video.h"
#include "backends/platform/ios7/ios7_osys_main.h"
#include "backends/platform/ios7/ios7_video.h"

#include "graphics/conversion.h"
#include "ios7_app_delegate.h"
#include "backends/platform/ios7/ios7_app_delegate.h"

@interface iOS7AlertHandler : NSObject<UIAlertViewDelegate>
@end
Expand Down
2 changes: 1 addition & 1 deletion backends/platform/ios7/ios7_scummvm_view_controller.mm
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "ios7_scummvm_view_controller.h"
#include "backends/platform/ios7/ios7_scummvm_view_controller.h"


@implementation iOS7ScummVMViewController
Expand Down
4 changes: 2 additions & 2 deletions backends/platform/ios7/ios7_video.h
Expand Up @@ -31,8 +31,8 @@
#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES2/glext.h>

#include "ios7_keyboard.h"
#include "ios7_common.h"
#include "backends/platform/ios7/ios7_keyboard.h"
#include "backends/platform/ios7/ios7_common.h"

#include "common/list.h"
#include "graphics/scaler.h"
Expand Down
4 changes: 2 additions & 2 deletions backends/platform/ios7/ios7_video.mm
Expand Up @@ -23,11 +23,11 @@
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_ALLOW_ALL

#include "ios7_video.h"
#include "backends/platform/ios7/ios7_video.h"

#include "graphics/colormasks.h"
#include "common/system.h"
#include "ios7_app_delegate.h"
#include "backends/platform/ios7/ios7_app_delegate.h"

static int g_needsScreenUpdate = 0;

Expand Down

0 comments on commit f8ef5e2

Please sign in to comment.