Forget about CCTouch

Author: s1ddok

cocos2d-ui/CCControl.m

@@ -26,8 +26,7 @@
 #import "CCControlSubclass.h"
 #import <objc/message.h>
 #import <objc/runtime.h>
-#import "CCTouch.h"
-#import "CCTouchEvent.h"
+#import "UITouch+CC.h"
 
 #if __CC_PLATFORM_IOS
 

cocos2d-ui/CCScrollView.m

@@ -29,8 +29,7 @@
 #import "CCActionEase.h"
 #import "CCActionInstant.h"
 #import "CCResponderManager.h"
-#import "CCTouch.h"
-
+#import "UITouch+CC.h"
 
 #if __CC_PLATFORM_IOS
 

cocos2d-ui/CCSlider.m

@@ -8,7 +8,7 @@
 
 #import "CCSlider.h"
 #import "CCControlSubclass.h"
-#import "CCTouch.h"
+#include "UITouch+CC.h"
 
 @interface CCSlider (Inputs)
 - (void) inputEnteredWithWorlPos:(CGPoint)worldLocation;

cocos2d.xcodeproj/project.pbxproj

@@ -31,10 +31,7 @@
 // TODO: Grab mouse and touch by implementing onPressed, onReleased, onClicked
 
 #import <Foundation/Foundation.h>
-
-#import "CCTouch.h"
-#import "CCTouchEvent.h"
-
+#import "ccMacros.h"
 #if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
 
 #import <UIKit/UIKit.h>

cocos2d/CCResponderManager.h

@@ -32,12 +32,11 @@
 #import "CCDirector.h"
 #import "CCDirectorMac.h"
 #import "CCScene.h"
-#import "CCTouch.h"
 
 // -----------------------------------------------------------------
 #pragma mark -
 // -----------------------------------------------------------------
-
+@class CCGLView;
 @implementation CCRunningResponder
 
 @end