Cleanup of the use of include files in src/video/uikit

libsdl-org · Sep 27, 2011 · 35ebf73 · 35ebf73
1 parent 6c30f32
commit 35ebf73
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 17 deletions.
diff --git a/src/video/uikit/SDL_uikitappdelegate.h b/src/video/uikit/SDL_uikitappdelegate.h
@@ -20,7 +20,6 @@
 */
 
 #import <UIKit/UIKit.h>
-#import "SDL_uikitopenglview.h"
 
 @interface SDLUIKitDelegate : NSObject<UIApplicationDelegate> {
 }

diff --git a/src/video/uikit/SDL_uikitevents.h b/src/video/uikit/SDL_uikitevents.h
@@ -18,10 +18,13 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#include "SDL_config.h"
+#ifndef _SDL_uikitevents_h
+#define _SDL_uikitevents_h
 
-#include "SDL_uikitvideo.h"
+#include "../SDL_sysvideo.h"
 
 extern void UIKit_PumpEvents(_THIS);
 
+#endif /* _SDL_uikitevents_h */
+
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitopengles.h b/src/video/uikit/SDL_uikitopengles.h
@@ -18,13 +18,10 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
-#include "SDL_config.h"
-
 #ifndef _SDL_uikitopengles
 #define _SDL_uikitopengles
 
-#include "SDL_uikitvideo.h"
+#include "../SDL_sysvideo.h"
 
 extern int UIKit_GL_MakeCurrent(_THIS, SDL_Window * window,
                                 SDL_GLContext context);

diff --git a/src/video/uikit/SDL_uikitvideo.h b/src/video/uikit/SDL_uikitvideo.h
@@ -18,13 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#include "SDL_config.h"
-
 #ifndef _SDL_uikitvideo_h
 #define _SDL_uikitvideo_h
 
-#include "../SDL_sysvideo.h"
-
 #include <UIKit/UIKit.h>
 
 extern BOOL SDL_UIKit_supports_multiple_displays;

diff --git a/src/video/uikit/SDL_uikitview.h b/src/video/uikit/SDL_uikitview.h
@@ -20,8 +20,6 @@
 */
 
 #import <UIKit/UIKit.h>
-#include "SDL_stdinc.h"
-#include "SDL_events.h"
 #import "SDL_uikitviewcontroller.h"
 
 #define IPHONE_TOUCH_EFFICIENT_DANGEROUS

diff --git a/src/video/uikit/SDL_uikitviewcontroller.h b/src/video/uikit/SDL_uikitviewcontroller.h
@@ -21,8 +21,7 @@
 
 #import <UIKit/UIKit.h>
 
-#include "SDL_video.h"
-
+#include "../SDL_sysvideo.h"
 
 @interface SDL_uikitviewcontroller : UIViewController {
 @private

diff --git a/src/video/uikit/SDL_uikitwindow.h b/src/video/uikit/SDL_uikitwindow.h
@@ -18,13 +18,12 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#include "SDL_config.h"
-
 #ifndef _SDL_uikitwindow_h
 #define _SDL_uikitwindow_h
 
 #include "../SDL_sysvideo.h"
 #import "SDL_uikitopenglview.h"
+#import "SDL_uikitviewcontroller.h"
 
 typedef struct SDL_WindowData SDL_WindowData;