diff --git a/cocos2dx/include/CCSet.h b/cocos2dx/include/CCSet.h index 4b7dbb442d..c3277e84e4 100755 --- a/cocos2dx/include/CCSet.h +++ b/cocos2dx/include/CCSet.h @@ -80,7 +80,6 @@ private: std::set *m_pSet; }; -typedef CCSet NSMutableSet; }//namespace cocos2d #endif // __NS_SET_H__ diff --git a/cocos2dx/include/CCTouchHandler.h b/cocos2dx/include/CCTouchHandler.h index 3f97bd1ad2..d984f6eb8b 100755 --- a/cocos2dx/include/CCTouchHandler.h +++ b/cocos2dx/include/CCTouchHandler.h @@ -95,7 +95,7 @@ public: void setSwallowsTouches(bool bSwallowsTouches); /** MutableSet that contains the claimed touches */ - NSMutableSet* getClaimedTouches(void); + CCSet* getClaimedTouches(void); /** initializes a TargetedTouchHandler with a delegate, a priority and whether or not it swallows touches or not */ bool initWithDelegate(CCTouchDelegate *pDelegate, int nPriority, bool bSwallow); @@ -106,7 +106,7 @@ public: protected: bool m_bSwallowsTouches; - NSMutableSet *m_pClaimedTouches; + CCSet *m_pClaimedTouches; }; }//namespace cocos2d diff --git a/cocos2dx/touch_dispatcher/CCTouchHandler.cpp b/cocos2dx/touch_dispatcher/CCTouchHandler.cpp index 23c94617a0..2303cfd956 100644 --- a/cocos2dx/touch_dispatcher/CCTouchHandler.cpp +++ b/cocos2dx/touch_dispatcher/CCTouchHandler.cpp @@ -191,7 +191,7 @@ void CCTargetedTouchHandler::setSwallowsTouches(bool bSwallowsTouches) m_bSwallowsTouches = bSwallowsTouches; } -NSMutableSet* CCTargetedTouchHandler::getClaimedTouches(void) +CCSet* CCTargetedTouchHandler::getClaimedTouches(void) { return m_pClaimedTouches; } @@ -218,7 +218,7 @@ bool CCTargetedTouchHandler::initWithDelegate(CCTouchDelegate *pDelegate, int nP { if (CCTouchHandler::initWithDelegate(pDelegate, nPriority)) { - m_pClaimedTouches = new NSMutableSet(); + m_pClaimedTouches = new CCSet(); m_bSwallowsTouches = bSwallow; return true;