Remove android leftovers in CCTouch

Author: s1ddok

cocos2d/CCTouch.h

@@ -8,12 +8,7 @@
 
 #import "ccMacros.h"
 
-#if __CC_PLATFORM_IOS
 #import <UIKit/UIKit.h>
-#define PlatformTouch UITouch
-#else
-#define PlatformTouch NSObject
-#endif
 
 @class CCGLView;
 @class CCNode;
@@ -63,10 +58,10 @@ typedef NS_ENUM (NSInteger, CCTouchPhase) {
  PlatformTouch is equivalent to UITouch on iOS and NSObject on OS X.
  @since v3.2 and later
 */
-@property (nonatomic, strong) PlatformTouch* uiTouch;
+@property (nonatomic, strong) UITouch* uiTouch;
 
-- (instancetype)initWithPlatformTouch:(PlatformTouch*)touch;
-+ (instancetype)touchWithPlatformTouch:(PlatformTouch*)touch;
+- (instancetype)initWithUITouch:(UITouch*)touch;
++ (instancetype)touchWithUITouch:(UITouch*)touch;
 
 /** @name Convert Touch Location to Node Coordinate System */
 

cocos2d/CCTouch.m

@@ -12,7 +12,7 @@
 
 @implementation CCTouch
 
-- (instancetype)initWithPlatformTouch:(PlatformTouch*)touch
+- (instancetype)initWithUITouch:(UITouch*)touch
 {
     if((self = [super init]))
     {
@@ -24,7 +24,7 @@ - (instancetype)initWithPlatformTouch:(PlatformTouch*)touch
     return self;
 }
 
-+ (instancetype)touchWithPlatformTouch:(PlatformTouch*)touch
++ (instancetype)touchWithUITouch:(UITouch*)touch
 {
     return [[self alloc] initWithPlatformTouch:touch];
 }

cocos2d/CCTouchEvent.m

@@ -31,7 +31,7 @@ - (id)init
         _deadTouches = [[NSMutableSet alloc] init];
         for(int i = 0; i < 10; i++)
         {
-            [_deadTouches addObject:[CCTouch touchWithPlatformTouch:nil]];
+            [_deadTouches addObject:[CCTouch touchWithUITouch:nil]];
         }
 
         _allTouches = [[NSMutableDictionary alloc] init];
@@ -47,7 +47,7 @@ - (void)updateTouchesBegan:(NSSet*)touches
     [_currentTouches removeAllObjects];
 
     // Began touches - move touches from dead pool to allTouches
-    for(PlatformTouch* touch in touches)
+    for(UITouch* touch in touches)
     {
         CCTouch* ccTouch = [_deadTouches anyObject];
         ccTouch.uiTouch = touch;
@@ -58,7 +58,7 @@ - (void)updateTouchesBegan:(NSSet*)touches
     }
 
     // Set currentTouches
-    for(PlatformTouch* touch in touches)
+    for(UITouch* touch in touches)
     {
         CCTouch* ccTouch = [_allTouches objectForKey:[NSValue valueWithNonretainedObject:touch]];
         if(ccTouch)
@@ -75,7 +75,7 @@ - (void)updateTouchesMoved:(NSSet*)touches
     [_currentTouches removeAllObjects];
 
     // Set currentTouches
-    for(PlatformTouch* touch in touches)
+    for(UITouch* touch in touches)
     {
         CCTouch* ccTouch = [_allTouches objectForKey:[NSValue valueWithNonretainedObject:touch]];
         if(ccTouch)
@@ -94,7 +94,7 @@ - (void)updateTouchesEnded:(NSSet*)touches
     NSMutableArray* keys = [[NSMutableArray alloc] init];
 
     // Set currentTouches
-    for(PlatformTouch* touch in touches)
+    for(UITouch* touch in touches)
     {
         CCTouch* ccTouch = [_allTouches objectForKey:[NSValue valueWithNonretainedObject:touch]];
         if(ccTouch)
@@ -109,7 +109,7 @@ - (void)updateTouchesEnded:(NSSet*)touches
 
 
     // Ended touches - remove touches from allTouches and place them back into the deadpool
-    NSArray* deadTouches = [_allTouches objectsForKeys:keys notFoundMarker:[CCTouch touchWithPlatformTouch:nil]];
+    NSArray* deadTouches = [_allTouches objectsForKeys:keys notFoundMarker:[CCTouch touchWithUITouch:nil]];
     [_deadTouches addObjectsFromArray:deadTouches];
     [_allTouches removeObjectsForKeys:keys];
 }
@@ -121,7 +121,7 @@ - (void)updateTouchesCancelled:(NSSet*)touches
     NSMutableArray* keys = [[NSMutableArray alloc] init];
 
     // Set currentTouches
-    for(PlatformTouch* touch in touches)
+    for(UITouch* touch in touches)
     {
         CCTouch* ccTouch = [_allTouches objectForKey:[NSValue valueWithNonretainedObject:touch]];
         if(ccTouch)
@@ -136,7 +136,7 @@ - (void)updateTouchesCancelled:(NSSet*)touches
 
 
     // Ended touches - remove touches from allTouches and place them back into the deadpool
-    NSArray* deadTouches = [_allTouches objectsForKeys:keys notFoundMarker:[CCTouch touchWithPlatformTouch:nil]];
+    NSArray* deadTouches = [_allTouches objectsForKeys:keys notFoundMarker:[CCTouch touchWithUITouch:nil]];
     [_deadTouches addObjectsFromArray:deadTouches];
     [_allTouches removeObjectsForKeys:keys];
 }

cocos2d/Platforms/iOS/UITouch+CC.h

@@ -31,7 +31,7 @@
 #import "cocos2d.h"
 #import <UIKit/UIKit.h>
 
-@interface PlatformTouch (CC)
+@interface UITouch (CC)
 
 - (CGPoint) locationInNode:(CCNode*) node;
 - (CGPoint) locationInWorld;

cocos2d/Platforms/iOS/UITouch+CC.m

@@ -29,7 +29,7 @@
 
 #import "UITouch+CC.h"
 
-@implementation PlatformTouch (CC)
+@implementation UITouch (CC)
 
 - (CGPoint) locationInNode:(CCNode*) node
 {