From a643f05330b69a509480241c8185e3a9de3da457 Mon Sep 17 00:00:00 2001
From: Mircea Rila <mircea.rila@gmail.com>
Date: Tue, 11 Nov 2014 18:00:34 +0200
Subject: [PATCH] add touch callback types

---
 cocos/base/CCEventListenerTouch.h | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/cocos/base/CCEventListenerTouch.h b/cocos/base/CCEventListenerTouch.h
index 353c938e9d..603160b1e9 100644
--- a/cocos/base/CCEventListenerTouch.h
+++ b/cocos/base/CCEventListenerTouch.h
@@ -52,10 +52,14 @@ public:
     //
 
 public:
-    std::function<bool(Touch*, Event*)> onTouchBegan;
-    std::function<void(Touch*, Event*)> onTouchMoved;
-    std::function<void(Touch*, Event*)> onTouchEnded;
-    std::function<void(Touch*, Event*)> onTouchCancelled;
+
+    typedef std::function<bool(Touch*, Event*)> ccTouchBeganCallback;
+    typedef std::function<void(Touch*, Event*)> ccTouchCallback;
+
+    ccTouchBeganCallback onTouchBegan;
+    ccTouchCallback onTouchMoved;
+    ccTouchCallback onTouchEnded;
+    ccTouchCallback onTouchCancelled;
     
 CC_CONSTRUCTOR_ACCESS:
     EventListenerTouchOneByOne();
@@ -82,10 +86,13 @@ public:
     virtual bool checkAvailable() override;
     //
 public:
-    std::function<void(const std::vector<Touch*>&, Event*)> onTouchesBegan;
-    std::function<void(const std::vector<Touch*>&, Event*)> onTouchesMoved;
-    std::function<void(const std::vector<Touch*>&, Event*)> onTouchesEnded;
-    std::function<void(const std::vector<Touch*>&, Event*)> onTouchesCancelled;
+
+    typedef std::function<void(const std::vector<Touch*>&, Event*)> ccTouchesCallback;
+
+    ccTouchesCallback onTouchesBegan;
+    ccTouchesCallback onTouchesMoved;
+    ccTouchesCallback onTouchesEnded;
+    ccTouchesCallback onTouchesCancelled;
     
 CC_CONSTRUCTOR_ACCESS:
     EventListenerTouchAllAtOnce();