diff --git a/extensions/CCBReader/CCBAnimationManager.h b/extensions/CCBReader/CCBAnimationManager.h index 7bec78474b..1c6aa0db88 100644 --- a/extensions/CCBReader/CCBAnimationManager.h +++ b/extensions/CCBReader/CCBAnimationManager.h @@ -15,15 +15,15 @@ public: virtual void completedAnimationSequenceNamed(const char *name) = 0; }; -class CCBAnimationManager : public cocos2d::CCObject +class CCBAnimationManager : public CCObject { private: - cocos2d::CCArray *mSequences; - cocos2d::CCDictionary *mNodeSequences; - cocos2d::CCDictionary *mBaseValues; + CCArray *mSequences; + CCDictionary *mNodeSequences; + CCDictionary *mBaseValues; int mAutoPlaySequenceId; - cocos2d::CCNode *mRootNode; + CCNode *mRootNode; CCSize mRootContainerSize; CCBAnimationManagerDelegate *mDelegate; @@ -35,26 +35,26 @@ public: virtual bool init(); - cocos2d::CCArray* getSequences(); + CCArray* getSequences(); int getAutoPlaySequenceId(); void setAutoPlaySequenceId(int autoPlaySequenceId); - cocos2d::CCNode* getRootNode(); - void setRootNode(cocos2d::CCNode* pRootNode); // retain + CCNode* getRootNode(); + void setRootNode(CCNode* pRootNode); // retain - const cocos2d::CCSize& getRootContainerSize(); - void setRootContainerSize(const cocos2d::CCSize &rootContainerSize); + const CCSize& getRootContainerSize(); + void setRootContainerSize(const CCSize &rootContainerSize); CCBAnimationManagerDelegate* getDelegate(); void setDelegate(CCBAnimationManagerDelegate* pDelegate); // retain const char* getRunningSequenceName(); - const CCSize& getContainerSize(cocos2d::CCNode* pNode); + const CCSize& getContainerSize(CCNode* pNode); - void addNode(cocos2d::CCNode *pNode, cocos2d::CCDictionary *pSeq); - void setBaseValue(cocos2d::CCObject *pValue, cocos2d::CCNode *pNode, const char *pPropName); + void addNode(CCNode *pNode, CCDictionary *pSeq); + void setBaseValue(CCObject *pValue, CCNode *pNode, const char *pPropName); void runAnimations(const char *pName, float fTweenDuration); void runAnimations(const char *pName); @@ -63,33 +63,33 @@ public: void debug(); private: - cocos2d::CCObject* getBaseValue(cocos2d::CCNode *pNode, const char* pPropName); + CCObject* getBaseValue(CCNode *pNode, const char* pPropName); int getSequenceId(const char* pSequenceName); CCBSequence* getSequence(int nSequenceId); - cocos2d::CCActionInterval* getAction(CCBKeyframe *pKeyframe0, CCBKeyframe *pKeyframe1, const char *pPropName, cocos2d::CCNode *pNode); - void setAnimatedProperty(const char *pPropName, cocos2d::CCNode *pNode, cocos2d::CCObject *pValue, float fTweenDuraion); - void setFirstFrame(cocos2d::CCNode *pNode, CCBSequenceProperty *pSeqProp, float fTweenDuration); - cocos2d::CCActionInterval* getEaseAction(cocos2d::CCActionInterval *pAction, int nEasingType, float fEasingOpt); - void runAction(cocos2d::CCNode *pNode, CCBSequenceProperty *pSeqProp, float fTweenDuration); + CCActionInterval* getAction(CCBKeyframe *pKeyframe0, CCBKeyframe *pKeyframe1, const char *pPropName, CCNode *pNode); + void setAnimatedProperty(const char *pPropName, CCNode *pNode, CCObject *pValue, float fTweenDuraion); + void setFirstFrame(CCNode *pNode, CCBSequenceProperty *pSeqProp, float fTweenDuration); + CCActionInterval* getEaseAction(CCActionInterval *pAction, int nEasingType, float fEasingOpt); + void runAction(CCNode *pNode, CCBSequenceProperty *pSeqProp, float fTweenDuration); void sequenceCompleted(); }; -class CCBSetSpriteFrame : public cocos2d::CCActionInstant +class CCBSetSpriteFrame : public CCActionInstant { private: - cocos2d::CCSpriteFrame *mSpriteFrame; + CCSpriteFrame *mSpriteFrame; public: ~CCBSetSpriteFrame(); /** creates a Place action with a position */ - static CCBSetSpriteFrame* create(cocos2d::CCSpriteFrame *pSpriteFrame); - bool initWithSpriteFrame(cocos2d::CCSpriteFrame *pSpriteFrame); + static CCBSetSpriteFrame* create(CCSpriteFrame *pSpriteFrame); + bool initWithSpriteFrame(CCSpriteFrame *pSpriteFrame); virtual void update(float time); - virtual cocos2d::CCObject* copyWithZone(cocos2d::CCZone *pZone); + virtual CCObject* copyWithZone(CCZone *pZone); }; -class CCBRotateTo : public cocos2d::CCActionInterval +class CCBRotateTo : public CCActionInterval { private: float mStartAngle; @@ -100,8 +100,8 @@ public: static CCBRotateTo* create(float fDuration, float fAngle); bool initWithDuration(float fDuration, float fAngle); virtual void update(float time); - virtual cocos2d::CCObject* copyWithZone(cocos2d::CCZone *pZone); - virtual void startWithTarget(cocos2d::CCNode *pNode); + virtual CCObject* copyWithZone(CCZone *pZone); + virtual void startWithTarget(CCNode *pNode); }; NS_CC_EXT_END diff --git a/extensions/CCBReader/CCBKeyframe.h b/extensions/CCBReader/CCBKeyframe.h index 6a53760551..76d54ed02a 100644 --- a/extensions/CCBReader/CCBKeyframe.h +++ b/extensions/CCBReader/CCBKeyframe.h @@ -6,10 +6,10 @@ NS_CC_EXT_BEGIN -class CCBKeyframe : public cocos2d::CCObject +class CCBKeyframe : public CCObject { private: - cocos2d::CCObject *mValue; + CCObject *mValue; float mTime; int mEasingType; float mEasingOpt; @@ -18,8 +18,8 @@ public: CCBKeyframe(); ~CCBKeyframe(); - cocos2d::CCObject* getValue(); - void setValue(cocos2d::CCObject *pValue); // retain + CCObject* getValue(); + void setValue(CCObject *pValue); // retain float getTime(); void setTime(float fTime); diff --git a/extensions/CCBReader/CCBMemberVariableAssigner.h b/extensions/CCBReader/CCBMemberVariableAssigner.h index 41801d7980..9ca7cd8c8b 100644 --- a/extensions/CCBReader/CCBMemberVariableAssigner.h +++ b/extensions/CCBReader/CCBMemberVariableAssigner.h @@ -21,7 +21,7 @@ class CCBMemberVariableAssigner { public: virtual ~CCBMemberVariableAssigner() {}; - virtual bool onAssignCCBMemberVariable(CCObject * pTarget, cocos2d::CCString * pMemberVariableName, CCNode * pNode) = 0; + virtual bool onAssignCCBMemberVariable(CCObject * pTarget, CCString * pMemberVariableName, CCNode * pNode) = 0; }; NS_CC_EXT_END diff --git a/extensions/CCBReader/CCBSelectorResolver.h b/extensions/CCBReader/CCBSelectorResolver.h index 97d5c5df5b..2845f49aca 100644 --- a/extensions/CCBReader/CCBSelectorResolver.h +++ b/extensions/CCBReader/CCBSelectorResolver.h @@ -19,9 +19,9 @@ NS_CC_EXT_BEGIN class CCBSelectorResolver { public: virtual ~CCBSelectorResolver() {}; - virtual cocos2d::SEL_MenuHandler onResolveCCBCCMenuItemSelector(CCObject * pTarget, CCString * pSelectorName) = 0; + virtual SEL_MenuHandler onResolveCCBCCMenuItemSelector(CCObject * pTarget, CCString * pSelectorName) = 0; - virtual cocos2d::extension::SEL_CCControlHandler onResolveCCBCCControlSelector(CCObject * pTarget, CCString * pSelectorName) = 0; + virtual extension::SEL_CCControlHandler onResolveCCBCCControlSelector(CCObject * pTarget, CCString * pSelectorName) = 0; }; diff --git a/extensions/CCBReader/CCBSequence.h b/extensions/CCBReader/CCBSequence.h index b253f19888..80e4f6ce2c 100644 --- a/extensions/CCBReader/CCBSequence.h +++ b/extensions/CCBReader/CCBSequence.h @@ -7,7 +7,7 @@ NS_CC_EXT_BEGIN -class CCBSequence : public cocos2d::CCObject +class CCBSequence : public CCObject { private: float mDuration; diff --git a/extensions/CCBReader/CCBSequenceProperty.h b/extensions/CCBReader/CCBSequenceProperty.h index 4e790eeff4..0680700e39 100644 --- a/extensions/CCBReader/CCBSequenceProperty.h +++ b/extensions/CCBReader/CCBSequenceProperty.h @@ -7,7 +7,7 @@ NS_CC_EXT_BEGIN -class CCBSequenceProperty : public cocos2d::CCObject +class CCBSequenceProperty : public CCObject { private: std::string mName; diff --git a/extensions/CCBReader/CCBValue.cpp b/extensions/CCBReader/CCBValue.cpp index 3be6398bc1..79c93fb409 100644 --- a/extensions/CCBReader/CCBValue.cpp +++ b/extensions/CCBReader/CCBValue.cpp @@ -6,7 +6,7 @@ NS_CC_EXT_BEGIN // Implementation of ccColor3BWapper -ccColor3BWapper* ccColor3BWapper::create(const cocos2d::ccColor3B& color) +ccColor3BWapper* ccColor3BWapper::create(const ccColor3B& color) { ccColor3BWapper *ret = new ccColor3BWapper(); if (ret) diff --git a/extensions/CCBReader/CCBValue.h b/extensions/CCBReader/CCBValue.h index 2e760eb765..4c4c67332f 100644 --- a/extensions/CCBReader/CCBValue.h +++ b/extensions/CCBReader/CCBValue.h @@ -10,15 +10,15 @@ NS_CC_EXT_BEGIN -class ccColor3BWapper : public cocos2d::CCObject +class ccColor3BWapper : public CCObject { private: - cocos2d::ccColor3B color; + ccColor3B color; public: - static ccColor3BWapper* create(const cocos2d::ccColor3B& color); + static ccColor3BWapper* create(const ccColor3B& color); - const cocos2d::ccColor3B& getColor(); + const ccColor3B& getColor(); }; enum @@ -30,7 +30,7 @@ enum kUnsignedCharValue, }; -class CCBValue : public cocos2d::CCObject +class CCBValue : public CCObject { private: union diff --git a/extensions/CCBReader/CCData.h b/extensions/CCBReader/CCData.h index 5861339ab5..22b5dd967c 100644 --- a/extensions/CCBReader/CCData.h +++ b/extensions/CCBReader/CCData.h @@ -7,7 +7,7 @@ NS_CC_EXT_BEGIN -class CCData : public cocos2d::CCObject +class CCData : public CCObject { public: CCData(unsigned char *pBytes, const unsigned long nSize); diff --git a/extensions/CCBReader/CCNode+CCBRelativePositioning.h b/extensions/CCBReader/CCNode+CCBRelativePositioning.h index 066fb6202c..5de79563ea 100644 --- a/extensions/CCBReader/CCNode+CCBRelativePositioning.h +++ b/extensions/CCBReader/CCNode+CCBRelativePositioning.h @@ -6,9 +6,9 @@ NS_CC_EXT_BEGIN -extern cocos2d::CCPoint getAbsolutePosition(const cocos2d::CCPoint &pt, int nType, const cocos2d::CCSize &containerSize, const char *pPropName); +extern CCPoint getAbsolutePosition(const CCPoint &pt, int nType, const CCSize &containerSize, const char *pPropName); -extern void setRelativeScale(cocos2d::CCNode *pNode, float fScaleX, float fScaleY, int nType, const char* pPropName); +extern void setRelativeScale(CCNode *pNode, float fScaleX, float fScaleY, int nType, const char* pPropName); NS_CC_EXT_END diff --git a/extensions/CCBReader/CCNodeLoader.h b/extensions/CCBReader/CCNodeLoader.h index 175e96f0aa..f59134ebc9 100644 --- a/extensions/CCBReader/CCNodeLoader.h +++ b/extensions/CCBReader/CCNodeLoader.h @@ -19,11 +19,11 @@ NS_CC_EXT_BEGIN #define ASSERT_FAIL_UNEXPECTED_PROPERTY(PROPERTY) CCLog("Unexpected property: '%s'!\n", PROPERTY->getCString()); assert(false) #define ASSERT_FAIL_UNEXPECTED_PROPERTYTYPE(PROPERTYTYPE) CCLog("Unexpected property type: '%d'!\n", PROPERTYTYPE); assert(false) -#define CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(T) virtual T * createCCNode(cocos2d::CCNode * pParent, cocos2d::extension::CCBReader * pCCBReader) { \ +#define CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(T) virtual T * createCCNode(CCNode * pParent, extension::CCBReader * pCCBReader) { \ return T::create(); \ } -#define CCB_PURE_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(T) virtual T * createCCNode(cocos2d::CCNode * pParent, cocos2d::extension::CCBReader * pCCBReader) = 0 +#define CCB_PURE_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(T) virtual T * createCCNode(CCNode * pParent, extension::CCBReader * pCCBReader) = 0 struct BlockData { SEL_MenuHandler mSELMenuHandler; diff --git a/extensions/GUI/CCControlExtension/CCInvocation.h b/extensions/GUI/CCControlExtension/CCInvocation.h index 034e57ea48..9aa88ad2d7 100644 --- a/extensions/GUI/CCControlExtension/CCInvocation.h +++ b/extensions/GUI/CCControlExtension/CCInvocation.h @@ -19,20 +19,20 @@ NS_CC_EXT_BEGIN typedef unsigned int CCControlEvent; -typedef void (cocos2d::CCObject::*SEL_CCControlHandler)(cocos2d::CCObject*, CCControlEvent); +typedef void (CCObject::*SEL_CCControlHandler)(CCObject*, CCControlEvent); #define cccontrol_selector(_SELECTOR) (SEL_CCControlHandler)(&_SELECTOR) -class CCInvocation : public cocos2d::CCObject +class CCInvocation : public CCObject { CC_SYNTHESIZE_READONLY(SEL_CCControlHandler, m_action, Action); CC_SYNTHESIZE_READONLY(CCObject*, m_target, Target); CC_SYNTHESIZE_READONLY(CCControlEvent, m_controlEvent, ControlEvent); public: - CCInvocation(cocos2d::CCObject* target, SEL_CCControlHandler action, CCControlEvent controlEvent); + CCInvocation(CCObject* target, SEL_CCControlHandler action, CCControlEvent controlEvent); - void invoke(cocos2d::CCObject* sender); + void invoke(CCObject* sender); }; // end of GUI group diff --git a/extensions/network/HttpClient.h b/extensions/network/HttpClient.h index c63d32042a..41a227a83a 100644 --- a/extensions/network/HttpClient.h +++ b/extensions/network/HttpClient.h @@ -43,7 +43,7 @@ NS_CC_EXT_BEGIN /** @brief Singleton that handles asynchrounous http requests * Once the request completed, a callback will issued in main thread when it provided during make request */ -class CCHttpClient : public cocos2d::CCObject +class CCHttpClient : public CCObject { public: /** Return the shared instance **/ diff --git a/extensions/network/HttpRequest.h b/extensions/network/HttpRequest.h index 89c1a3f812..c6dd2a8781 100644 --- a/extensions/network/HttpRequest.h +++ b/extensions/network/HttpRequest.h @@ -35,7 +35,7 @@ NS_CC_EXT_BEGIN Please refer to samples/TestCpp/Classes/ExtensionTest/NetworkTest/HttpClientTest.cpp as a sample @since v2.0.2 */ -class CCHttpRequest : public cocos2d::CCObject +class CCHttpRequest : public CCObject { public: /** Use this enum type as param in setReqeustType(param) */ @@ -155,7 +155,7 @@ public: /** Required field. You should set the callback selector function at ack the http request completed */ - inline void setResponseCallback(cocos2d::CCObject* pTarget, cocos2d::SEL_CallFuncND pSelector) + inline void setResponseCallback(CCObject* pTarget, SEL_CallFuncND pSelector) { _pTarget = pTarget; _pSelector = pSelector; @@ -171,7 +171,7 @@ public: return _pTarget; } /** Get the selector function pointer, mainly used by CCHttpClient */ - inline cocos2d::SEL_CallFuncND getSelector() + inline SEL_CallFuncND getSelector() { return _pSelector; } @@ -182,8 +182,8 @@ protected: std::string _url; /// target url that this request is sent to std::vector _requestData; /// used for POST std::string _tag; /// user defined tag, to identify different requests in response callback - cocos2d::CCObject* _pTarget; /// callback target of pSelector function - cocos2d::SEL_CallFuncND _pSelector; /// callback function, e.g. MyLayer::onHttpResponse(CCObject *sender, void *data) + CCObject* _pTarget; /// callback target of pSelector function + SEL_CallFuncND _pSelector; /// callback function, e.g. MyLayer::onHttpResponse(CCObject *sender, void *data) void* _pUserData; /// You can add your customed data here }; diff --git a/extensions/network/HttpResponse.h b/extensions/network/HttpResponse.h index 4a5921221f..d0321451fb 100644 --- a/extensions/network/HttpResponse.h +++ b/extensions/network/HttpResponse.h @@ -36,7 +36,7 @@ NS_CC_EXT_BEGIN Please refer to samples/TestCpp/Classes/ExtensionTest/NetworkTest/HttpClientTest.cpp as a sample @since v2.0.2 */ -class CCHttpResponse : public cocos2d::CCObject +class CCHttpResponse : public CCObject { public: /** Constructor, it's used by CCHttpClient internal, users don't need to create HttpResponse manually