[ios] fixed, xcode4 flags this as errors, move them into include inte…

…rface def
xbmc · May 16, 2012 · 32bc1fc · 32bc1fc
1 parent 354381b
commit 32bc1fc
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/xbmc/osx/IOSExternalTouchController.h b/xbmc/osx/IOSExternalTouchController.h
@@ -24,7 +24,10 @@
 
 @interface IOSExternalTouchController : UIViewController 
 {
-
+  UIWindow      *_internalWindow;
+  UIView        *_touchView;
+  NSTimer       *_sleepTimer;
+  bool          _startup;
 }
 - (id)init;
 - (void)createGestureRecognizers;

diff --git a/xbmc/osx/IOSExternalTouchController.mm b/xbmc/osx/IOSExternalTouchController.mm
@@ -35,13 +35,6 @@
 const CGFloat touchScreenDimTimeoutSecs       = 15.0;
 const CGFloat timeFadeSecs                    = 2.0;
 
-@interface IOSExternalTouchController ()
-  UIWindow      *_internalWindow;
-  UIView        *_touchView;
-  NSTimer       *_sleepTimer;
-  bool          _startup;
-@end
-
 @implementation IOSExternalTouchController
 //--------------------------------------------------------------
 - (id)init
@@ -206,7 +199,7 @@ - (void)createGestureRecognizers
   [doubleFingerSingleTap release];
 
   //1 finger single long tab - right mouse - alernative
-  UITapGestureRecognizer *singleFingerSingleLongTap = [[UILongPressGestureRecognizer alloc]
+  UITapGestureRecognizer *singleFingerSingleLongTap = (UITapGestureRecognizer*)[[UILongPressGestureRecognizer alloc]
                                                         initWithTarget:self action:@selector(handleSingleFingerSingleLongTap:)];  
   singleFingerSingleLongTap.delaysTouchesBegan = YES;
   singleFingerSingleLongTap.delaysTouchesEnded = YES;  

diff --git a/xbmc/osx/IOSScreenManager.h b/xbmc/osx/IOSScreenManager.h
@@ -29,16 +29,18 @@
 
 @class IOSEAGLView;
 @class XBMCController;
+@class IOSExternalTouchController;
 
 @interface IOSScreenManager : NSObject {
 
   int  _screenIdx;
   bool _externalScreen;
   IOSEAGLView *_glView;
+  IOSExternalTouchController *_externalTouchController;
 }
 @property int  _screenIdx;
 @property (readonly, getter=isExternalScreen)bool _externalScreen;
-@property (assign, setter=setView) IOSEAGLView *_glView;
+@property (assign, setter=setView:) IOSEAGLView *_glView;
 
 // init the screenmanager with our eaglview
 //- (id)      initWithView:(IOSEAGLView *)view;

diff --git a/xbmc/osx/IOSScreenManager.mm b/xbmc/osx/IOSScreenManager.mm
@@ -44,9 +44,6 @@
 
 static CEvent screenChangeEvent;
 
-@interface IOSScreenManager ()
-IOSExternalTouchController *_externalTouchController;
-@end
 @implementation IOSScreenManager
 @synthesize _screenIdx;
 @synthesize _externalScreen;

diff --git a/xbmc/osx/atv2/XBMCController.h b/xbmc/osx/atv2/XBMCController.h
@@ -29,9 +29,14 @@
 {
   int padding[16];  // credit is due here to SapphireCompatibilityClasses!!
 
-  int m_screensaverTimeout;
-
   BRController *m_controller;
+
+  NSTimer      *m_keyTimer;
+  IOSEAGLView  *m_glView;
+
+  int           m_screensaverTimeout;
+  int           m_systemsleepTimeout;
+
 }
 // message from which our instance is obtained
 //+ (XBMCController*) sharedInstance;

diff --git a/xbmc/osx/atv2/XBMCController.mm b/xbmc/osx/atv2/XBMCController.mm
@@ -35,7 +35,6 @@
 #import <BackRow/BackRow.h>
 
 #import "XBMCController.h"
-#import "IOSEAGLView.h"
 #import "XBMCDebugHelpers.h"
 
 //start repeating after 0.5s
@@ -176,12 +175,6 @@ -(int)sleepTimeout;
 //--------------------------------------------------------------
 //--------------------------------------------------------------
 @interface XBMCController (PrivateMethods)
-NSTimer       *m_keyTimer;
-IOSEAGLView  *m_glView;
-
-int           m_screensaverTimeout;
-int           m_systemsleepTimeout;
-
 - (void) observeDefaultCenterStuff: (NSNotification *) notification;
 - (void) keyPressTimerCallback: (NSTimer*)theTimer;
 - (void) startKeyPressTimer: (int) keyId;