diff --git a/cocos/2d/CCActionGrid.h b/cocos/2d/CCActionGrid.h index 92ec2cbc52..ea38ef2337 100644 --- a/cocos/2d/CCActionGrid.h +++ b/cocos/2d/CCActionGrid.h @@ -85,7 +85,7 @@ class CC_DLL Grid3DAction : public GridAction public: /** returns the grid */ - virtual GridBase* getGrid(); + virtual GridBase* getGrid() override; /** returns the vertex than belongs to certain position in the grid * @js NA * @lua NA @@ -165,7 +165,7 @@ public: void setTile(const Vec2& position, const Quad3& coords); /** returns the grid */ - virtual GridBase* getGrid(); + virtual GridBase* getGrid() override; // Override virtual TiledGrid3DAction * clone() const override diff --git a/cocos/2d/CCActionPageTurn3D.h b/cocos/2d/CCActionPageTurn3D.h index 7e742f7c6a..40758f6444 100644 --- a/cocos/2d/CCActionPageTurn3D.h +++ b/cocos/2d/CCActionPageTurn3D.h @@ -47,7 +47,7 @@ NS_CC_BEGIN class CC_DLL PageTurn3D : public Grid3DAction { public: - virtual GridBase* getGrid(); + virtual GridBase* getGrid() override; /** create the action */ static PageTurn3D* create(float duration, const Size& gridSize); diff --git a/cocos/2d/CCActionTiledGrid.h b/cocos/2d/CCActionTiledGrid.h index a7b8f8b1a8..914959bb39 100644 --- a/cocos/2d/CCActionTiledGrid.h +++ b/cocos/2d/CCActionTiledGrid.h @@ -217,7 +217,7 @@ public: */ static FadeOutUpTiles* create(float duration, const Size& gridSize); - virtual void transformTile(const Vec2& pos, float distance); + virtual void transformTile(const Vec2& pos, float distance) override; // Overrides virtual FadeOutUpTiles* clone() const override; diff --git a/cocos/2d/CCClippingNode.h b/cocos/2d/CCClippingNode.h index 9700681638..aa164b49b1 100644 --- a/cocos/2d/CCClippingNode.h +++ b/cocos/2d/CCClippingNode.h @@ -115,7 +115,7 @@ CC_CONSTRUCTOR_ACCESS: /** Initializes a clipping node without a stencil. */ - virtual bool init(); + virtual bool init() override; /** Initializes a clipping node with an other node as its stencil. The stencil node will be retained, and its parent will be set to this clipping node. diff --git a/cocos/2d/CCDrawNode.h b/cocos/2d/CCDrawNode.h index c9257973e3..537dd55e84 100644 --- a/cocos/2d/CCDrawNode.h +++ b/cocos/2d/CCDrawNode.h @@ -134,7 +134,7 @@ public: CC_CONSTRUCTOR_ACCESS: DrawNode(); virtual ~DrawNode(); - virtual bool init(); + virtual bool init() override; protected: void ensureCapacity(int count); diff --git a/cocos/2d/CCLabelAtlas.h b/cocos/2d/CCLabelAtlas.h index 95b9d029d6..87caad6fc2 100644 --- a/cocos/2d/CCLabelAtlas.h +++ b/cocos/2d/CCLabelAtlas.h @@ -78,7 +78,7 @@ public: bool initWithString(const std::string& string, Texture2D* texture, int itemWidth, int itemHeight, int startCharMap); // super methods - virtual void updateAtlasValues(); + virtual void updateAtlasValues() override; virtual void setString(const std::string &label) override; virtual const std::string& getString(void) const override; diff --git a/cocos/2d/CCLabelBMFont.h b/cocos/2d/CCLabelBMFont.h index 170c1badd9..88f380d122 100644 --- a/cocos/2d/CCLabelBMFont.h +++ b/cocos/2d/CCLabelBMFont.h @@ -111,8 +111,8 @@ public: virtual void setLineBreakWithoutSpace(bool breakWithoutSpace); // RGBAProtocol - virtual bool isOpacityModifyRGB() const; - virtual void setOpacityModifyRGB(bool isOpacityModifyRGB); + virtual bool isOpacityModifyRGB() const override; + virtual void setOpacityModifyRGB(bool isOpacityModifyRGB) override; void setFntFile(const std::string& fntFile, const Vec2& imageOffset = Vec2::ZERO); const std::string& getFntFile() const; diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h index fade59b2e2..3435a248af 100644 --- a/cocos/2d/CCLayer.h +++ b/cocos/2d/CCLayer.h @@ -286,7 +286,7 @@ CC_CONSTRUCTOR_ACCESS: LayerColor(); virtual ~LayerColor(); - bool init(); + bool init() override; bool initWithColor(const Color4B& color, GLfloat width, GLfloat height); bool initWithColor(const Color4B& color); @@ -378,7 +378,7 @@ CC_CONSTRUCTOR_ACCESS: LayerGradient(); virtual ~LayerGradient(); - virtual bool init(); + virtual bool init() override; /** Initializes the Layer with a gradient between start and end. * @js init * @lua init @@ -483,7 +483,7 @@ CC_CONSTRUCTOR_ACCESS: */ virtual ~LayerMultiplex(); - virtual bool init(); + virtual bool init() override; /** initializes a MultiplexLayer with one or more layers using a variable argument list. * @js NA * @lua NA diff --git a/cocos/2d/CCMenu.h b/cocos/2d/CCMenu.h index e49932beb6..0e8a6eb685 100644 --- a/cocos/2d/CCMenu.h +++ b/cocos/2d/CCMenu.h @@ -120,10 +120,10 @@ public: virtual bool isEnabled() const { return _enabled; } virtual void setEnabled(bool value) { _enabled = value; }; - virtual bool onTouchBegan(Touch* touch, Event* event); - virtual void onTouchEnded(Touch* touch, Event* event); - virtual void onTouchCancelled(Touch* touch, Event* event); - virtual void onTouchMoved(Touch* touch, Event* event); + virtual bool onTouchBegan(Touch* touch, Event* event) override; + virtual void onTouchEnded(Touch* touch, Event* event) override; + virtual void onTouchCancelled(Touch* touch, Event* event) override; + virtual void onTouchMoved(Touch* touch, Event* event) override; // overrides virtual void removeChild(Node* child, bool cleanup) override; @@ -148,7 +148,7 @@ CC_CONSTRUCTOR_ACCESS: virtual ~Menu(); /** initializes an empty Menu */ - bool init(); + bool init() override; /** initializes a Menu with a NSArray of MenuItem objects */ bool initWithArray(const Vector& arrayOfItems); diff --git a/cocos/2d/CCParticleBatchNode.h b/cocos/2d/CCParticleBatchNode.h index 21075b2862..b457f31d6a 100644 --- a/cocos/2d/CCParticleBatchNode.h +++ b/cocos/2d/CCParticleBatchNode.h @@ -79,7 +79,7 @@ public: void insertChild(ParticleSystem* system, int index); void removeChildAtIndex(int index, bool doCleanup); - void removeAllChildrenWithCleanup(bool doCleanup); + void removeAllChildrenWithCleanup(bool doCleanup) override; /** disables a particle by inserting a 0'd quad into the texture atlas */ void disableParticle(int particleIndex); diff --git a/cocos/2d/CCParticleExamples.h b/cocos/2d/CCParticleExamples.h index afbee946fb..7427951519 100644 --- a/cocos/2d/CCParticleExamples.h +++ b/cocos/2d/CCParticleExamples.h @@ -54,7 +54,7 @@ CC_CONSTRUCTOR_ACCESS: */ virtual ~ParticleFire(){} - bool init(){ return initWithTotalParticles(250); } + bool init() override { return initWithTotalParticles(250); } virtual bool initWithTotalParticles(int numberOfParticles) override; private: diff --git a/cocos/2d/CCParticleSystem.h b/cocos/2d/CCParticleSystem.h index 58627ee488..8ceebe94e5 100644 --- a/cocos/2d/CCParticleSystem.h +++ b/cocos/2d/CCParticleSystem.h @@ -231,10 +231,10 @@ public: virtual float getRotatePerSecondVar() const; virtual void setRotatePerSecondVar(float degrees); - virtual void setScale(float s); - virtual void setRotation(float newRotation); - virtual void setScaleX(float newScaleX); - virtual void setScaleY(float newScaleY); + virtual void setScale(float s) override; + virtual void setRotation(float newRotation) override; + virtual void setScaleX(float newScaleX) override; + virtual void setScaleY(float newScaleY) override; virtual bool isActive() const; virtual bool isBlendAdditive() const; @@ -342,8 +342,8 @@ public: virtual void setTotalParticles(int totalParticles); /** does the alpha value modify color */ - inline void setOpacityModifyRGB(bool opacityModifyRGB) { _opacityModifyRGB = opacityModifyRGB; }; - inline bool isOpacityModifyRGB() const { return _opacityModifyRGB; }; + inline void setOpacityModifyRGB(bool opacityModifyRGB) override { _opacityModifyRGB = opacityModifyRGB; }; + inline bool isOpacityModifyRGB() const override { return _opacityModifyRGB; }; CC_DEPRECATED_ATTRIBUTE inline bool getOpacityModifyRGB() const { return isOpacityModifyRGB(); } /** particles movement type: Free or Grouped @@ -384,7 +384,7 @@ CC_CONSTRUCTOR_ACCESS: virtual ~ParticleSystem(); /** initializes a ParticleSystem*/ - bool init(); + bool init() override; /** initializes a ParticleSystem from a plist file. This plist files can be created manually or with Particle Designer: http://particledesigner.71squared.com/ diff --git a/cocos/2d/CCScene.h b/cocos/2d/CCScene.h index 4a756abd0e..313738828c 100644 --- a/cocos/2d/CCScene.h +++ b/cocos/2d/CCScene.h @@ -87,7 +87,7 @@ CC_CONSTRUCTOR_ACCESS: Scene(); virtual ~Scene(); - bool init(); + bool init() override; bool initWithSize(const Size& size); void setCameraOrderDirty() { _cameraOrderDirty = true; } diff --git a/cocos/2d/CCSprite.h b/cocos/2d/CCSprite.h index 5359e95c83..8c92481d19 100644 --- a/cocos/2d/CCSprite.h +++ b/cocos/2d/CCSprite.h @@ -159,7 +159,7 @@ public: /** * Updates the quad according the rotation, position, scale values. */ - virtual void updateTransform(); + virtual void updateTransform() override; /** * Returns the batch node object if this sprite is rendered by SpriteBatchNode @@ -427,7 +427,7 @@ CC_CONSTRUCTOR_ACCESS: virtual ~Sprite(); /* Initializes an empty sprite with nothing init. */ - virtual bool init(); + virtual bool init() override; /** * Initializes a sprite with a texture. @@ -515,7 +515,7 @@ CC_CONSTRUCTOR_ACCESS: protected: - void updateColor(); + void updateColor() override; virtual void setTextureCoords(Rect rect); virtual void updateBlendFunc(); virtual void setReorderChildDirtyRecursively(); diff --git a/cocos/2d/CCSpriteBatchNode.h b/cocos/2d/CCSpriteBatchNode.h index c877aceb9c..8c627bb909 100644 --- a/cocos/2d/CCSpriteBatchNode.h +++ b/cocos/2d/CCSpriteBatchNode.h @@ -178,7 +178,7 @@ CC_CONSTRUCTOR_ACCESS: * @lua init */ bool initWithFile(const std::string& fileImage, ssize_t capacity = DEFAULT_CAPACITY); - bool init(); + bool init() override; protected: /** Updates a quad at a certain index into the texture atlas. The Sprite won't be added into the children array. diff --git a/cocos/2d/CCTextFieldTTF.h b/cocos/2d/CCTextFieldTTF.h index 1e9b85f4f3..3b39aeb48b 100644 --- a/cocos/2d/CCTextFieldTTF.h +++ b/cocos/2d/CCTextFieldTTF.h @@ -123,12 +123,12 @@ public: /** @brief Open keyboard and receive input text. */ - virtual bool attachWithIME(); + virtual bool attachWithIME() override; /** @brief End text input and close keyboard. */ - virtual bool detachWithIME(); + virtual bool detachWithIME() override; ////////////////////////////////////////////////////////////////////////// // properties diff --git a/cocos/2d/CCTransition.h b/cocos/2d/CCTransition.h index bc7e58e461..8a28b1addf 100644 --- a/cocos/2d/CCTransition.h +++ b/cocos/2d/CCTransition.h @@ -193,7 +193,7 @@ public: /** returns the action that will be performed */ virtual ActionInterval* action(void); - virtual ActionInterval* easeActionWithAction(ActionInterval * action); + virtual ActionInterval* easeActionWithAction(ActionInterval * action) override; // // Overrides @@ -277,7 +277,7 @@ class CC_DLL TransitionSlideInL : public TransitionScene, public TransitionEaseS public: static TransitionSlideInL* create(float t, Scene* scene); - virtual ActionInterval* easeActionWithAction(ActionInterval * action); + virtual ActionInterval* easeActionWithAction(ActionInterval * action) override; /** returns the action that will be performed by the incoming and outgoing scene */ virtual ActionInterval* action(void); @@ -310,7 +310,7 @@ public: static TransitionSlideInR* create(float t, Scene* scene); /** returns the action that will be performed by the incoming and outgoing scene */ - virtual ActionInterval* action(void); + virtual ActionInterval* action(void) override; CC_CONSTRUCTOR_ACCESS: TransitionSlideInR(); @@ -318,7 +318,7 @@ CC_CONSTRUCTOR_ACCESS: protected: /** initializes the scenes */ - virtual void initScenes(void); + virtual void initScenes(void) override; virtual void sceneOrder() override; @@ -335,7 +335,7 @@ public: static TransitionSlideInB* create(float t, Scene* scene); /** returns the action that will be performed by the incoming and outgoing scene */ - virtual ActionInterval* action(void); + virtual ActionInterval* action(void) override; CC_CONSTRUCTOR_ACCESS: TransitionSlideInB(); @@ -343,7 +343,7 @@ CC_CONSTRUCTOR_ACCESS: protected: /** initializes the scenes */ - virtual void initScenes(); + virtual void initScenes() override; virtual void sceneOrder() override; @@ -360,7 +360,7 @@ public: static TransitionSlideInT* create(float t, Scene* scene); /** returns the action that will be performed by the incoming and outgoing scene */ - virtual ActionInterval* action(void); + virtual ActionInterval* action(void) override; CC_CONSTRUCTOR_ACCESS: TransitionSlideInT(); @@ -368,7 +368,7 @@ CC_CONSTRUCTOR_ACCESS: protected: /** initializes the scenes */ - virtual void initScenes(void); + virtual void initScenes(void) override; virtual void sceneOrder() override; @@ -753,7 +753,7 @@ CC_CONSTRUCTOR_ACCESS: virtual ~TransitionFadeTR(); protected: - virtual void sceneOrder(); + virtual void sceneOrder() override; NodeGrid* _outSceneProxy; diff --git a/cocos/3d/CCBillBoard.h b/cocos/3d/CCBillBoard.h index 13862a97ee..059470f59c 100644 --- a/cocos/3d/CCBillBoard.h +++ b/cocos/3d/CCBillBoard.h @@ -90,7 +90,7 @@ public: //override /** update billboard's transform and turn it towards camera */ - virtual void visit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags); + virtual void visit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags) override; /** draw BillBoard object */ virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; diff --git a/cocos/3d/CCSprite3D.h b/cocos/3d/CCSprite3D.h index 1d2ba96096..b2567b5374 100644 --- a/cocos/3d/CCSprite3D.h +++ b/cocos/3d/CCSprite3D.h @@ -165,7 +165,7 @@ CC_CONSTRUCTOR_ACCESS: Sprite3D(); virtual ~Sprite3D(); - bool init(); + virtual bool init() override; bool initWithFile(const std::string &path); diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h index 98d50d1677..53aa8559ca 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h @@ -103,7 +103,7 @@ public: TextureFrame(); - virtual void setNode(cocos2d::Node* node); + virtual void setNode(cocos2d::Node* node) override; virtual void onEnter(Frame *nextFrame, int currentFrameIndex) override; virtual Frame* clone() override; @@ -341,7 +341,7 @@ public: EventFrame(); - virtual void setNode(cocos2d::Node* node); + virtual void setNode(cocos2d::Node* node) override; virtual void onEnter(Frame *nextFrame, int currentFrameIndex) override; virtual Frame* clone() override; diff --git a/cocos/editor-support/cocostudio/CCArmatureAnimation.h b/cocos/editor-support/cocostudio/CCArmatureAnimation.h index 04ab3af4f1..62146793a1 100644 --- a/cocos/editor-support/cocostudio/CCArmatureAnimation.h +++ b/cocos/editor-support/cocostudio/CCArmatureAnimation.h @@ -157,15 +157,15 @@ public: /** * Pause the Process */ - virtual void pause(); + virtual void pause() override; /** * Resume the Process */ - virtual void resume(); + virtual void resume() override; /** * Stop the Process */ - virtual void stop(); + virtual void stop() override; /** @@ -173,7 +173,7 @@ public: */ ssize_t getMovementCount() const; - void update(float dt); + virtual void update(float dt) override; /** * Get current movementID @@ -242,7 +242,7 @@ protected: * @js NA * @lua NA */ - void updateHandler(); + void updateHandler() override; /** * Update current key frame, and process auto stop, pause diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.h b/cocos/editor-support/cocostudio/CCSGUIReader.h index 48a36b2ace..cafeae4043 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.h +++ b/cocos/editor-support/cocostudio/CCSGUIReader.h @@ -148,9 +148,9 @@ public: WidgetPropertiesReader0250(){}; virtual ~WidgetPropertiesReader0250(){}; - virtual cocos2d::ui::Widget* createWidget(const rapidjson::Value& dic, const char* fullPath, const char* fileName); + virtual cocos2d::ui::Widget* createWidget(const rapidjson::Value& dic, const char* fullPath, const char* fileName) override; - virtual cocos2d::ui::Widget* widgetFromJsonDictionary(const rapidjson::Value& dic); + virtual cocos2d::ui::Widget* widgetFromJsonDictionary(const rapidjson::Value& dic) override; //added for binary parsing virtual cocos2d::ui::Widget* createWidgetFromBinary(CocoLoader* cocoLoader, @@ -158,12 +158,12 @@ public: const char* fileName)override{return nullptr;} virtual cocos2d::ui::Widget* widgetFromBinary(CocoLoader* cocoLoader, - stExpCocoNode* pCocoNode){return nullptr;} + stExpCocoNode* pCocoNode) override {return nullptr;} virtual void setPropsForAllWidgetFromBinary(WidgetReaderProtocol* reader, cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, - stExpCocoNode* pCocoNode) {} + stExpCocoNode* pCocoNode) override {} virtual void setPropsForWidgetFromJsonDictionary(cocos2d::ui::Widget* widget,const rapidjson::Value& options); @@ -181,10 +181,10 @@ public: virtual void setPropsForLayoutFromJsonDictionary(cocos2d::ui::Widget* widget,const rapidjson::Value& options); virtual void setPropsForScrollViewFromJsonDictionary(cocos2d::ui::Widget* widget,const rapidjson::Value& options); - virtual void setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol* reader, cocos2d::ui::Widget* widget, const rapidjson::Value& options); + virtual void setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol* reader, cocos2d::ui::Widget* widget, const rapidjson::Value& options) override; virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType, cocos2d::ui::Widget* widget, - const rapidjson::Value& customOptions); + const rapidjson::Value& customOptions) override; }; class CC_STUDIO_DLL WidgetPropertiesReader0300 : public WidgetPropertiesReader @@ -197,7 +197,7 @@ public: virtual cocos2d::ui::Widget* createWidget(const rapidjson::Value& dic, const char* fullPath, - const char* fileName); + const char* fileName) override; //add bin parse support @@ -206,12 +206,12 @@ public: const char* fileName)override; virtual cocos2d::ui::Widget* widgetFromBinary(CocoLoader* cocoLoader, - stExpCocoNode* pCocoNode); + stExpCocoNode* pCocoNode) override; virtual void setPropsForAllWidgetFromBinary(WidgetReaderProtocol* reader, cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, - stExpCocoNode* pCocoNode); + stExpCocoNode* pCocoNode) override; virtual void setPropsForAllCustomWidgetFromBinary(const std::string& classType, cocos2d::ui::Widget* widget, @@ -220,15 +220,15 @@ public: //TODO: custom property } - virtual cocos2d::ui::Widget* widgetFromJsonDictionary(const rapidjson::Value& dic); + virtual cocos2d::ui::Widget* widgetFromJsonDictionary(const rapidjson::Value& dic) override; virtual void setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol* reader, cocos2d::ui::Widget* widget, - const rapidjson::Value& options); + const rapidjson::Value& options) override; virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType, cocos2d::ui::Widget* widget, - const rapidjson::Value& customOptions); + const rapidjson::Value& customOptions) override; }; diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h index 941680c4f5..a3930d8ed2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h @@ -53,8 +53,8 @@ public: static void purge(); flatbuffers::Offset createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, - flatbuffers::FlatBufferBuilder* builder); - void setPropsWithFlatBuffers(cocos2d::Node* node, const flatbuffers::Table* textBMFontOptions); + flatbuffers::FlatBufferBuilder* builder) override; + void setPropsWithFlatBuffers(cocos2d::Node* node, const flatbuffers::Table* textBMFontOptions) override; //CSArmatureNode cocos2d::Node* createNodeWithFlatBuffers(const flatbuffers::Table* nodeOptions) override; diff --git a/cocos/platform/desktop/CCGLViewImpl-desktop.h b/cocos/platform/desktop/CCGLViewImpl-desktop.h index 02865770bb..a5b323ca1e 100644 --- a/cocos/platform/desktop/CCGLViewImpl-desktop.h +++ b/cocos/platform/desktop/CCGLViewImpl-desktop.h @@ -67,15 +67,15 @@ public: //void resize(int width, int height); - float getFrameZoomFactor() const; + float getFrameZoomFactor() const override; //void centerWindow(); - virtual void setViewPortInPoints(float x , float y , float w , float h); - virtual void setScissorInPoints(float x , float y , float w , float h); + virtual void setViewPortInPoints(float x , float y , float w , float h) override; + virtual void setScissorInPoints(float x , float y , float w , float h) override; - bool windowShouldClose(); - void pollEvents(); + bool windowShouldClose() override; + void pollEvents() override; GLFWwindow* getWindow() const { return _mainWindow; } /* override functions */ @@ -88,7 +88,7 @@ public: /* * Set zoom factor for frame. This method is for debugging big resolution (e.g.new ipad) app on desktop. */ - void setFrameZoomFactor(float zoomFactor); + void setFrameZoomFactor(float zoomFactor) override; /** * Hide or Show the mouse cursor if there is one. */ @@ -101,7 +101,7 @@ public: bool isRetinaEnabled() const { return _isRetinaEnabled; }; /** Get retina factor */ - int getRetinaFactor() const { return _retinaFactor; } + int getRetinaFactor() const override { return _retinaFactor; } #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) HWND getWin32Window() { return glfwGetWin32Window(_mainWindow); } diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h index 10e4277960..4215e6525e 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h @@ -46,7 +46,7 @@ public: CC_DEPRECATED_ATTRIBUTE static LuaEngine* defaultEngine(void) { return LuaEngine::getInstance(); } virtual ~LuaEngine(void); - virtual ccScriptType getScriptType() { + virtual ccScriptType getScriptType() override { return kScriptTypeLua; }; @@ -77,17 +77,17 @@ public: @brief Remove Object from lua state @param object to remove */ - virtual void removeScriptObjectByObject(Ref* object); + virtual void removeScriptObjectByObject(Ref* object) override; /** @brief Remove Lua function reference */ - virtual void removeScriptHandler(int nHandler); + virtual void removeScriptHandler(int nHandler) override; /** @brief Reallocate Lua function reference */ - virtual int reallocateScriptHandler(int nHandler); + virtual int reallocateScriptHandler(int nHandler) override; /** @brief Execute script code contained in the given string. @@ -95,13 +95,13 @@ public: @return 0 if the string is excuted correctly. @return other if the string is excuted wrongly. */ - virtual int executeString(const char* codes); + virtual int executeString(const char* codes) override; /** @brief Execute a script file. @param filename String object holding the filename of the script file that is to be executed */ - virtual int executeScriptFile(const char* filename); + virtual int executeScriptFile(const char* filename) override; /** @brief Execute a scripted global function. @@ -109,7 +109,7 @@ public: @param functionName String object holding the name of the function, in the global script environment, that is to be executed. @return The integer value returned from the script function. */ - virtual int executeGlobalFunction(const char* functionName); + virtual int executeGlobalFunction(const char* functionName) override; virtual int executeNodeEvent(Node* pNode, int nAction); virtual int executeMenuItemEvent(MenuItem* pMenuItem); @@ -123,7 +123,7 @@ public: virtual int executeAccelerometerEvent(Layer* pLayer, Acceleration* pAccelerationValue); virtual int executeEvent(int nHandler, const char* pEventName, Ref* pEventSource = NULL, const char* pEventSourceClassName = NULL); - virtual bool handleAssert(const char *msg); + virtual bool handleAssert(const char *msg) override; virtual bool parseConfig(ConfigType type, const std::string& str) override; virtual int sendEvent(ScriptEvent* message) override; diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h index 331fd298ac..e184e039fc 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h +++ b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h @@ -74,7 +74,7 @@ public: static LuaCallFunc* create(const std::function& func); bool initWithFunction(const std::function& func); - virtual LuaCallFunc* clone() const; + virtual LuaCallFunc* clone() const override; virtual void execute() override; protected: /** diff --git a/cocos/ui/UICheckBox.h b/cocos/ui/UICheckBox.h index a2ac4e96d1..ba31e82760 100644 --- a/cocos/ui/UICheckBox.h +++ b/cocos/ui/UICheckBox.h @@ -230,7 +230,7 @@ protected: void selectedEvent(); void unSelectedEvent(); - virtual void releaseUpEvent(); + virtual void releaseUpEvent() override; virtual void onSizeChanged() override; diff --git a/cocos/ui/UIEditBox/UIEditBox.h b/cocos/ui/UIEditBox/UIEditBox.h index 27d1c65e27..08ddadd011 100644 --- a/cocos/ui/UIEditBox/UIEditBox.h +++ b/cocos/ui/UIEditBox/UIEditBox.h @@ -444,7 +444,7 @@ namespace ui { void touchDownAction(Ref *sender, TouchEventType controlEvent); protected: - virtual void adaptRenderers(); + virtual void adaptRenderers() override; void updatePosition(float dt); EditBoxImpl* _editBoxImpl; diff --git a/cocos/ui/UIPageView.h b/cocos/ui/UIPageView.h index 65078870e9..cf1bb26b7c 100644 --- a/cocos/ui/UIPageView.h +++ b/cocos/ui/UIPageView.h @@ -205,7 +205,7 @@ protected: virtual void handleMoveLogic(Touch *touch) ; virtual void handleReleaseLogic(Touch *touch) ; - virtual void interceptTouchEvent(TouchEventType event, Widget* sender,Touch *touch) ; + virtual void interceptTouchEvent(TouchEventType event, Widget* sender,Touch *touch) override; virtual void onSizeChanged() override; diff --git a/cocos/ui/UIRichText.h b/cocos/ui/UIRichText.h index 8dc1f47cdf..9302b3ddcc 100644 --- a/cocos/ui/UIRichText.h +++ b/cocos/ui/UIRichText.h @@ -105,19 +105,19 @@ public: void removeElement(RichElement* element); void setVerticalSpace(float space); - virtual void setAnchorPoint(const Vec2 &pt); + virtual void setAnchorPoint(const Vec2 &pt) override; virtual Size getVirtualRendererSize() const override; void formatText(); - virtual void ignoreContentAdaptWithSize(bool ignore); + virtual void ignoreContentAdaptWithSize(bool ignore) override; virtual std::string getDescription() const override; CC_CONSTRUCTOR_ACCESS: virtual bool init() override; protected: - virtual void adaptRenderers(); + virtual void adaptRenderers() override; - virtual void initRenderer(); + virtual void initRenderer() override; void pushToContainer(Node* renderer); void handleTextRenderer(const std::string& text, const std::string& fontName, float fontSize, const Color3B& color, GLubyte opacity); void handleImageRenderer(const std::string& fileParh, const Color3B& color, GLubyte opacity); diff --git a/cocos/ui/UIScale9Sprite.h b/cocos/ui/UIScale9Sprite.h index 04ff5bd852..9d8e7d3ddf 100644 --- a/cocos/ui/UIScale9Sprite.h +++ b/cocos/ui/UIScale9Sprite.h @@ -237,7 +237,7 @@ namespace ui { */ virtual bool initWithSpriteFrameName(const std::string& spriteFrameName); - virtual bool init(); + virtual bool init() override; virtual bool init(Sprite* sprite, const Rect& rect, bool rotated, const Rect& capInsets); virtual bool init(Sprite* sprite, const Rect& rect, const Rect& capInsets); virtual bool init(Sprite* sprite, const Rect& rect, bool rotated, const Vec2 &offset, const Size &originalSize, const Rect& capInsets); diff --git a/cocos/ui/UITextField.h b/cocos/ui/UITextField.h index fcb9f86539..fd783a9f3e 100644 --- a/cocos/ui/UITextField.h +++ b/cocos/ui/UITextField.h @@ -54,8 +54,8 @@ public: virtual bool onTextFieldInsertText(TextFieldTTF * pSender, const char * text, size_t nLen) override; virtual bool onTextFieldDeleteBackward(TextFieldTTF * pSender, const char * delText, size_t nLen) override; - void insertText(const char* text, size_t len); - void deleteBackward(); + void insertText(const char* text, size_t len) override; + void deleteBackward() override; void openIME(); void closeIME(); @@ -131,7 +131,7 @@ public: void setTouchSize(const Size &size); Size getTouchSize()const; void setTouchAreaEnabled(bool enable); - virtual bool hitTest(const Vec2 &pt); + virtual bool hitTest(const Vec2 &pt) override; void setPlaceHolder(const std::string& value); const std::string& getPlaceHolder()const; diff --git a/extensions/GUI/CCControlExtension/CCControl.h b/extensions/GUI/CCControlExtension/CCControl.h index 1f7192a170..e4842d047a 100644 --- a/extensions/GUI/CCControlExtension/CCControl.h +++ b/extensions/GUI/CCControlExtension/CCControl.h @@ -155,10 +155,10 @@ public: */ virtual Vec2 getTouchLocation(Touch* touch); - virtual bool onTouchBegan(Touch *touch, Event *event) { return false; }; - virtual void onTouchMoved(Touch *touch, Event *event) {}; - virtual void onTouchEnded(Touch *touch, Event *event) {}; - virtual void onTouchCancelled(Touch *touch, Event *event) {}; + virtual bool onTouchBegan(Touch *touch, Event *event) override { return false; }; + virtual void onTouchMoved(Touch *touch, Event *event) override {}; + virtual void onTouchEnded(Touch *touch, Event *event) override {}; + virtual void onTouchCancelled(Touch *touch, Event *event) override {}; /** * Returns a boolean value that indicates whether a touch is inside the bounds diff --git a/extensions/GUI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h index 2ead117306..0ee41bfcc0 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.h +++ b/extensions/GUI/CCControlExtension/CCControlButton.h @@ -59,11 +59,11 @@ public: static ControlButton* create(Node* label, cocos2d::ui::Scale9Sprite* backgroundSprite); static ControlButton* create(const std::string& title, const std::string& fontName, float fontSize); - virtual void needsLayout(void); + virtual void needsLayout(void) override; - virtual void setEnabled(bool enabled); - virtual void setSelected(bool enabled); - virtual void setHighlighted(bool enabled); + virtual void setEnabled(bool enabled) override; + virtual void setSelected(bool enabled) override; + virtual void setHighlighted(bool enabled) override; bool isPushed() const { return _isPushed; } diff --git a/extensions/GUI/CCControlExtension/CCControlColourPicker.h b/extensions/GUI/CCControlExtension/CCControlColourPicker.h index df282adda8..1a6a146170 100644 --- a/extensions/GUI/CCControlExtension/CCControlColourPicker.h +++ b/extensions/GUI/CCControlExtension/CCControlColourPicker.h @@ -64,8 +64,8 @@ public: virtual bool init() override; - virtual void setColor(const Color3B& colorValue); - virtual void setEnabled(bool bEnabled); + virtual void setColor(const Color3B& colorValue) override; + virtual void setEnabled(bool bEnabled) override; //virtual ~ControlColourPicker(); void hueSliderValueChanged(Ref * sender, Control::EventType controlEvent); @@ -74,7 +74,7 @@ public: protected: void updateControlPicker(); void updateHueAndControlPicker(); - virtual bool onTouchBegan(Touch* touch, Event* pEvent); + virtual bool onTouchBegan(Touch* touch, Event* pEvent) override; HSV _hsv; CC_SYNTHESIZE_RETAIN(ControlSaturationBrightnessPicker*, _colourPicker, colourPicker) diff --git a/extensions/GUI/CCControlExtension/CCControlHuePicker.h b/extensions/GUI/CCControlExtension/CCControlHuePicker.h index 06e6371efd..bca41ba1c6 100644 --- a/extensions/GUI/CCControlExtension/CCControlHuePicker.h +++ b/extensions/GUI/CCControlExtension/CCControlHuePicker.h @@ -61,7 +61,7 @@ public: virtual ~ControlHuePicker(); virtual bool initWithTargetAndPos(Node* target, Vec2 pos); - virtual void setEnabled(bool enabled); + virtual void setEnabled(bool enabled) override; // overrides virtual bool onTouchBegan(Touch* touch, Event* pEvent) override; diff --git a/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h index cff046281d..f392d114bc 100644 --- a/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h +++ b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h @@ -78,7 +78,7 @@ public: static ControlSaturationBrightnessPicker* create(Node* target, Vec2 pos); - virtual void setEnabled(bool enabled); + virtual void setEnabled(bool enabled) override; /** * @js NA * @lua NA @@ -94,8 +94,8 @@ protected: void updateSliderPosition(Vec2 location); bool checkSliderPosition(Vec2 location); - virtual bool onTouchBegan(Touch* touch, Event* pEvent); - virtual void onTouchMoved(Touch *pTouch, Event *pEvent); + virtual bool onTouchBegan(Touch* touch, Event* pEvent) override; + virtual void onTouchMoved(Touch *pTouch, Event *pEvent) override; }; // end of GUI group diff --git a/extensions/GUI/CCControlExtension/CCControlSlider.h b/extensions/GUI/CCControlExtension/CCControlSlider.h index 03bb5d9543..500c660a17 100644 --- a/extensions/GUI/CCControlExtension/CCControlSlider.h +++ b/extensions/GUI/CCControlExtension/CCControlSlider.h @@ -107,11 +107,11 @@ public: virtual bool initWithSprites(Sprite * backgroundSprite, Sprite* progressSprite, Sprite* thumbSprite, Sprite* selectedThumbSprite); - virtual void needsLayout(); + virtual void needsLayout() override; virtual void setMaximumValue(float val); - virtual void setEnabled(bool enabled); - virtual bool isTouchInside(Touch * touch); + virtual void setEnabled(bool enabled) override; + virtual bool isTouchInside(Touch * touch) override; Vec2 locationFromTouch(Touch* touch); virtual void setValue(float val); virtual void setMinimumValue(float val); @@ -121,9 +121,9 @@ protected: void sliderMoved(Vec2 location); void sliderEnded(Vec2 location); - virtual bool onTouchBegan(Touch* touch, Event* pEvent); - virtual void onTouchMoved(Touch *pTouch, Event *pEvent); - virtual void onTouchEnded(Touch *pTouch, Event *pEvent); + virtual bool onTouchBegan(Touch* touch, Event* pEvent) override; + virtual void onTouchMoved(Touch *pTouch, Event *pEvent) override; + virtual void onTouchEnded(Touch *pTouch, Event *pEvent) override; /** Returns the value for the given location. */ float valueForLocation(Vec2 location); diff --git a/extensions/GUI/CCControlExtension/CCControlStepper.h b/extensions/GUI/CCControlExtension/CCControlStepper.h index ae9bdaa22d..bd61ee2f1b 100644 --- a/extensions/GUI/CCControlExtension/CCControlStepper.h +++ b/extensions/GUI/CCControlExtension/CCControlStepper.h @@ -79,7 +79,7 @@ public: virtual bool onTouchBegan(Touch *pTouch, Event *pEvent) override; virtual void onTouchMoved(Touch *pTouch, Event *pEvent) override; virtual void onTouchEnded(Touch *pTouch, Event *pEvent) override; - void update(float dt); + void update(float dt) override; /** Update the layout of the stepper with the given touch location. */ void updateLayoutUsingTouchLocation(Vec2 location); diff --git a/extensions/GUI/CCControlExtension/CCControlSwitch.h b/extensions/GUI/CCControlExtension/CCControlSwitch.h index 98e67d77e2..d77067303c 100644 --- a/extensions/GUI/CCControlExtension/CCControlSwitch.h +++ b/extensions/GUI/CCControlExtension/CCControlSwitch.h @@ -80,7 +80,7 @@ public: void setOn(bool isOn); bool isOn(void) const { return _on; } bool hasMoved() const { return _moved; } - virtual void setEnabled(bool enabled); + virtual void setEnabled(bool enabled) override; Vec2 locationFromTouch(Touch* touch); diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h index 36f94d39f8..9ca912ebc7 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.h +++ b/extensions/GUI/CCScrollView/CCScrollView.h @@ -101,7 +101,7 @@ public: */ virtual ~ScrollView(); - bool init(); + bool init() override; /** * Returns a scroll view object * @@ -234,10 +234,10 @@ public: bool isClippingToBounds() { return _clippingToBounds; } void setClippingToBounds(bool bClippingToBounds) { _clippingToBounds = bClippingToBounds; } - virtual bool onTouchBegan(Touch *touch, Event *event); - virtual void onTouchMoved(Touch *touch, Event *event); - virtual void onTouchEnded(Touch *touch, Event *event); - virtual void onTouchCancelled(Touch *touch, Event *event); + virtual bool onTouchBegan(Touch *touch, Event *event) override; + virtual void onTouchMoved(Touch *touch, Event *event) override; + virtual void onTouchEnded(Touch *touch, Event *event) override; + virtual void onTouchCancelled(Touch *touch, Event *event) override; // Overrides virtual void setContentSize(const Size & size) override; @@ -255,7 +255,7 @@ public: /** * CCActionTweenDelegate */ - void updateTweenAction(float value, const std::string& key); + void updateTweenAction(float value, const std::string& key) override; bool hasVisibleParents() const; protected: diff --git a/extensions/Particle3D/CCParticle3DRender.h b/extensions/Particle3D/CCParticle3DRender.h index 54896bf973..eee9904700 100644 --- a/extensions/Particle3D/CCParticle3DRender.h +++ b/extensions/Particle3D/CCParticle3DRender.h @@ -93,8 +93,8 @@ public: virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override; - virtual void setDepthTest(bool isDepthTest); - virtual void setDepthWrite(bool isDepthWrite); + virtual void setDepthTest(bool isDepthTest) override; + virtual void setDepthWrite(bool isDepthWrite) override; CC_CONSTRUCTOR_ACCESS: Particle3DQuadRender(); diff --git a/extensions/Particle3D/PU/CCPUAlignAffector.h b/extensions/Particle3D/PU/CCPUAlignAffector.h index 55c4690fc3..24992d937f 100644 --- a/extensions/Particle3D/PU/CCPUAlignAffector.h +++ b/extensions/Particle3D/PU/CCPUAlignAffector.h @@ -51,7 +51,7 @@ public: */ void setResize(bool resize); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUAlignAffector(); diff --git a/extensions/Particle3D/PU/CCPUBaseCollider.h b/extensions/Particle3D/PU/CCPUBaseCollider.h index a173d7fdac..63e70290a3 100644 --- a/extensions/Particle3D/PU/CCPUBaseCollider.h +++ b/extensions/Particle3D/PU/CCPUBaseCollider.h @@ -116,7 +116,7 @@ public: */ void calculateRotationSpeedAfterCollision(PUParticle3D* particle); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUBaseCollider(); diff --git a/extensions/Particle3D/PU/CCPUBaseForceAffector.h b/extensions/Particle3D/PU/CCPUBaseForceAffector.h index 43ff372eb0..16b310b759 100644 --- a/extensions/Particle3D/PU/CCPUBaseForceAffector.h +++ b/extensions/Particle3D/PU/CCPUBaseForceAffector.h @@ -55,7 +55,7 @@ public: ForceApplication getForceApplication() const; void setForceApplication(ForceApplication forceApplication); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUBaseForceAffector(); diff --git a/extensions/Particle3D/PU/CCPUBeamRender.h b/extensions/Particle3D/PU/CCPUBeamRender.h index 83ffebe25c..8c17e45985 100644 --- a/extensions/Particle3D/PU/CCPUBeamRender.h +++ b/extensions/Particle3D/PU/CCPUBeamRender.h @@ -91,9 +91,9 @@ public: static PUBeamRender* create(const std::string &texFile = ""); - virtual void prepare(); - virtual void unPrepare(); - virtual void updateRender(PUParticle3D *particle, float deltaTime, bool firstParticle); + virtual void prepare() override; + virtual void unPrepare() override; + virtual void updateRender(PUParticle3D *particle, float deltaTime, bool firstParticle) override; virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override; virtual void particleEmitted(PUParticleSystem3D* particleSystem, PUParticle3D* particle) override; @@ -126,8 +126,8 @@ public: */ void destroyAll(void); - virtual PUBeamRender* clone(); - virtual void copyAttributesTo (PURender *render); + virtual PUBeamRender* clone() override; + virtual void copyAttributesTo (PURender *render) override; CC_CONSTRUCTOR_ACCESS: PUBeamRender(); diff --git a/extensions/Particle3D/PU/CCPUBoxCollider.h b/extensions/Particle3D/PU/CCPUBoxCollider.h index 8d6a9b681e..116777e057 100644 --- a/extensions/Particle3D/PU/CCPUBoxCollider.h +++ b/extensions/Particle3D/PU/CCPUBoxCollider.h @@ -83,7 +83,7 @@ public: */ void calculateDirectionAfterCollision(PUParticle3D* particle); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUBoxCollider(); diff --git a/extensions/Particle3D/PU/CCPUBoxEmitter.h b/extensions/Particle3D/PU/CCPUBoxEmitter.h index b932104cb3..98f02c1054 100644 --- a/extensions/Particle3D/PU/CCPUBoxEmitter.h +++ b/extensions/Particle3D/PU/CCPUBoxEmitter.h @@ -56,8 +56,8 @@ public: const float getDepth(void) const; void setDepth(const float depth); - virtual CCPUBoxEmitter* clone(); - virtual void copyAttributesTo (PUEmitter* emitter); + virtual CCPUBoxEmitter* clone() override; + virtual void copyAttributesTo (PUEmitter* emitter) override; CC_CONSTRUCTOR_ACCESS: CCPUBoxEmitter(void); diff --git a/extensions/Particle3D/PU/CCPUCircleEmitter.h b/extensions/Particle3D/PU/CCPUCircleEmitter.h index 13a46e73d7..5fc6568988 100644 --- a/extensions/Particle3D/PU/CCPUCircleEmitter.h +++ b/extensions/Particle3D/PU/CCPUCircleEmitter.h @@ -73,8 +73,8 @@ public: */ virtual void notifyStart(void) override; - virtual PUCircleEmitter* clone(); - virtual void copyAttributesTo (PUEmitter* emitter); + virtual PUCircleEmitter* clone() override; + virtual void copyAttributesTo (PUEmitter* emitter) override; CC_CONSTRUCTOR_ACCESS: PUCircleEmitter(void); @@ -84,11 +84,11 @@ protected: /** Determine a particle position on the circle. */ - virtual void initParticlePosition(PUParticle3D* particle); + virtual void initParticlePosition(PUParticle3D* particle) override; /** Determine the particle direction. */ - virtual void initParticleDirection(PUParticle3D* particle); + virtual void initParticleDirection(PUParticle3D* particle) override; Quaternion getRotationTo(const Vec3 &src, const Vec3& dest, const Vec3& fallbackAxis = Vec3::ZERO) const; diff --git a/extensions/Particle3D/PU/CCPUCollisionAvoidanceAffector.h b/extensions/Particle3D/PU/CCPUCollisionAvoidanceAffector.h index 7a4e56807f..1c7742fe78 100644 --- a/extensions/Particle3D/PU/CCPUCollisionAvoidanceAffector.h +++ b/extensions/Particle3D/PU/CCPUCollisionAvoidanceAffector.h @@ -49,7 +49,7 @@ public: */ void setRadius(float radius); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUCollisionAvoidanceAffector(); diff --git a/extensions/Particle3D/PU/CCPUColorAffector.h b/extensions/Particle3D/PU/CCPUColorAffector.h index a5ff261ace..22f50d9ce0 100644 --- a/extensions/Particle3D/PU/CCPUColorAffector.h +++ b/extensions/Particle3D/PU/CCPUColorAffector.h @@ -70,7 +70,7 @@ public: */ void setColorOperation (const ColorOperation& colorOperation); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUColorAffector(); diff --git a/extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h b/extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h index c429b09fbf..ac9d888a37 100644 --- a/extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h +++ b/extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h @@ -70,7 +70,7 @@ public: */ virtual void handle (PUParticleSystem3D* particleSystem, PUParticle3D* particle, float timeElapsed) override; - virtual void copyAttributesTo (PUEventHandler* eventHandler); + virtual void copyAttributesTo (PUEventHandler* eventHandler) override; CC_CONSTRUCTOR_ACCESS: PUDoAffectorEventHandler(void); diff --git a/extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h b/extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h index 442bee1bfd..bcec3dd96f 100644 --- a/extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h +++ b/extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h @@ -77,7 +77,7 @@ public: */ virtual void handle (PUParticleSystem3D* particleSystem, PUParticle3D* particle, float timeElapsed) override; - virtual void copyAttributesTo (PUEventHandler* eventHandler); + virtual void copyAttributesTo (PUEventHandler* eventHandler) override; CC_CONSTRUCTOR_ACCESS: PUDoEnableComponentEventHandler(void); diff --git a/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h b/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h index 4d91f5fe6b..e39cc02d5a 100644 --- a/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h +++ b/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h @@ -128,7 +128,7 @@ public: */ virtual void particleExpired(PUParticleSystem3D* particleSystem, PUParticle3D* particle) override {}; - virtual void copyAttributesTo (PUEventHandler* eventHandler); + virtual void copyAttributesTo (PUEventHandler* eventHandler) override; CC_CONSTRUCTOR_ACCESS: PUDoPlacementParticleEventHandler(void); diff --git a/extensions/Particle3D/PU/CCPUDoScaleEventHandler.h b/extensions/Particle3D/PU/CCPUDoScaleEventHandler.h index e91af5526f..df15b8e247 100644 --- a/extensions/Particle3D/PU/CCPUDoScaleEventHandler.h +++ b/extensions/Particle3D/PU/CCPUDoScaleEventHandler.h @@ -73,7 +73,7 @@ public: */ virtual void handle (PUParticleSystem3D* particleSystem, PUParticle3D* particle, float timeElapsed) override; - virtual void copyAttributesTo (PUEventHandler* eventHandler); + virtual void copyAttributesTo (PUEventHandler* eventHandler) override; CC_CONSTRUCTOR_ACCESS: PUDoScaleEventHandler(void); diff --git a/extensions/Particle3D/PU/CCPUDynamicAttribute.h b/extensions/Particle3D/PU/CCPUDynamicAttribute.h index 7a192e0644..2a235756f3 100644 --- a/extensions/Particle3D/PU/CCPUDynamicAttribute.h +++ b/extensions/Particle3D/PU/CCPUDynamicAttribute.h @@ -125,14 +125,14 @@ class CC_DLL PUDynamicAttributeFixed : public PUDynamicAttribute /** Todo */ - virtual float getValue (float x = 0); + virtual float getValue (float x = 0) override; /** Todo */ virtual void setValue (float value); virtual PUDynamicAttributeFixed* clone() override; - virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute); + virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute) override; protected: float _value; @@ -157,7 +157,7 @@ class CC_DLL PUDynamicAttributeRandom : public PUDynamicAttribute /** Todo */ - virtual float getValue (float x = 0); + virtual float getValue (float x = 0) override; /** Todo */ @@ -168,7 +168,7 @@ class CC_DLL PUDynamicAttributeRandom : public PUDynamicAttribute void setMinMax (float min, float max); virtual PUDynamicAttributeRandom* clone() override; - virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute); + virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute) override; protected: float _min, _max; @@ -205,7 +205,7 @@ class CC_DLL PUDynamicAttributeCurved : public PUDynamicAttribute /** Todo */ - virtual float getValue (float x = 0); + virtual float getValue (float x = 0) override; /** Todo */ @@ -228,7 +228,7 @@ class CC_DLL PUDynamicAttributeCurved : public PUDynamicAttribute void removeAllControlPoints(void); virtual PUDynamicAttributeCurved* clone() override; - virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute); + virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute) override; protected: @@ -283,7 +283,7 @@ class CC_DLL PUDynamicAttributeOscillate : public PUDynamicAttribute /** Todo */ - virtual float getValue (float x = 0); + virtual float getValue (float x = 0) override; /** Get and set the OscillationType */ @@ -311,7 +311,7 @@ class CC_DLL PUDynamicAttributeOscillate : public PUDynamicAttribute void setAmplitude (float amplitude); virtual PUDynamicAttributeOscillate* clone() override; - virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute); + virtual void copyAttributesTo(PUDynamicAttribute* dynamicAttribute) override; protected: OscillationType _oscillationType; diff --git a/extensions/Particle3D/PU/CCPUFlockCenteringAffector.h b/extensions/Particle3D/PU/CCPUFlockCenteringAffector.h index 1e2dc46d06..e646b9afb7 100644 --- a/extensions/Particle3D/PU/CCPUFlockCenteringAffector.h +++ b/extensions/Particle3D/PU/CCPUFlockCenteringAffector.h @@ -40,7 +40,7 @@ public: virtual void preUpdateAffector(float deltaTime) override; virtual void updatePUAffector(PUParticle3D *particle, float deltaTime) override; - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUFlockCenteringAffector(); diff --git a/extensions/Particle3D/PU/CCPUForceFieldAffector.h b/extensions/Particle3D/PU/CCPUForceFieldAffector.h index b0170c81bb..88978205f3 100644 --- a/extensions/Particle3D/PU/CCPUForceFieldAffector.h +++ b/extensions/Particle3D/PU/CCPUForceFieldAffector.h @@ -126,7 +126,7 @@ public: */ void suppressGeneration(bool suppress); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUForceFieldAffector(); diff --git a/extensions/Particle3D/PU/CCPUGeometryRotator.h b/extensions/Particle3D/PU/CCPUGeometryRotator.h index ad71a790d2..a9b0d6e0cd 100644 --- a/extensions/Particle3D/PU/CCPUGeometryRotator.h +++ b/extensions/Particle3D/PU/CCPUGeometryRotator.h @@ -76,7 +76,7 @@ public: */ void resetRotationAxis(void); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUGeometryRotator(); diff --git a/extensions/Particle3D/PU/CCPUGravityAffector.h b/extensions/Particle3D/PU/CCPUGravityAffector.h index 485757e7c9..bc3a8fe656 100644 --- a/extensions/Particle3D/PU/CCPUGravityAffector.h +++ b/extensions/Particle3D/PU/CCPUGravityAffector.h @@ -48,7 +48,7 @@ public: float getGravity(void) const; void setGravity(float gravity); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUGravityAffector(void); diff --git a/extensions/Particle3D/PU/CCPUInterParticleCollider.h b/extensions/Particle3D/PU/CCPUInterParticleCollider.h index c44463bb0e..a714808613 100644 --- a/extensions/Particle3D/PU/CCPUInterParticleCollider.h +++ b/extensions/Particle3D/PU/CCPUInterParticleCollider.h @@ -68,7 +68,7 @@ public: */ void setInterParticleCollisionResponse(InterParticleCollisionResponse interParticleCollisionResponse); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUParticle3DInterParticleCollider(void); diff --git a/extensions/Particle3D/PU/CCPUJetAffector.h b/extensions/Particle3D/PU/CCPUJetAffector.h index 370a5ae719..d291ff4bff 100644 --- a/extensions/Particle3D/PU/CCPUJetAffector.h +++ b/extensions/Particle3D/PU/CCPUJetAffector.h @@ -48,7 +48,7 @@ public: PUDynamicAttribute* getDynAcceleration(void) const {return _dynAcceleration;}; void setDynAcceleration(PUDynamicAttribute* dynAcceleration); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUJetAffector(void); diff --git a/extensions/Particle3D/PU/CCPULineAffector.h b/extensions/Particle3D/PU/CCPULineAffector.h index be689e007b..80cf6297d6 100644 --- a/extensions/Particle3D/PU/CCPULineAffector.h +++ b/extensions/Particle3D/PU/CCPULineAffector.h @@ -70,7 +70,7 @@ public: float getDrift(void) const; void setDrift(float drift); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PULineAffector(void); diff --git a/extensions/Particle3D/PU/CCPULineEmitter.h b/extensions/Particle3D/PU/CCPULineEmitter.h index 103301e39f..b9e470a75a 100644 --- a/extensions/Particle3D/PU/CCPULineEmitter.h +++ b/extensions/Particle3D/PU/CCPULineEmitter.h @@ -44,7 +44,7 @@ public: static PULineEmitter* create(); /** */ - virtual void notifyStart (void); + virtual void notifyStart (void) override; /** Override the default implementation, to allow that no particles are emitted if there is an incremental emission of particles (along a path), and the end of the line has @@ -77,18 +77,18 @@ public: /** */ - virtual void notifyRescaled(const Vec3& scale); + virtual void notifyRescaled(const Vec3& scale) override; /** */ - virtual void initParticlePosition(PUParticle3D* particle); + virtual void initParticlePosition(PUParticle3D* particle) override; /** */ - virtual void initParticleDirection(PUParticle3D* particle); + virtual void initParticleDirection(PUParticle3D* particle) override; - virtual PULineEmitter* clone(); - virtual void copyAttributesTo (PUEmitter* emitter); + virtual PULineEmitter* clone() override; + virtual void copyAttributesTo (PUEmitter* emitter) override; CC_CONSTRUCTOR_ACCESS: PULineEmitter(void); diff --git a/extensions/Particle3D/PU/CCPULinearForceAffector.h b/extensions/Particle3D/PU/CCPULinearForceAffector.h index e060499e73..a621ca904a 100644 --- a/extensions/Particle3D/PU/CCPULinearForceAffector.h +++ b/extensions/Particle3D/PU/CCPULinearForceAffector.h @@ -41,7 +41,7 @@ public: virtual void preUpdateAffector(float deltaTime) override; virtual void updatePUAffector(PUParticle3D *particle, float deltaTime) override; - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PULinearForceAffector(void){}; diff --git a/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h b/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h index 9f271a667c..cb153007d7 100644 --- a/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h +++ b/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h @@ -238,8 +238,8 @@ public: */ virtual void initParticleDirection(PUParticle3D* particle) override; - virtual PUMeshSurfaceEmitter* clone(); - virtual void copyAttributesTo (PUEmitter* emitter); + virtual PUMeshSurfaceEmitter* clone() override; + virtual void copyAttributesTo (PUEmitter* emitter) override; CC_CONSTRUCTOR_ACCESS: PUMeshSurfaceEmitter(void); diff --git a/extensions/Particle3D/PU/CCPUOnClearObserver.h b/extensions/Particle3D/PU/CCPUOnClearObserver.h index 084c82a947..b54ffc97bd 100644 --- a/extensions/Particle3D/PU/CCPUOnClearObserver.h +++ b/extensions/Particle3D/PU/CCPUOnClearObserver.h @@ -44,7 +44,7 @@ public: /** */ - virtual void notifyStart (); + virtual void notifyStart () override; /** */ diff --git a/extensions/Particle3D/PU/CCPUOnCountObserver.h b/extensions/Particle3D/PU/CCPUOnCountObserver.h index 4931b921af..0e0abf970e 100644 --- a/extensions/Particle3D/PU/CCPUOnCountObserver.h +++ b/extensions/Particle3D/PU/CCPUOnCountObserver.h @@ -69,7 +69,7 @@ public: const PUComparisionOperator getCompare(void) const {return _compare;}; void setCompare(PUComparisionOperator op){_compare = op;}; - virtual void copyAttributesTo (PUObserver* observer); + virtual void copyAttributesTo (PUObserver* observer) override; CC_CONSTRUCTOR_ACCESS: PUOnCountObserver(void); diff --git a/extensions/Particle3D/PU/CCPUOnEventFlagObserver.h b/extensions/Particle3D/PU/CCPUOnEventFlagObserver.h index b1c9618f74..ffbe131ac0 100644 --- a/extensions/Particle3D/PU/CCPUOnEventFlagObserver.h +++ b/extensions/Particle3D/PU/CCPUOnEventFlagObserver.h @@ -57,7 +57,7 @@ public: unsigned int getEventFlag(void) const {return _eventFlag;}; void setEventFlag(unsigned int eventFlag){_eventFlag = eventFlag;}; - virtual void copyAttributesTo (PUObserver* observer); + virtual void copyAttributesTo (PUObserver* observer) override; CC_CONSTRUCTOR_ACCESS: PUOnEventFlagObserver(void); diff --git a/extensions/Particle3D/PU/CCPUOnPositionObserver.h b/extensions/Particle3D/PU/CCPUOnPositionObserver.h index 67586eeda6..cdd4886460 100644 --- a/extensions/Particle3D/PU/CCPUOnPositionObserver.h +++ b/extensions/Particle3D/PU/CCPUOnPositionObserver.h @@ -84,7 +84,7 @@ public: const PUComparisionOperator getComparePositionY(void) const {return _comparePositionY;}; const PUComparisionOperator getComparePositionZ(void) const {return _comparePositionZ;}; - virtual void copyAttributesTo (PUObserver* observer); + virtual void copyAttributesTo (PUObserver* observer) override; CC_CONSTRUCTOR_ACCESS: PUOnPositionObserver(void); diff --git a/extensions/Particle3D/PU/CCPUOnRandomObserver.h b/extensions/Particle3D/PU/CCPUOnRandomObserver.h index 612db480f3..b044ce7768 100644 --- a/extensions/Particle3D/PU/CCPUOnRandomObserver.h +++ b/extensions/Particle3D/PU/CCPUOnRandomObserver.h @@ -61,7 +61,7 @@ public: float getThreshold(void) const {return _threshold;}; void setThreshold(float threshold){_threshold = threshold;}; - virtual void copyAttributesTo (PUObserver* observer); + virtual void copyAttributesTo (PUObserver* observer) override; CC_CONSTRUCTOR_ACCESS: PUOnRandomObserver(void); diff --git a/extensions/Particle3D/PU/CCPUOnTimeObserver.h b/extensions/Particle3D/PU/CCPUOnTimeObserver.h index 451e998229..e62839ac72 100644 --- a/extensions/Particle3D/PU/CCPUOnTimeObserver.h +++ b/extensions/Particle3D/PU/CCPUOnTimeObserver.h @@ -69,7 +69,7 @@ public: bool isSinceStartSystem(void) const {return _sinceStartSystem;}; void setSinceStartSystem(bool sinceStartSystem){_sinceStartSystem = sinceStartSystem;}; - virtual void copyAttributesTo (PUObserver* observer); + virtual void copyAttributesTo (PUObserver* observer) override; CC_CONSTRUCTOR_ACCESS: PUOnTimeObserver(void); diff --git a/extensions/Particle3D/PU/CCPUOnVelocityObserver.h b/extensions/Particle3D/PU/CCPUOnVelocityObserver.h index 8ceca46407..7e54a53141 100644 --- a/extensions/Particle3D/PU/CCPUOnVelocityObserver.h +++ b/extensions/Particle3D/PU/CCPUOnVelocityObserver.h @@ -58,7 +58,7 @@ public: const PUComparisionOperator getCompare(void) const {return _compare;}; void setCompare(PUComparisionOperator op){_compare = op;}; - virtual void copyAttributesTo (PUObserver* observer); + virtual void copyAttributesTo (PUObserver* observer) override; CC_CONSTRUCTOR_ACCESS: PUOnVelocityObserver(void); diff --git a/extensions/Particle3D/PU/CCPUParticleFollower.h b/extensions/Particle3D/PU/CCPUParticleFollower.h index a35a864ede..ff242d97c0 100644 --- a/extensions/Particle3D/PU/CCPUParticleFollower.h +++ b/extensions/Particle3D/PU/CCPUParticleFollower.h @@ -54,7 +54,7 @@ public: float getMinDistance(void) const; void setMinDistance(float minDistance); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUParticleFollower(void); diff --git a/extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.h b/extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.h index 4a91564e7e..ee8924a216 100644 --- a/extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.h +++ b/extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.h @@ -45,7 +45,7 @@ public: public: - virtual void translate(PUScriptCompiler* compiler, PUAbstractNode *node); + virtual void translate(PUScriptCompiler* compiler, PUAbstractNode *node) override; protected: diff --git a/extensions/Particle3D/PU/CCPUPathFollower.h b/extensions/Particle3D/PU/CCPUPathFollower.h index 406474bc51..1e04ebd8d1 100644 --- a/extensions/Particle3D/PU/CCPUPathFollower.h +++ b/extensions/Particle3D/PU/CCPUPathFollower.h @@ -56,7 +56,7 @@ public: */ const Vec3& getPoint(unsigned short index) const {return _spline.getPoint(index);}; - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUPathFollower(void); diff --git a/extensions/Particle3D/PU/CCPUPlaneCollider.h b/extensions/Particle3D/PU/CCPUPlaneCollider.h index 375e0ba252..b91e55dd99 100644 --- a/extensions/Particle3D/PU/CCPUPlaneCollider.h +++ b/extensions/Particle3D/PU/CCPUPlaneCollider.h @@ -56,7 +56,7 @@ public: */ void calculateDirectionAfterCollision(PUParticle3D* particle, float timeElapsed); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUPlaneCollider(void); diff --git a/extensions/Particle3D/PU/CCPUPointEmitter.h b/extensions/Particle3D/PU/CCPUPointEmitter.h index 8a0883631a..6e2d4d0f9f 100644 --- a/extensions/Particle3D/PU/CCPUPointEmitter.h +++ b/extensions/Particle3D/PU/CCPUPointEmitter.h @@ -36,8 +36,8 @@ class CC_DLL PUPointEmitter : public PUEmitter public: static PUPointEmitter* create(); - virtual PUPointEmitter* clone(); - virtual void copyAttributesTo (PUEmitter* emitter); + virtual PUPointEmitter* clone() override; + virtual void copyAttributesTo (PUEmitter* emitter) override; CC_CONSTRUCTOR_ACCESS: PUPointEmitter(void); diff --git a/extensions/Particle3D/PU/CCPUPositionEmitter.h b/extensions/Particle3D/PU/CCPUPositionEmitter.h index 251d6c7fc7..7a77e8900c 100644 --- a/extensions/Particle3D/PU/CCPUPositionEmitter.h +++ b/extensions/Particle3D/PU/CCPUPositionEmitter.h @@ -70,8 +70,8 @@ public: */ virtual void initParticlePosition(PUParticle3D* particle) override; - virtual PUPositionEmitter* clone(); - virtual void copyAttributesTo (PUEmitter* emitter); + virtual PUPositionEmitter* clone() override; + virtual void copyAttributesTo (PUEmitter* emitter) override; CC_CONSTRUCTOR_ACCESS: PUPositionEmitter(void); diff --git a/extensions/Particle3D/PU/CCPURandomiser.h b/extensions/Particle3D/PU/CCPURandomiser.h index 825754d421..bb79944746 100644 --- a/extensions/Particle3D/PU/CCPURandomiser.h +++ b/extensions/Particle3D/PU/CCPURandomiser.h @@ -70,7 +70,7 @@ public: bool isRandomDirection(void) const; void setRandomDirection(bool randomDirection); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PURandomiser(void); diff --git a/extensions/Particle3D/PU/CCPURender.h b/extensions/Particle3D/PU/CCPURender.h index 210b5d5e50..7760d46cb0 100644 --- a/extensions/Particle3D/PU/CCPURender.h +++ b/extensions/Particle3D/PU/CCPURender.h @@ -63,10 +63,10 @@ class CC_DLL PUParticle3DEntityRender : public PURender { public: - virtual void setDepthTest(bool isDepthTest); - virtual void setDepthWrite(bool isDepthWrite); + virtual void setDepthTest(bool isDepthTest) override; + virtual void setDepthWrite(bool isDepthWrite) override; - virtual void copyAttributesTo (PURender *render); + virtual void copyAttributesTo (PURender *render) override; CC_CONSTRUCTOR_ACCESS: PUParticle3DEntityRender(); @@ -150,8 +150,8 @@ public: virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override; - virtual PUParticle3DQuadRender* clone(); - virtual void copyAttributesTo (PURender *render); + virtual PUParticle3DQuadRender* clone() override; + virtual void copyAttributesTo (PURender *render) override; CC_CONSTRUCTOR_ACCESS: PUParticle3DQuadRender(); @@ -186,8 +186,8 @@ public: virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override; - virtual PUParticle3DModelRender* clone(); - virtual void copyAttributesTo (PURender *render); + virtual PUParticle3DModelRender* clone() override; + virtual void copyAttributesTo (PURender *render) override; CC_CONSTRUCTOR_ACCESS: PUParticle3DModelRender(); @@ -209,7 +209,7 @@ public: virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override; - virtual PUParticle3DBoxRender* clone(); + virtual PUParticle3DBoxRender* clone() override; CC_CONSTRUCTOR_ACCESS: PUParticle3DBoxRender(); @@ -228,8 +228,8 @@ public: virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override; - virtual PUSphereRender* clone(); - virtual void copyAttributesTo (PURender *render); + virtual PUSphereRender* clone() override; + virtual void copyAttributesTo (PURender *render) override; CC_CONSTRUCTOR_ACCESS: PUSphereRender(); diff --git a/extensions/Particle3D/PU/CCPURibbonTrailRender.h b/extensions/Particle3D/PU/CCPURibbonTrailRender.h index fdf41f94c8..565ceb25fb 100644 --- a/extensions/Particle3D/PU/CCPURibbonTrailRender.h +++ b/extensions/Particle3D/PU/CCPURibbonTrailRender.h @@ -89,10 +89,10 @@ public: static PURibbonTrailRender* create(const std::string &texFile = ""); - virtual void notifyRescaled(const Vec3& scale); - virtual void prepare(); - virtual void unPrepare(); - virtual void updateRender(PUParticle3D *particle, float deltaTime, bool firstParticle); + virtual void notifyRescaled(const Vec3& scale) override; + virtual void prepare() override; + virtual void unPrepare() override; + virtual void updateRender(PUParticle3D *particle, float deltaTime, bool firstParticle) override; virtual void render(Renderer* renderer, const Mat4 &transform, ParticleSystem3D* particleSystem) override; virtual void particleEmitted(PUParticleSystem3D* particleSystem, PUParticle3D* particle) override; @@ -125,8 +125,8 @@ public: */ void destroyAll(void); - virtual PURibbonTrailRender* clone(); - virtual void copyAttributesTo (PURender *render); + virtual PURibbonTrailRender* clone() override; + virtual void copyAttributesTo (PURender *render) override; CC_CONSTRUCTOR_ACCESS: PURibbonTrailRender(); diff --git a/extensions/Particle3D/PU/CCPUScaleAffector.h b/extensions/Particle3D/PU/CCPUScaleAffector.h index f300ed9d45..763f66d458 100644 --- a/extensions/Particle3D/PU/CCPUScaleAffector.h +++ b/extensions/Particle3D/PU/CCPUScaleAffector.h @@ -75,7 +75,7 @@ public: bool isSinceStartSystem(void) const {return _sinceStartSystem;}; void setSinceStartSystem(bool sinceStartSystem){_sinceStartSystem = sinceStartSystem;}; - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUScaleAffector(void); diff --git a/extensions/Particle3D/PU/CCPUScaleVelocityAffector.h b/extensions/Particle3D/PU/CCPUScaleVelocityAffector.h index de8d8bd5d5..48321b790e 100644 --- a/extensions/Particle3D/PU/CCPUScaleVelocityAffector.h +++ b/extensions/Particle3D/PU/CCPUScaleVelocityAffector.h @@ -59,7 +59,7 @@ public: bool isStopAtFlip(void) const {return _stopAtFlip;}; void setStopAtFlip(bool stopAtFlip){_stopAtFlip = stopAtFlip;}; - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUScaleVelocityAffector(void); diff --git a/extensions/Particle3D/PU/CCPUSineForceAffector.h b/extensions/Particle3D/PU/CCPUSineForceAffector.h index a53d770657..ceb150a264 100644 --- a/extensions/Particle3D/PU/CCPUSineForceAffector.h +++ b/extensions/Particle3D/PU/CCPUSineForceAffector.h @@ -54,7 +54,7 @@ public: const float getFrequencyMax(void) const; void setFrequencyMax(const float frequencyMax); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUSineForceAffector(void); diff --git a/extensions/Particle3D/PU/CCPUSlaveEmitter.h b/extensions/Particle3D/PU/CCPUSlaveEmitter.h index cefafcf84f..28ebebe58a 100644 --- a/extensions/Particle3D/PU/CCPUSlaveEmitter.h +++ b/extensions/Particle3D/PU/CCPUSlaveEmitter.h @@ -82,8 +82,8 @@ public: */ void setMasterEmitterName(const std::string& masterEmitterName); - virtual PUSlaveEmitter* clone(); - virtual void copyAttributesTo (PUEmitter* emitter); + virtual PUSlaveEmitter* clone() override; + virtual void copyAttributesTo (PUEmitter* emitter) override; CC_CONSTRUCTOR_ACCESS: PUSlaveEmitter(void); diff --git a/extensions/Particle3D/PU/CCPUSphereCollider.h b/extensions/Particle3D/PU/CCPUSphereCollider.h index af36bc99bc..42e0091124 100644 --- a/extensions/Particle3D/PU/CCPUSphereCollider.h +++ b/extensions/Particle3D/PU/CCPUSphereCollider.h @@ -68,7 +68,7 @@ public: */ void calculateDirectionAfterCollision(PUParticle3D* particle, Vec3 distance, float distanceLength); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUSphereCollider(void); diff --git a/extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.h b/extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.h index 99e846c402..d1894d7d37 100644 --- a/extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.h +++ b/extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.h @@ -45,14 +45,14 @@ public: /** */ - virtual void initParticlePosition(PUParticle3D* particle); + virtual void initParticlePosition(PUParticle3D* particle) override; /** */ - virtual void initParticleDirection(PUParticle3D* particle); + virtual void initParticleDirection(PUParticle3D* particle) override; - virtual PUSphereSurfaceEmitter* clone(); - virtual void copyAttributesTo (PUEmitter* emitter); + virtual PUSphereSurfaceEmitter* clone() override; + virtual void copyAttributesTo (PUEmitter* emitter) override; CC_CONSTRUCTOR_ACCESS: PUSphereSurfaceEmitter(void); diff --git a/extensions/Particle3D/PU/CCPUTextureAnimator.h b/extensions/Particle3D/PU/CCPUTextureAnimator.h index 39c8d810ff..b1b33d1f8a 100644 --- a/extensions/Particle3D/PU/CCPUTextureAnimator.h +++ b/extensions/Particle3D/PU/CCPUTextureAnimator.h @@ -85,7 +85,7 @@ public: /** Todo */ void setStartRandom(bool startRandom); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUTextureAnimator(void); diff --git a/extensions/Particle3D/PU/CCPUTextureRotator.h b/extensions/Particle3D/PU/CCPUTextureRotator.h index 44f727370b..ec9504c5a7 100644 --- a/extensions/Particle3D/PU/CCPUTextureRotator.h +++ b/extensions/Particle3D/PU/CCPUTextureRotator.h @@ -79,9 +79,9 @@ public: float calculateRotationSpeed (PUParticle3D* particle); /** @copydoc ParticleAffector::_initParticleForEmission */ - virtual void initParticleForEmission(PUParticle3D* particle); + virtual void initParticleForEmission(PUParticle3D* particle) override; - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUTextureRotator(void); diff --git a/extensions/Particle3D/PU/CCPUVelocityMatchingAffector.h b/extensions/Particle3D/PU/CCPUVelocityMatchingAffector.h index 73966d25ef..314efa3616 100644 --- a/extensions/Particle3D/PU/CCPUVelocityMatchingAffector.h +++ b/extensions/Particle3D/PU/CCPUVelocityMatchingAffector.h @@ -49,7 +49,7 @@ public: */ void setRadius(float radius); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; /** @copydoc ParticleAffector::_prepare */ //virtual void _prepare(ParticleTechnique* particleTechnique); diff --git a/extensions/Particle3D/PU/CCPUVortexAffector.h b/extensions/Particle3D/PU/CCPUVortexAffector.h index ff2589c4d9..7dcd37aa71 100644 --- a/extensions/Particle3D/PU/CCPUVortexAffector.h +++ b/extensions/Particle3D/PU/CCPUVortexAffector.h @@ -60,7 +60,7 @@ public: */ void setRotationSpeed(PUDynamicAttribute* dynRotationSpeed); - virtual void copyAttributesTo (PUAffector* affector); + virtual void copyAttributesTo (PUAffector* affector) override; CC_CONSTRUCTOR_ACCESS: PUVortexAffector(void); diff --git a/extensions/physics-nodes/CCPhysicsSprite.h b/extensions/physics-nodes/CCPhysicsSprite.h index 7d68e7ca1a..1113354b7b 100644 --- a/extensions/physics-nodes/CCPhysicsSprite.h +++ b/extensions/physics-nodes/CCPhysicsSprite.h @@ -85,7 +85,7 @@ public: PhysicsSprite(); - virtual bool isDirty() const; + virtual bool isDirty() const override; /** Keep the sprite's rotation separate from the body. */ bool isIgnoreBodyRotation() const; diff --git a/tests/cpp-empty-test/Classes/HelloWorldScene.h b/tests/cpp-empty-test/Classes/HelloWorldScene.h index de8a612e42..f7c6513a1d 100644 --- a/tests/cpp-empty-test/Classes/HelloWorldScene.h +++ b/tests/cpp-empty-test/Classes/HelloWorldScene.h @@ -7,7 +7,7 @@ class HelloWorld : public cocos2d::Layer { public: // Here's a difference. Method 'init' in cocos2d-x returns bool, instead of returning 'id' in cocos2d-iphone - virtual bool init(); + virtual bool init() override; // there's no 'id' in cpp, so we recommend returning the class instance pointer static cocos2d::Scene* scene(); diff --git a/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h index 0a7165ca58..25d65e9ca1 100644 --- a/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h +++ b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h @@ -17,9 +17,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class CrashTest : public ActionManagerTest diff --git a/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h b/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h index f19a4436a8..6afc38f77f 100644 --- a/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h +++ b/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h @@ -50,9 +50,9 @@ public: void centerSprites(unsigned int numberOfSprites); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; void positionForTwo(); }; @@ -60,7 +60,7 @@ public: class SpriteEase : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; void testStopAction(float dt); @@ -69,126 +69,126 @@ public: class SpriteEaseInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseExponential : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseExponentialInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseSine : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseSineInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseElastic : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseElasticInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseBounce : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseBounceInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseBack : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseBackInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseBezier : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseQuadratic : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseQuadraticInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseQuartic : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseQuarticInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseQuintic : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseQuinticInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; @@ -196,34 +196,34 @@ public: class SpriteEaseCircle : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseCircleInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseCubic : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; }; class SpriteEaseCubicInOut : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string title() const override; }; class SpeedTest : public EaseSpriteDemo { public: - void onEnter(); + void onEnter() override; virtual std::string subtitle() const override; void altertime(float dt); diff --git a/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h b/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h index e243f52aaf..5d6ac433a9 100644 --- a/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h +++ b/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h @@ -39,9 +39,9 @@ public: virtual std::string subtitle() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class SpriteProgressToRadial : public SpriteDemo diff --git a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h index 2d49e22a14..9b33bea52c 100644 --- a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h +++ b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h @@ -57,9 +57,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class ActionManual : public ActionsDemo @@ -421,7 +421,7 @@ public: virtual std::string subtitle() const override; virtual void addNewSpriteWithCoords(Vec2 p); virtual void runActionsInSprite(Sprite* sprite); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; }; class ActionMoveStacked : public ActionStacked @@ -430,7 +430,7 @@ public: CREATE_FUNC(ActionMoveStacked); virtual std::string title() const override; - virtual void runActionsInSprite(Sprite* sprite); + virtual void runActionsInSprite(Sprite* sprite) override; }; class ActionMoveJumpStacked : public ActionStacked @@ -439,7 +439,7 @@ public: CREATE_FUNC(ActionMoveJumpStacked); virtual std::string title() const override; - virtual void runActionsInSprite(Sprite* sprite); + virtual void runActionsInSprite(Sprite* sprite) override; }; class ActionMoveBezierStacked : public ActionStacked @@ -448,7 +448,7 @@ public: CREATE_FUNC(ActionMoveBezierStacked); virtual std::string title() const override; - virtual void runActionsInSprite(Sprite* sprite); + virtual void runActionsInSprite(Sprite* sprite) override; }; class ActionCatmullRomStacked : public ActionsDemo diff --git a/tests/cpp-tests/Classes/AllocatorTest/AllocatorTest.h b/tests/cpp-tests/Classes/AllocatorTest/AllocatorTest.h index 40cf283c1c..22ae2f3e96 100644 --- a/tests/cpp-tests/Classes/AllocatorTest/AllocatorTest.h +++ b/tests/cpp-tests/Classes/AllocatorTest/AllocatorTest.h @@ -76,17 +76,17 @@ namespace AllocatorTestNS AllocatorTest(); virtual ~AllocatorTest(); - virtual std::string title() const; - virtual std::string subtitle() const; + virtual std::string title() const override; + virtual std::string subtitle() const override; - virtual void restartCallback(Ref* sender); - virtual void nextCallback(Ref* sender); - virtual void backCallback(Ref* sender); + virtual void restartCallback(Ref* sender) override; + virtual void nextCallback(Ref* sender) override; + virtual void backCallback(Ref* sender) override; virtual void onEnter() override; virtual void onExit() override; - virtual void update(float delta); + virtual void update(float delta) override; }; class AllocatorTestScene : public TestScene diff --git a/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h b/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h index a897703a54..34f79590d4 100644 --- a/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h +++ b/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h @@ -62,7 +62,7 @@ public: void addNewBillBoradWithCoords(Vec3 p); void addNewAniBillBoradWithCoords(Vec3 p); void rotateCameraCallback(Ref* sender,float value); - void onTouchesMoved(const std::vector& touches, Event* event); + void onTouchesMoved(const std::vector& touches, Event* event) override; void menuCallback_orientedPoint(Ref* sender); void menuCallback_orientedPlane(Ref* sender); diff --git a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h index 9a12dc7a13..7d8e386825 100644 --- a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h +++ b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h @@ -20,8 +20,8 @@ public: virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; void addNewSpriteAtPosition(Vec2 p); - void update(float dt); - void onTouchesEnded(const std::vector& touches, Event* event); + void update(float dt) override; + void onTouchesEnded(const std::vector& touches, Event* event) override; #if CC_ENABLE_BOX2D_INTEGRATION protected: diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-1159.h b/tests/cpp-tests/Classes/BugsTest/Bug-1159.h index f7dbae88f9..d3384138db 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-1159.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-1159.h @@ -6,7 +6,7 @@ class Bug1159Layer : public BugsTestBaseLayer { public: - virtual bool init(); + virtual bool init() override; virtual void onExit() override; static Scene* scene(); void callBack(Ref* sender); diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-1174.h b/tests/cpp-tests/Classes/BugsTest/Bug-1174.h index 993365343b..8349f704d4 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-1174.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-1174.h @@ -6,7 +6,7 @@ class Bug1174Layer : public BugsTestBaseLayer { public: - virtual bool init(); + virtual bool init() override; }; #endif // __BUG_1174_H__ diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-350.h b/tests/cpp-tests/Classes/BugsTest/Bug-350.h index 19807ff21c..9182f34959 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-350.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-350.h @@ -6,7 +6,7 @@ class Bug350Layer : public BugsTestBaseLayer { public: - virtual bool init(); + virtual bool init() override; }; #endif // __BUG_350_H__ diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-422.h b/tests/cpp-tests/Classes/BugsTest/Bug-422.h index 8b2188c0f9..1de086e1d3 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-422.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-422.h @@ -6,7 +6,7 @@ class Bug422Layer : public BugsTestBaseLayer { public: - virtual bool init(); + virtual bool init() override; void reset(); void check(Node* target); diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h b/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h index 4758f59b79..6b510353d7 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h @@ -6,7 +6,7 @@ class Bug458Layer : public BugsTestBaseLayer { public: - virtual bool init(); + virtual bool init() override; void selectAnswer(Ref* sender); }; diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h index 4b62d432bc..bf9e11745d 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h @@ -6,7 +6,7 @@ class QuestionContainerSprite : public cocos2d::Sprite { public: - virtual bool init(); + virtual bool init() override; }; #endif // __QUESTION_CONTAINER_SPRITE_H__ diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-624.h b/tests/cpp-tests/Classes/BugsTest/Bug-624.h index 6542ad95ba..8d97a3a1f9 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-624.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-624.h @@ -7,9 +7,9 @@ class Bug624Layer : public BugsTestBaseLayer { public: virtual ~Bug624Layer(); - virtual bool init(); + virtual bool init() override; void switchLayer(float dt); - virtual void onAcceleration(Acceleration* acc, Event* event); + virtual void onAcceleration(Acceleration* acc, Event* event) override; CREATE_FUNC(Bug624Layer); }; @@ -18,9 +18,9 @@ class Bug624Layer2 : public BugsTestBaseLayer { public: virtual ~Bug624Layer2(); - virtual bool init(); + virtual bool init() override; void switchLayer(float dt); - virtual void onAcceleration(Acceleration* acc, Event* event); + virtual void onAcceleration(Acceleration* acc, Event* event) override; CREATE_FUNC(Bug624Layer2); }; diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-886.h b/tests/cpp-tests/Classes/BugsTest/Bug-886.h index 5eca7c2b02..5a72a48a18 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-886.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-886.h @@ -6,7 +6,7 @@ class Bug886Layer : public BugsTestBaseLayer { public: - virtual bool init(); + virtual bool init() override; }; #endif // __BUG_886_H__ diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-899.h b/tests/cpp-tests/Classes/BugsTest/Bug-899.h index 01ebda2414..1877b7965a 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-899.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-899.h @@ -6,7 +6,7 @@ class Bug899Layer : public BugsTestBaseLayer { public: - virtual bool init(); + virtual bool init() override; }; #endif // __BUG_899_H__ diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-914.h b/tests/cpp-tests/Classes/BugsTest/Bug-914.h index bbfa668c87..580bce8f95 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-914.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-914.h @@ -7,10 +7,10 @@ class Bug914Layer : public BugsTestBaseLayer { public: static Scene* scene(); - virtual bool init(); + virtual bool init() override; - void onTouchesMoved(const std::vector& touches, Event * event); - void onTouchesBegan(const std::vector& touches, Event * event); + void onTouchesMoved(const std::vector& touches, Event * event) override; + void onTouchesBegan(const std::vector& touches, Event * event) override; void restart(Ref* sender); CREATE_FUNC(Bug914Layer); diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-Child.h b/tests/cpp-tests/Classes/BugsTest/Bug-Child.h index aace4944a9..a0a4f9c33e 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-Child.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-Child.h @@ -15,7 +15,7 @@ class BugChild : public BugsTestBaseLayer { public: static Scene* scene(); - virtual bool init(); + virtual bool init() override; void switchChild(Ref* sender); diff --git a/tests/cpp-tests/Classes/BugsTest/BugsTest.h b/tests/cpp-tests/Classes/BugsTest/BugsTest.h index 4ec70a54c6..b579fa02b3 100644 --- a/tests/cpp-tests/Classes/BugsTest/BugsTest.h +++ b/tests/cpp-tests/Classes/BugsTest/BugsTest.h @@ -8,8 +8,8 @@ class BugsTestMainLayer : public Layer public: virtual void onEnter() override; - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector&touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector&touches, Event *event) override; protected: Vec2 _beginPos; diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h index ff432566fd..a63394757a 100644 --- a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h +++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h @@ -68,9 +68,9 @@ public: class CameraBaseTest : public BaseTest { public: - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; protected: BillBoard* bill1; @@ -114,9 +114,9 @@ public: // overrides virtual std::string title() const override; void addNewSpriteWithCoords(Vec3 p,std::string fileName,bool playAnimation=false,float scale=1.0f,bool bindCamera=false); - void onTouchesBegan(const std::vector& touches, cocos2d::Event *event); - void onTouchesMoved(const std::vector& touches, cocos2d::Event *event); - void onTouchesEnded(const std::vector& touches, cocos2d::Event *event); + void onTouchesBegan(const std::vector& touches, cocos2d::Event *event) override; + void onTouchesMoved(const std::vector& touches, cocos2d::Event *event) override; + void onTouchesEnded(const std::vector& touches, cocos2d::Event *event) override; void scaleCameraCallback(Ref* sender,float value); void rotateCameraCallback(Ref* sender,float value); void SwitchViewCallback(Ref* sender,CameraType cameraType); @@ -243,7 +243,7 @@ public: // overrides virtual std::string title() const override; - void onTouchesMoved(const std::vector& touches, cocos2d::Event *event); + void onTouchesMoved(const std::vector& touches, cocos2d::Event *event) override; void switchTypeCallback(Ref* sender,int type); diff --git a/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h index 3d9a8c589a..4ba87a0a45 100644 --- a/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h +++ b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h @@ -16,16 +16,16 @@ class ChipmunkTestLayer : public Layer public: ChipmunkTestLayer(); ~ChipmunkTestLayer(); - void onEnter(); + void onEnter() override; void initPhysics(); void createResetButton(); void reset(Ref* sender); void addNewSpriteAtPosition(cocos2d::Vec2 p); - void update(float dt); + void update(float dt) override; void toggleDebugCallback(Ref* sender); - void onTouchesEnded(const std::vector& touches, Event* event); - virtual void onAcceleration(Acceleration* acc, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; + virtual void onAcceleration(Acceleration* acc, Event* event) override; private: Texture2D* _spriteTexture; // weak ref diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h index 535259b13a..0211e84d21 100644 --- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h +++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h @@ -12,15 +12,15 @@ public: CREATE_FUNC(BaseClippingNodeTest); ~BaseClippingNodeTest(); - virtual bool init(); + virtual bool init() override; virtual std::string title() const override; virtual std::string subtitle() const override; virtual void setup(); - void backCallback(Ref* sender); - void nextCallback(Ref* sender); - void restartCallback(Ref* sender); + void backCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void restartCallback(Ref* sender) override; }; class BasicTest : public BaseClippingNodeTest @@ -51,8 +51,8 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual Node* stencil(); - virtual Node* content(); + virtual Node* stencil() override; + virtual Node* content() override; }; class ShapeInvertedTest : public ShapeTest @@ -62,7 +62,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual ClippingNode* clipper(); + virtual ClippingNode* clipper() override; }; class SpriteTest : public BasicTest @@ -73,9 +73,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual Node* stencil(); - virtual ClippingNode* clipper(); - virtual Node* content(); + virtual Node* stencil() override; + virtual ClippingNode* clipper() override; + virtual Node* content() override; }; class SpriteNoAlphaTest : public SpriteTest @@ -85,7 +85,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual ClippingNode* clipper(); + virtual ClippingNode* clipper() override; }; class SpriteInvertedTest : public SpriteTest @@ -95,7 +95,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual ClippingNode* clipper(); + virtual ClippingNode* clipper() override; }; class NestedTest : public BaseClippingNodeTest @@ -105,7 +105,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual void setup(); + virtual void setup() override; }; class HoleDemo : public BaseClippingNodeTest @@ -114,11 +114,11 @@ public: CREATE_FUNC(HoleDemo); ~HoleDemo(); - virtual void setup(); + virtual void setup() override; virtual std::string title() const override; virtual std::string subtitle() const override; void pokeHoleAtPoint(Vec2 point); - void onTouchesBegan(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; private: ClippingNode* _outerClipper; Node* _holes; @@ -132,10 +132,10 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual void setup(); - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); - void onTouchesEnded(const std::vector& touches, Event *event); + virtual void setup() override; + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; + void onTouchesEnded(const std::vector& touches, Event *event) override; private: bool _scrolling; Vec2 _lastPoint; @@ -152,7 +152,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual void setup(); + virtual void setup() override; virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; virtual void setupStencilForClippingOnPlane(GLint plane); @@ -175,8 +175,8 @@ public: CREATE_FUNC(RawStencilBufferTest2); virtual std::string subtitle() const override; - virtual void setupStencilForClippingOnPlane(GLint plane); - virtual void setupStencilForDrawingOnPlane(GLint plane); + virtual void setupStencilForClippingOnPlane(GLint plane) override; + virtual void setupStencilForDrawingOnPlane(GLint plane) override; }; class RawStencilBufferTest3 : public RawStencilBufferTest @@ -185,8 +185,8 @@ public: CREATE_FUNC(RawStencilBufferTest3); virtual std::string subtitle() const override; - virtual void setupStencilForClippingOnPlane(GLint plane); - virtual void setupStencilForDrawingOnPlane(GLint plane); + virtual void setupStencilForClippingOnPlane(GLint plane) override; + virtual void setupStencilForDrawingOnPlane(GLint plane) override; }; class RawStencilBufferTestAlphaTest : public RawStencilBufferTest @@ -201,8 +201,8 @@ public: CREATE_FUNC(RawStencilBufferTest4); virtual std::string subtitle() const override; - virtual void setupStencilForClippingOnPlane(GLint plane); - virtual void setupStencilForDrawingOnPlane(GLint plane); + virtual void setupStencilForClippingOnPlane(GLint plane) override; + virtual void setupStencilForDrawingOnPlane(GLint plane) override; }; class RawStencilBufferTest5 : public RawStencilBufferTestAlphaTest @@ -211,8 +211,8 @@ public: CREATE_FUNC(RawStencilBufferTest5); virtual std::string subtitle() const override; - virtual void setupStencilForClippingOnPlane(GLint plane); - virtual void setupStencilForDrawingOnPlane(GLint plane); + virtual void setupStencilForClippingOnPlane(GLint plane) override; + virtual void setupStencilForDrawingOnPlane(GLint plane) override; }; class RawStencilBufferTest6 : public RawStencilBufferTestAlphaTest @@ -220,8 +220,8 @@ class RawStencilBufferTest6 : public RawStencilBufferTestAlphaTest public: CREATE_FUNC(RawStencilBufferTest6); - virtual void setupStencilForClippingOnPlane(GLint plane); - virtual void setupStencilForDrawingOnPlane(GLint plane); + virtual void setupStencilForClippingOnPlane(GLint plane) override; + virtual void setupStencilForDrawingOnPlane(GLint plane) override; // override virtual void setup() override; @@ -251,7 +251,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual void setup(); + virtual void setup() override; }; diff --git a/tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.h b/tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.h index 2061d5be13..9f25baf360 100644 --- a/tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.h +++ b/tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.h @@ -39,9 +39,9 @@ public: CocosStudio3DTestDemo(void); virtual ~CocosStudio3DTestDemo(void); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; // overrides virtual std::string title() const override; diff --git a/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h index 883f88ab5a..852b32d797 100644 --- a/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h +++ b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h @@ -27,9 +27,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class ConfigurationLoadConfig : public ConfigurationBase diff --git a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h index 03b6e608c2..ee18b11be3 100644 --- a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h +++ b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h @@ -12,9 +12,9 @@ class BaseLayer : public BaseTest public: BaseLayer(); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; virtual std::string title() const override; virtual std::string subtitle() const override; virtual void onEnter() override; diff --git a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h index 2823bffd94..5d6cc437b9 100644 --- a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h +++ b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h @@ -23,9 +23,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class Effect1 : public EffectAdvanceTextLayer diff --git a/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h index 1efd016405..945d96e12a 100644 --- a/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h +++ b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h @@ -23,9 +23,9 @@ public: virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; void newScene(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h b/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h index a9c78b3162..cb0029751b 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h @@ -14,12 +14,12 @@ public: AssetsManagerExTestLayer(const std::string& spritePath); ~AssetsManagerExTestLayer(void); - virtual std::string title() const; - void onEnter(); + virtual std::string title() const override; + void onEnter() override; - virtual void restartCallback(Ref* sender); - virtual void nextCallback(Ref* sender); - virtual void backCallback(Ref* sender); + virtual void restartCallback(Ref* sender) override; + virtual void nextCallback(Ref* sender) override; + virtual void backCallback(Ref* sender) override; private: Sprite *_background; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h index 4b34bb3b63..3c0968d012 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h @@ -57,17 +57,17 @@ protected: class TestActionTimeline : public ActionTimelineTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; }; class TestChangePlaySection : public ActionTimelineTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; protected: ActionTimeline* action; @@ -76,7 +76,7 @@ protected: class TestTimelineFrameEvent : public ActionTimelineTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; void onFrameEvent(Frame* frame); @@ -85,35 +85,35 @@ public: class TestTimelinePerformance : public ActionTimelineTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; }; class TestTimelineAnimationList : public ActionTimelineTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; }; class TestTimelineProjectNode : public ActionTimelineTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; }; class TestProjectNodeForSimulator : public ActionTimelineTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; }; class TestTimelineNodeLoadedCallback : public ActionTimelineTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; void nodeLoadedCallback(cocos2d::Ref* sender); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h index 82d273ebee..318d88c400 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h @@ -180,7 +180,7 @@ class TestUseMutiplePicture : public ArmatureTestLayer virtual void onExit() override; virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; int displayIndex; cocostudio::Armature *armature; @@ -192,7 +192,7 @@ class TestParticleDisplay : public ArmatureTestLayer virtual void onExit() override; virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; int animationID; cocostudio::Armature *armature; @@ -316,7 +316,7 @@ public: virtual void onEnter() override; virtual void onExit() override; virtual std::string title() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; cocostudio::Armature *armature; int weaponIndex; @@ -342,7 +342,7 @@ public: virtual void onExit() override; virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; void changeMountCallback(Ref* pSender); virtual cocostudio::Armature *createMount(const char *name, Vec2 position); @@ -374,7 +374,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; void updateSubTitle(); int animationID; @@ -389,7 +389,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; }; @@ -397,11 +397,11 @@ public: class TestLoadFromBinary : public ArmatureTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; void dataLoaded(float percent); @@ -416,7 +416,7 @@ private: class TestArmatureNode : public ArmatureTestLayer { public: - virtual void onEnter(); + virtual void onEnter() override; virtual std::string title() const override; virtual std::string subtitle() const override; }; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h index 70b2811601..97b8aaebb4 100755 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h @@ -12,7 +12,7 @@ public: PlayMusic(void); virtual ~PlayMusic(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -30,7 +30,7 @@ public: TMoveTo(void); virtual ~TMoveTo(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -49,7 +49,7 @@ public: TMoveBy(void); virtual ~TMoveBy(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -69,7 +69,7 @@ public: TRotateTo(void); virtual ~TRotateTo(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -88,7 +88,7 @@ public: TRotateBy(void); virtual ~TRotateBy(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -108,7 +108,7 @@ public: TScaleTo(void); virtual ~TScaleTo(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -127,7 +127,7 @@ public: TScaleBy(void); virtual ~TScaleBy(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -148,7 +148,7 @@ public: TSkewTo(void); virtual ~TSkewTo(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -167,7 +167,7 @@ public: TSkewBy(void); virtual ~TSkewBy(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -187,7 +187,7 @@ public: TriggerState(void); virtual ~TriggerState(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -204,7 +204,7 @@ public: ArmaturePlayAction(void); virtual ~ArmaturePlayAction(void); - virtual bool init(); + virtual bool init() override; virtual void done(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h index 2b9da0d018..a8648bd519 100755 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h @@ -12,7 +12,7 @@ public: TimeElapsed(void); virtual ~TimeElapsed(void); - virtual bool init(); + virtual bool init() override; virtual bool detect(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -33,7 +33,7 @@ public: ArmatureActionState(void); virtual ~ArmatureActionState(void); - virtual bool init(); + virtual bool init() override; virtual bool detect(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -55,7 +55,7 @@ public: NodeInRect(void); virtual ~NodeInRect(void); - virtual bool init(); + virtual bool init() override; virtual bool detect(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); @@ -73,7 +73,7 @@ public: NodeVisible(void); virtual ~NodeVisible(void); - virtual bool init(); + virtual bool init() override; virtual bool detect(); virtual void serialize(const rapidjson::Value &val); virtual void serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h index de785ce3ca..f11bbf2071 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h @@ -8,8 +8,8 @@ class ExtensionsMainLayer : public Layer public: virtual void onEnter() override; - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; Vec2 _beginPos; Menu* _itemMenu; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h index 134c276928..5915b34b3a 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h @@ -9,7 +9,7 @@ void runTableViewTest(); class TableViewTestLayer : public cocos2d::Layer, public cocos2d::extension::TableViewDataSource, public cocos2d::extension::TableViewDelegate { public: - virtual bool init(); + virtual bool init() override; void toExtensionsMainLayer(cocos2d::Ref *sender); diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h index 51fd8b23f8..ee0969cfb6 100644 --- a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h +++ b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h @@ -18,9 +18,9 @@ public: virtual void onEnter() override; virtual std::string title() const override; virtual std::string subtitle() const override; - void backCallback(Ref* sender); - void nextCallback(Ref* sender); - void restartCallback(Ref* sender); + void backCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void restartCallback(Ref* sender) override; }; class TestResolutionDirectories : public FileUtilsDemo diff --git a/tests/cpp-tests/Classes/FontTest/FontTest.h b/tests/cpp-tests/Classes/FontTest/FontTest.h index f970b273ba..bd60142caf 100644 --- a/tests/cpp-tests/Classes/FontTest/FontTest.h +++ b/tests/cpp-tests/Classes/FontTest/FontTest.h @@ -17,9 +17,9 @@ public: FontTest(); void showFont(const char *pFont); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; virtual std::string title() const override; CREATE_FUNC(FontTest); diff --git a/tests/cpp-tests/Classes/InputTest/MouseTest.h b/tests/cpp-tests/Classes/InputTest/MouseTest.h index 9c19de1025..9a597dd428 100644 --- a/tests/cpp-tests/Classes/InputTest/MouseTest.h +++ b/tests/cpp-tests/Classes/InputTest/MouseTest.h @@ -11,9 +11,9 @@ public: BaseMouseTest(void); virtual ~BaseMouseTest(void); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; // overrides virtual std::string title() const override; diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTest.h b/tests/cpp-tests/Classes/LabelTest/LabelTest.h index 0883619971..660e07768b 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTest.h +++ b/tests/cpp-tests/Classes/LabelTest/LabelTest.h @@ -25,9 +25,9 @@ public: virtual std::string subtitle() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; @@ -281,9 +281,9 @@ public: virtual std::string subtitle() const override; void stringChanged(Ref *sender); void alignmentChanged(Ref *sender); - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesEnded(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesEnded(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; public: LabelBMFont *_labelShouldRetain; diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h index d6b89384d3..61d56b9253 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h @@ -21,9 +21,9 @@ public: virtual std::string subtitle() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class LabelTTFAlignmentNew : public AtlasDemoNew @@ -189,9 +189,9 @@ public: virtual std::string subtitle() const override; void stringChanged(Ref *sender); void alignmentChanged(Ref *sender); - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesEnded(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesEnded(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; public: Label *_labelShouldRetain; diff --git a/tests/cpp-tests/Classes/LayerTest/LayerTest.h b/tests/cpp-tests/Classes/LayerTest/LayerTest.h index 62cd4cdca7..ed2e8f5905 100644 --- a/tests/cpp-tests/Classes/LayerTest/LayerTest.h +++ b/tests/cpp-tests/Classes/LayerTest/LayerTest.h @@ -18,9 +18,9 @@ public: virtual std::string subtitle() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class LayerTestCascadingOpacityA : public LayerTest @@ -82,9 +82,9 @@ public: void updateSize(Vec2 &touchLocation); - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); - void onTouchesEnded(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; + void onTouchesEnded(const std::vector& touches, Event *event) override; }; class LayerTest2 : public LayerTest diff --git a/tests/cpp-tests/Classes/LightTest/LightTest.h b/tests/cpp-tests/Classes/LightTest/LightTest.h index 02e7bfd3b7..e3c73ca718 100644 --- a/tests/cpp-tests/Classes/LightTest/LightTest.h +++ b/tests/cpp-tests/Classes/LightTest/LightTest.h @@ -35,17 +35,17 @@ public: LightTest(); virtual ~LightTest(); - virtual std::string title() const; - virtual std::string subtitle() const; + virtual std::string title() const override; + virtual std::string subtitle() const override; - virtual void restartCallback(Ref* sender); - virtual void nextCallback(Ref* sender); - virtual void backCallback(Ref* sender); + virtual void restartCallback(Ref* sender) override; + virtual void nextCallback(Ref* sender) override; + virtual void backCallback(Ref* sender) override; virtual void onEnter() override; virtual void onExit() override; - virtual void update(float delta); + virtual void update(float delta) override; void SwitchLight(Ref* sender, LightType lightType); diff --git a/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h b/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h index cd3864a7db..be78035f82 100644 --- a/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h +++ b/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h @@ -17,9 +17,9 @@ public: virtual std::string subtitle() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; void modeCallback(Ref* sender); protected: MotionStreak *streak; @@ -47,7 +47,7 @@ protected: public: CREATE_FUNC(MotionStreakTest2); virtual void onEnter() override; - void onTouchesMoved(const std::vector& touches, Event* event); + void onTouchesMoved(const std::vector& touches, Event* event) override; virtual std::string title() const override; }; @@ -59,7 +59,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; virtual void onEnter() override; - virtual void update(float dt); + virtual void update(float dt) override; private: Vec2 _center; float _radius; diff --git a/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h b/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h index 67b97bc36f..55d84e9b34 100644 --- a/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h +++ b/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h @@ -48,9 +48,9 @@ public: virtual std::string title() const override; virtual void onExit() override; - void backCallback(Ref* sender); - void nextCallback(Ref* sender); - void restartCallback(Ref* sender); + void backCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void restartCallback(Ref* sender) override; }; @@ -61,9 +61,9 @@ public: virtual ~AudioControlTest(); - virtual bool init(); + virtual bool init() override; - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; @@ -86,7 +86,7 @@ public: virtual ~PlaySimultaneouslyTest(); - virtual bool init(); + virtual bool init() override; virtual std::string title() const override; private: @@ -104,12 +104,12 @@ public: virtual ~AudioProfileTest(); - virtual bool init(); + virtual bool init() override; virtual std::string title() const override; virtual std::string subtitle() const override; - virtual void update(float dt); + virtual void update(float dt) override; private: static const int FILE_COUNT = 2; @@ -130,7 +130,7 @@ public: virtual ~InvalidAudioFileTest(); - virtual bool init(); + virtual bool init() override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -146,7 +146,7 @@ public: virtual ~LargeAudioFileTest(); - virtual bool init(); + virtual bool init() override; virtual std::string title() const override; diff --git a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h index a6bc7e0a0a..34409190c7 100644 --- a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h +++ b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h @@ -25,9 +25,9 @@ public: virtual void onEnter() override; virtual std::string title() const override; virtual std::string subtitle() const override; - void backCallback(Ref* sender); - void nextCallback(Ref* sender); - void restartCallback(Ref* sender); + void backCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void restartCallback(Ref* sender) override; }; diff --git a/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h index 878cf7001d..3f9019b1e5 100644 --- a/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h +++ b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h @@ -29,9 +29,9 @@ public: virtual std::string subtitle() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; protected: MultiSceneTest(); @@ -49,7 +49,7 @@ public: void createSpriteTest(); void createNewSpriteTest(); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; protected: NewSpriteTest(); @@ -77,7 +77,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; void addNewSpriteWithCoords(Vec2 p); protected: @@ -93,9 +93,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); - void onTouchesEnded(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; + void onTouchesEnded(const std::vector& touches, Event *event) override; protected: NewClippingNodeTest(); diff --git a/tests/cpp-tests/Classes/NodeTest/NodeTest.h b/tests/cpp-tests/Classes/NodeTest/NodeTest.h index 9200f1f5b0..95a002d848 100644 --- a/tests/cpp-tests/Classes/NodeTest/NodeTest.h +++ b/tests/cpp-tests/Classes/NodeTest/NodeTest.h @@ -38,9 +38,9 @@ public: virtual std::string subtitle() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; protected: TestCocosNodeDemo(); @@ -177,7 +177,7 @@ class CameraZoomTest : public TestCocosNodeDemo { public: CREATE_FUNC(CameraZoomTest); - void update(float dt); + void update(float dt) override; virtual void onEnter() override; virtual void onExit() override; @@ -195,8 +195,8 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual void onEnter(); - virtual void onExit(); + virtual void onEnter() override; + virtual void onExit() override; protected: CameraCenterTest(); @@ -303,7 +303,7 @@ public: protected: NodeNormalizedPositionTest2(); - void update(float dt); + void update(float dt) override; Size _copyContentSize; float _accum; }; @@ -318,7 +318,7 @@ public: protected: NodeNormalizedPositionBugTest(); - void update(float dt); + void update(float dt) override; float _accum; Sprite *sprite; }; diff --git a/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h b/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h index e7fcd82934..4e528c1372 100644 --- a/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h +++ b/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h @@ -16,9 +16,9 @@ public: virtual std::string title() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class Parallax1 : public ParallaxDemo @@ -43,7 +43,7 @@ protected: public: Parallax2(); - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesMoved(const std::vector& touches, Event *event) override; virtual std::string title() const override; }; diff --git a/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.h b/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.h index 799866f991..43fc5ae2a6 100644 --- a/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.h +++ b/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.h @@ -36,9 +36,9 @@ public: Particle3DTestDemo(void); virtual ~Particle3DTestDemo(void); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; // overrides virtual bool init() override; @@ -46,9 +46,9 @@ public: virtual std::string subtitle() const override; virtual void update(float delta) override; - void onTouchesBegan(const std::vector& touches, cocos2d::Event *event); - void onTouchesMoved(const std::vector& touches, cocos2d::Event *event); - void onTouchesEnded(const std::vector& touches, cocos2d::Event *event); + void onTouchesBegan(const std::vector& touches, cocos2d::Event *event) override; + void onTouchesMoved(const std::vector& touches, cocos2d::Event *event) override; + void onTouchesEnded(const std::vector& touches, cocos2d::Event *event) override; protected: std::string _title; diff --git a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h index c18d00be62..ddcaa01f0a 100644 --- a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h +++ b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h @@ -28,16 +28,16 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; void toggleCallback(Ref* sender); - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); - void onTouchesEnded(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; + void onTouchesEnded(const std::vector& touches, Event *event) override; - virtual void update(float dt); + virtual void update(float dt) override; void setEmitterPosition(); }; @@ -247,7 +247,7 @@ public: virtual void onEnter() override; virtual std::string title() const override; virtual std::string subtitle() const override; - virtual void update(float dt); + virtual void update(float dt) override; }; class MultipleParticleSystemsBatched : public ParticleDemo diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h index f495cf2486..314bdd24d3 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h @@ -50,10 +50,10 @@ class NodeCreateTest : public PerformceAllocScene public: CREATE_FUNC(NodeCreateTest); - virtual void updateQuantityOfNodes(); - virtual void initWithQuantityOfNodes(unsigned int nNodes); - virtual void update(float dt); - virtual const char* testName(); + virtual void updateQuantityOfNodes() override; + virtual void initWithQuantityOfNodes(unsigned int nNodes) override; + virtual void update(float dt) override; + virtual const char* testName() override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -64,10 +64,10 @@ class NodeDeallocTest : public PerformceAllocScene public: CREATE_FUNC(NodeDeallocTest); - virtual void updateQuantityOfNodes(); - virtual void initWithQuantityOfNodes(unsigned int nNodes); - virtual void update(float dt); - virtual const char* testName(); + virtual void updateQuantityOfNodes() override; + virtual void initWithQuantityOfNodes(unsigned int nNodes) override; + virtual void update(float dt) override; + virtual const char* testName() override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -78,10 +78,10 @@ class SpriteCreateEmptyTest : public PerformceAllocScene public: CREATE_FUNC(SpriteCreateEmptyTest); - virtual void updateQuantityOfNodes(); - virtual void initWithQuantityOfNodes(unsigned int nNodes); - virtual void update(float dt); - virtual const char* testName(); + virtual void updateQuantityOfNodes() override; + virtual void initWithQuantityOfNodes(unsigned int nNodes) override; + virtual void update(float dt) override; + virtual const char* testName() override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -92,10 +92,10 @@ class SpriteCreateTest : public PerformceAllocScene public: CREATE_FUNC(SpriteCreateTest); - virtual void updateQuantityOfNodes(); - virtual void initWithQuantityOfNodes(unsigned int nNodes); - virtual void update(float dt); - virtual const char* testName(); + virtual void updateQuantityOfNodes() override; + virtual void initWithQuantityOfNodes(unsigned int nNodes) override; + virtual void update(float dt) override; + virtual const char* testName() override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -106,10 +106,10 @@ class SpriteDeallocTest : public PerformceAllocScene public: CREATE_FUNC(SpriteDeallocTest); - virtual void updateQuantityOfNodes(); - virtual void initWithQuantityOfNodes(unsigned int nNodes); - virtual void update(float dt); - virtual const char* testName(); + virtual void updateQuantityOfNodes() override; + virtual void initWithQuantityOfNodes(unsigned int nNodes) override; + virtual void update(float dt) override; + virtual const char* testName() override; virtual std::string title() const override; virtual std::string subtitle() const override; diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceMathTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceMathTest.h index 5fe6348dde..a423ee0699 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceMathTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceMathTest.h @@ -16,9 +16,9 @@ public: } virtual void onEnter() override; - virtual void restartCallback(Ref* sender); - virtual void nextCallback(Ref* sender); - virtual void backCallback(Ref* sender); + virtual void restartCallback(Ref* sender) override; + virtual void nextCallback(Ref* sender) override; + virtual void backCallback(Ref* sender) override; virtual void showCurrentTest() {} diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h index be10919204..1c13bb531d 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h @@ -62,7 +62,7 @@ public: CREATE_FUNC(IterateSpriteSheetForLoop); IterateSpriteSheetForLoop() {} - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -75,7 +75,7 @@ public: CREATE_FUNC(IterateSpriteSheetIterator); IterateSpriteSheetIterator() {} - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -87,7 +87,7 @@ class IterateSpriteSheetForEach : public IterateSpriteSheet public: CREATE_FUNC(IterateSpriteSheetForEach); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -119,7 +119,7 @@ class CallFuncsSpriteSheetForEach : public IterateSpriteSheet public: CREATE_FUNC(CallFuncsSpriteSheetForEach); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -133,7 +133,7 @@ class AddSprite : public AddRemoveSpriteSheet public: CREATE_FUNC(AddSprite); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -145,7 +145,7 @@ class AddSpriteSheet : public AddRemoveSpriteSheet public: CREATE_FUNC(AddSpriteSheet); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -157,7 +157,7 @@ class GetSpriteSheet : public AddRemoveSpriteSheet public: CREATE_FUNC(GetSpriteSheet); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -169,7 +169,7 @@ class RemoveSprite : public AddRemoveSpriteSheet public: CREATE_FUNC(RemoveSprite); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -181,7 +181,7 @@ class RemoveSpriteSheet : public AddRemoveSpriteSheet public: CREATE_FUNC(RemoveSpriteSheet); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -193,7 +193,7 @@ class ReorderSpriteSheet : public AddRemoveSpriteSheet public: CREATE_FUNC(ReorderSpriteSheet); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -205,7 +205,7 @@ class SortAllChildrenSpriteSheet : public AddRemoveSpriteSheet public: CREATE_FUNC(SortAllChildrenSpriteSheet); - virtual void update(float dt); + virtual void update(float dt) override; virtual std::string title() const override; virtual std::string subtitle() const override; diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h index 7ccccb8ec7..a38a2e9139 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h @@ -11,7 +11,7 @@ public: { } - virtual void showCurrentTest(); + virtual void showCurrentTest() override; virtual void onEnter() override; virtual std::string title() const; @@ -28,9 +28,9 @@ public: } virtual std::string title() const override; - virtual void performTests(); + virtual void performTests() override; - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesMoved(const std::vector& touches, Event *event) override; static Scene* scene(); diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h index 5c303b8d9a..ffbaea064d 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h @@ -54,9 +54,9 @@ public: { } - virtual void restartCallback(Ref* sender); - virtual void nextCallback(Ref* sender); - virtual void backCallback(Ref* sender); + virtual void restartCallback(Ref* sender) override; + virtual void nextCallback(Ref* sender) override; + virtual void backCallback(Ref* sender) override; virtual void showCurrentTest(); }; diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTest.h index 45fb299acf..1e57862a57 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTest.h @@ -8,8 +8,8 @@ class PerformanceMainLayer : public Layer public: virtual void onEnter() override; - bool onTouchBegan(Touch* touches, Event *event); - void onTouchMoved(Touch* touches, Event *event); + bool onTouchBegan(Touch* touches, Event *event) override; + void onTouchMoved(Touch* touches, Event *event) override; void onMouseScroll(Event *event); protected: diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h index 90ce532f16..00f111ff76 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h @@ -37,10 +37,10 @@ public: virtual void onEnter() override; virtual std::string title() const override; - bool onTouchBegan(Touch* touch, Event* event) ; - void onTouchMoved(Touch* touch, Event* event) ; - void onTouchEnded(Touch* touch, Event* event) ; - void onTouchCancelled(Touch* touch, Event* event) ; + bool onTouchBegan(Touch* touch, Event* event) override; + void onTouchMoved(Touch* touch, Event* event) override; + void onTouchEnded(Touch* touch, Event* event) override; + void onTouchCancelled(Touch* touch, Event* event) override; }; class TouchesPerformTest2 : public TouchesMainScene @@ -54,10 +54,10 @@ public: virtual void onEnter() override; virtual std::string title() const override; - void onTouchesBegan(const std::vector& touches, Event* event) ; - void onTouchesMoved(const std::vector& touches, Event* event) ; - void onTouchesEnded(const std::vector& touches, Event* event) ; - void onTouchesCancelled(const std::vector& touches, Event* event) ; + void onTouchesBegan(const std::vector& touches, Event* event) override; + void onTouchesMoved(const std::vector& touches, Event* event) override; + void onTouchesEnded(const std::vector& touches, Event* event) override; + void onTouchesCancelled(const std::vector& touches, Event* event) override; }; class TouchesPerformTest3 : public PerformBasicLayer diff --git a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h index 1fc6aaa40e..969f8140c4 100644 --- a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h +++ b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h @@ -44,9 +44,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; void toggleDebugCallback(Ref* sender); Sprite* addGrossiniAtPosition(Vec2 p, float scale = 1.0); @@ -54,9 +54,9 @@ public: Sprite* makeBox(Vec2 point, Size size, int color = 0, PhysicsMaterial material = PHYSICSBODY_MATERIAL_DEFAULT); Sprite* makeTriangle(Vec2 point, Size size, int color = 0, PhysicsMaterial material = PHYSICSBODY_MATERIAL_DEFAULT); - bool onTouchBegan(Touch* touch, Event* event); - void onTouchMoved(Touch* touch, Event* event); - void onTouchEnded(Touch* touch, Event* event); + bool onTouchBegan(Touch* touch, Event* event) override; + void onTouchMoved(Touch* touch, Event* event) override; + void onTouchEnded(Touch* touch, Event* event) override; protected: PhysicsTestScene* _scene; @@ -74,8 +74,8 @@ public: void onEnter() override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); - void onAcceleration(Acceleration* acc, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; + void onAcceleration(Acceleration* acc, Event* event) override; }; class PhysicsDemoLogoSmash : public PhysicsDemo @@ -107,7 +107,7 @@ public: void onEnter() override; virtual std::string title() const override; void update(float delta) override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; void changeModeCallback(Ref* sender); @@ -147,9 +147,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - bool onTouchBegan(Touch* touch, Event* event); - void onTouchMoved(Touch* touch, Event* event); - void onTouchEnded(Touch* touch, Event* event); + bool onTouchBegan(Touch* touch, Event* event) override; + void onTouchMoved(Touch* touch, Event* event) override; + void onTouchEnded(Touch* touch, Event* event) override; private: float _distance; @@ -179,7 +179,7 @@ public: bool slice(PhysicsWorld& world, const PhysicsRayCastInfo& info, void* data); void clipPoly(PhysicsShapePolygon* shape, Vec2 normal, float distance); - void onTouchEnded(Touch *touch, Event *event); + void onTouchEnded(Touch *touch, Event *event) override; private: int _sliceTag; @@ -275,7 +275,7 @@ public: void onEnter() override; virtual std::string title() const override; - bool onTouchBegan(Touch* touch, Event* event); + bool onTouchBegan(Touch* touch, Event* event) override; }; diff --git a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h index 579dd414de..4289c543b8 100644 --- a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h +++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h @@ -12,9 +12,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class RenderTextureSave : public RenderTextureTest @@ -25,7 +25,7 @@ public: ~RenderTextureSave(); virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesMoved(const std::vector& touches, Event* event); + void onTouchesMoved(const std::vector& touches, Event* event) override; void clearImage(Ref *pSender); void saveImage(Ref *pSender); @@ -55,9 +55,9 @@ public: CREATE_FUNC(RenderTextureZbuffer); RenderTextureZbuffer(); - void onTouchesMoved(const std::vector& touches, Event* event); + void onTouchesMoved(const std::vector& touches, Event* event) override; void onTouchesBegan(const std::vector& touches, Event* event); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -148,7 +148,7 @@ public: CREATE_FUNC(SpriteRenderTextureBug); SpriteRenderTextureBug(); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; virtual std::string title() const override; virtual std::string subtitle() const override; diff --git a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h index c6107d9c8e..b2487a4f5c 100644 --- a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h +++ b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h @@ -16,9 +16,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void backCallback(Ref* sender); - void nextCallback(Ref* sender); - void restartCallback(Ref* sender); + void backCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void restartCallback(Ref* sender) override; }; class SchedulerAutoremove : public SchedulerTestLayer @@ -60,7 +60,7 @@ public: virtual ~SchedulerPauseResumeAll(); virtual void onEnter() override; virtual void onExit() override; - virtual void update(float delta); + virtual void update(float delta) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -184,7 +184,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void update(float dt); + void update(float dt) override; void tick(float dt); void stopSelectors(float dt); }; @@ -198,7 +198,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void update(float dt); + void update(float dt) override; void schedUpdate(float dt); void stopUpdate(float dt); }; @@ -211,7 +211,7 @@ public: ~TestNode(); void initWithString(const std::string& str, int priority); - virtual void update(float dt); + virtual void update(float dt) override; private: std::string _string; }; @@ -239,7 +239,7 @@ public: virtual void onEnter() override; virtual std::string title() const override; virtual std::string subtitle() const override; - void update(float dt); + void update(float dt) override; }; class SchedulerTimeScale : public SchedulerTestLayer @@ -247,8 +247,8 @@ class SchedulerTimeScale : public SchedulerTestLayer public: CREATE_FUNC(SchedulerTimeScale); - void onEnter(); - void onExit(); + void onEnter() override; + void onExit() override; virtual std::string title() const override; virtual std::string subtitle() const override; ControlSlider* sliderCtl(); @@ -265,7 +265,7 @@ public: virtual ~TwoSchedulers(); virtual std::string title() const override; virtual std::string subtitle() const override; - void onEnter(); + void onEnter() override; ControlSlider* sliderCtl(); void sliderAction(Ref* sender, Control::EventType controlEvent); Scheduler *sched1; @@ -285,8 +285,8 @@ public: ~SchedulerIssue2268(); virtual std::string title() const override; virtual std::string subtitle() const override; - void onEnter(); - void update(float dt); + void onEnter() override; + void update(float dt) override; private: Node *testNode; @@ -300,7 +300,7 @@ public: ~ScheduleCallbackTest(); virtual std::string title() const override; virtual std::string subtitle() const override; - void onEnter(); + void onEnter() override; void callback(float dt); @@ -314,12 +314,12 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void onEnter(); - void onExit(); + void onEnter() override; + void onExit() override; - virtual void update(float dt); + virtual void update(float dt) override; - bool onTouchBegan(Touch* touch, Event* event); + bool onTouchBegan(Touch* touch, Event* event) override; }; class SchedulerTestScene : public TestScene @@ -338,8 +338,8 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void onEnter(); - void update(float dt); + void onEnter() override; + void update(float dt) override; }; #endif diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h index e3788de8bd..236fc426fd 100644 --- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h +++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h @@ -17,9 +17,9 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; CREATE_FUNC(ShaderTestDemo); }; @@ -31,7 +31,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; class ShaderMandelbrot : public ShaderTestDemo @@ -41,7 +41,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; class ShaderJulia : public ShaderTestDemo @@ -51,7 +51,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; class ShaderHeart : public ShaderTestDemo @@ -61,7 +61,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; class ShaderFlower : public ShaderTestDemo @@ -71,7 +71,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; class ShaderPlasma : public ShaderTestDemo @@ -81,7 +81,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; class SpriteBlur; @@ -91,7 +91,7 @@ public: ShaderBlur(); virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; void createSliderCtls(); void onRadiusChanged(Ref* sender, Control::EventType controlEvent); void onSampleNumChanged(Ref* sender, Control::EventType controlEvent); @@ -108,8 +108,8 @@ public: ShaderRetroEffect(); virtual std::string title() const override; virtual std::string subtitle() const override; - bool init(); - void update(float dt); + bool init() override; + void update(float dt) override; protected: Label* _label; float _accum; @@ -120,8 +120,8 @@ class ShaderNode : public Node public: static ShaderNode* shaderNodeWithVertex(const std::string &vert, const std::string &frag); - virtual void update(float dt); - virtual void setPosition(const Vec2 &newPosition); + virtual void update(float dt) override; + virtual void setPosition(const Vec2 &newPosition) override; virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; protected: @@ -154,7 +154,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; class ShaderGlow : public ShaderTestDemo @@ -164,7 +164,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; class ShaderMultiTexture : public ShaderTestDemo @@ -179,7 +179,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual bool init(); + virtual bool init() override; }; #endif diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h index 52c867628a..5208eb4fda 100644 --- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h +++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h @@ -10,10 +10,10 @@ class ShaderTestDemo2 : public BaseTest { public: ShaderTestDemo2(void); - virtual std::string title() const { return "Effects on Sprites";} - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + virtual std::string title() const override { return "Effects on Sprites";} + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class ShaderTestScene2 : public TestScene @@ -67,9 +67,9 @@ public: virtual std::string subtitle() const {return "Sprite Lamp effects";} //callback public: - virtual void onTouchesBegan(const std::vector& touches, Event *unused_event); - virtual void onTouchesMoved(const std::vector& touches, Event *unused_event); - virtual void onTouchesEnded(const std::vector& touches, Event *unused_event); + virtual void onTouchesBegan(const std::vector& touches, Event *unused_event) override; + virtual void onTouchesMoved(const std::vector& touches, Event *unused_event) override; + virtual void onTouchesEnded(const std::vector& touches, Event *unused_event) override; protected: EffectSprite *_sprite; Effect* _effect; diff --git a/tests/cpp-tests/Classes/SpineTest/SpineTest.h b/tests/cpp-tests/Classes/SpineTest/SpineTest.h index 55a778b717..442553820f 100644 --- a/tests/cpp-tests/Classes/SpineTest/SpineTest.h +++ b/tests/cpp-tests/Classes/SpineTest/SpineTest.h @@ -52,9 +52,9 @@ public: SpineTestLayer(void); virtual ~SpineTestLayer(void); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; // overrides virtual std::string title() const override; @@ -75,8 +75,8 @@ public: { return "Normal Spine"; } - virtual bool init (); - virtual void update (float deltaTime); + virtual bool init () override; + virtual void update (float deltaTime) override; // void animationStateEvent (spine::SkeletonAnimation* node, int trackIndex, spEventType type, spEvent* event, int loopCount); CREATE_FUNC (SpineTestLayerNormal); @@ -95,8 +95,8 @@ public: { return "FFD Spine"; } - virtual bool init (); - virtual void update (float deltaTime); + virtual bool init () override; + virtual void update (float deltaTime) override; // void animationStateEvent (spine::SkeletonAnimation* node, int trackIndex, spEventType type, spEvent* event, int loopCount); CREATE_FUNC (SpineTestLayerFFD); @@ -113,8 +113,8 @@ public: { return "Performance Test for Spine"; } - virtual bool init (); - virtual void update (float deltaTime); + virtual bool init () override; + virtual void update (float deltaTime) override; // void animationStateEvent (spine::SkeletonAnimation* node, int trackIndex, spEventType type, spEvent* event, int loopCount); CREATE_FUNC (SpineTestPerformanceLayer); diff --git a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h index 9b8b1093c0..271197e379 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h +++ b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h @@ -84,7 +84,7 @@ public: CC_CONSTRUCTOR_ACCESS: DrawNode3D(); virtual ~DrawNode3D(); - virtual bool init(); + virtual bool init() override; protected: struct V3F_C4B diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h index c59cd4895d..1f2e0a97c0 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h @@ -44,9 +44,9 @@ public: Sprite3DTestDemo(void); virtual ~Sprite3DTestDemo(void); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; // overrides virtual std::string title() const override; @@ -81,7 +81,7 @@ public: virtual std::string subtitle() const override; void addNewSpriteWithCoords(Vec2 p); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; }; class Sprite3DUVAnimationTest : public Sprite3DTestDemo @@ -125,9 +125,9 @@ public: void move3D(float elapsedTime); void updateState(float elapsedTime); bool isState(unsigned int state,unsigned int bit) const; - void onTouchesBegan(const std::vector& touches, cocos2d::Event *event); - void onTouchesMoved(const std::vector& touches, cocos2d::Event *event); - void onTouchesEnded(const std::vector& touches, cocos2d::Event *event); + void onTouchesBegan(const std::vector& touches, cocos2d::Event *event) override; + void onTouchesMoved(const std::vector& touches, cocos2d::Event *event) override; + void onTouchesEnded(const std::vector& touches, cocos2d::Event *event) override; private: cocos2d::Camera * _camera; Vec3 _targetPos; @@ -149,7 +149,7 @@ public: virtual ~Sprite3DLightMapTest(); virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesMoved(const std::vector& touches, cocos2d::Event* event); + void onTouchesMoved(const std::vector& touches, cocos2d::Event* event) override; private: Camera * _camera; }; @@ -263,7 +263,7 @@ public: void addNewSpriteWithCoords(Vec2 p); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; }; class AsyncLoadSprite3DTest : public Sprite3DTestDemo @@ -293,7 +293,7 @@ public: void addNewSpriteWithCoords(Vec2 p); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; }; class Sprite3DWithSkinOutlineTest : public Sprite3DTestDemo @@ -306,7 +306,7 @@ public: void addNewSpriteWithCoords(Vec2 p); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; }; class Animate3DTest : public Sprite3DTestDemo @@ -318,7 +318,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; virtual void update(float dt) override; @@ -357,7 +357,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; void addNewSpriteWithCoords(Vec2 p); @@ -373,7 +373,7 @@ public: Sprite3DReskinTest(); virtual std::string title() const override; virtual std::string subtitle() const override; - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; void addNewSpriteWithCoords(Vec2 p); void menuCallback_reSkin(Ref* sender); @@ -406,9 +406,9 @@ public: virtual void update(float dt) override; void addNewOBBWithCoords(Vec2 p); void addNewSpriteWithCoords(Vec2 p); - void onTouchesBegan(const std::vector& touches, Event* event); - void onTouchesEnded(const std::vector& touches, Event* event); - void onTouchesMoved(const std::vector& touches, Event* event); + void onTouchesBegan(const std::vector& touches, Event* event) override; + void onTouchesEnded(const std::vector& touches, Event* event) override; + void onTouchesMoved(const std::vector& touches, Event* event) override; void addOBBCallback(Ref* sender); void delOBBCallback(Ref* sender); void addOBBWithCount(float value); diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h index ab3e59b36f..8ba80abed7 100644 --- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h +++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h @@ -39,9 +39,9 @@ public: SpriteTestDemo(void); virtual ~SpriteTestDemo(void); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; // overrides virtual std::string title() const override; @@ -58,7 +58,7 @@ public: virtual std::string subtitle() const override; void addNewSpriteWithCoords(Vec2 p); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; }; class SpriteBatchNode1: public SpriteTestDemo @@ -67,7 +67,7 @@ public: CREATE_FUNC(SpriteBatchNode1); SpriteBatchNode1(); void addNewSpriteWithCoords(Vec2 p); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; virtual std::string title() const override; virtual std::string subtitle() const override; }; @@ -282,7 +282,7 @@ public: SpriteNewTexture(); virtual ~SpriteNewTexture(); void addNewSprite(); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; virtual std::string title() const override; virtual std::string subtitle() const override; @@ -299,7 +299,7 @@ public: SpriteBatchNodeNewTexture(); virtual ~SpriteBatchNodeNewTexture(); void addNewSprite(); - void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event) override; virtual std::string title() const override; virtual std::string subtitle() const override; diff --git a/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h index 6b3cfc415f..2ae0057f82 100644 --- a/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h +++ b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h @@ -15,11 +15,11 @@ class TextInputTest : public BaseTest public: TextInputTest(); - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; - virtual std::string title() const; + virtual std::string title() const override; void addKeyboardNotificationLayer(KeyboardNotificationLayer * layer); virtual void onEnter() override; @@ -57,7 +57,7 @@ class TextFieldTTFDefaultTest : public KeyboardNotificationLayer public: // KeyboardNotificationLayer virtual std::string subtitle() const override; - virtual void onClickTrackNode(bool bClicked); + virtual void onClickTrackNode(bool bClicked) override; // Layer virtual void onEnter() override; @@ -79,15 +79,15 @@ public: // KeyboardNotificationLayer virtual std::string subtitle() const override; - virtual void onClickTrackNode(bool bClicked); + virtual void onClickTrackNode(bool bClicked) override; // Layer virtual void onEnter() override; virtual void onExit() override; // TextFieldDelegate - virtual bool onTextFieldAttachWithIME(TextFieldTTF * sender); - virtual bool onTextFieldDetachWithIME(TextFieldTTF * sender); + virtual bool onTextFieldAttachWithIME(TextFieldTTF * sender) override; + virtual bool onTextFieldDetachWithIME(TextFieldTTF * sender) override; virtual bool onTextFieldInsertText(TextFieldTTF * sender, const char * text, size_t nLen) override; virtual bool onTextFieldDeleteBackward(TextFieldTTF * sender, const char * delText, size_t nLen) override; virtual bool onDraw(TextFieldTTF * sender); diff --git a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h index 2190dfbcd3..1e237c2fae 100644 --- a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h +++ b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h @@ -38,9 +38,9 @@ public: virtual std::string subtitle() const override; virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; }; class TextureTIFF : public TextureDemo diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h index 188770b187..10c1d2141c 100644 --- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h +++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h @@ -13,13 +13,13 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; virtual void onEnter() override; - virtual void onExit()override; + virtual void onExit() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesMoved(const std::vector& touches, Event *event) override; }; class TileMapTest : public TileDemo diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.h b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.h index 15ad4c5060..a37cd1730d 100644 --- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.h +++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.h @@ -13,13 +13,13 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; virtual void onEnter() override; - virtual void onExit()override; + virtual void onExit() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesMoved(const std::vector& touches, Event *event) override; }; class TileMapTestNew : public TileDemoNew diff --git a/tests/cpp-tests/Classes/TouchesTest/Paddle.h b/tests/cpp-tests/Classes/TouchesTest/Paddle.h index e53b94740e..d55b236076 100644 --- a/tests/cpp-tests/Classes/TouchesTest/Paddle.h +++ b/tests/cpp-tests/Classes/TouchesTest/Paddle.h @@ -20,14 +20,14 @@ public: virtual ~Paddle(void); Rect getRect(); - bool initWithTexture(Texture2D* aTexture); + bool initWithTexture(Texture2D* aTexture) override; virtual void onEnter() override; virtual void onExit() override; bool containsTouchLocation(Touch* touch); bool onTouchBegan(Touch* touch, Event* event); void onTouchMoved(Touch* touch, Event* event); void onTouchEnded(Touch* touch, Event* event); - virtual Paddle* clone() const; + virtual Paddle* clone() const override; static Paddle* createWithTexture(Texture2D* aTexture); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocoStudioGUITest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocoStudioGUITest.h index 88ae14ef3d..4f2ec3e041 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocoStudioGUITest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocoStudioGUITest.h @@ -8,9 +8,9 @@ class CocoStudioGUIMainLayer : public Layer { public: - virtual void onEnter(); - void onTouchesBegan(const std::vector& touches, Event *event); -// void onTouchesMoved(const std::vector& touches, Event *event); + virtual void onEnter() override; + void onTouchesBegan(const std::vector& touches, Event *event) override; +// void onTouchesMoved(const std::vector& touches, Event *event) override; private: Vec2 _beginPos; @@ -20,7 +20,7 @@ private: class CocoStudioGUITestScene : public TestScene { public: - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(Ref* pSender); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.h index 543ff8e52a..51e02f512e 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.h @@ -37,10 +37,10 @@ using namespace cocos2d::ui; class CocosGUITestMainLayer : public Layer { public: - virtual void onEnter(); + virtual void onEnter() override; - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; Vec2 _beginPos; Menu* _itemMenu; @@ -51,7 +51,7 @@ public: class CocosGUITestScene : public TestScene { public: - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(Ref* pSender); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.h index 5563542427..9f4822e6c9 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.h @@ -37,8 +37,8 @@ using namespace cocos2d::ui; class CocostudioParserTestMainLayer : public Layer { public: - virtual void onEnter(); - void onTouchesBegan(const std::vector& touches, Event *event); + virtual void onEnter() override; + void onTouchesBegan(const std::vector& touches, Event *event) override; void touchEvent(Ref* pSender, Widget::TouchEventType type); @@ -50,7 +50,7 @@ private: class CocostudioParserTestScene : public TestScene { public: - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(Ref* pSender); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.h index 4606d0ada9..acf89628b2 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.h @@ -33,7 +33,7 @@ class CocostudioParserJsonLayer : public cocos2d::Layer public: CocostudioParserJsonLayer(std::string jsonFile); ~CocostudioParserJsonLayer(){} - virtual void onEnter(); + virtual void onEnter() override; private: std::string _jsonFile; }; @@ -43,7 +43,7 @@ class CocostudioParserJsonScene : public TestScene public: CocostudioParserJsonScene(std::string jsonFile); ~CocostudioParserJsonScene(){} - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(cocos2d::Ref* pSender); private: diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomGUIScene.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomGUIScene.h index 366f5f24d8..6bef6fe9a3 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomGUIScene.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomGUIScene.h @@ -15,9 +15,9 @@ using namespace cocos2d::ui; class CustomGUITestMainLayer : public Layer { public: - virtual void onEnter(); - void onTouchesBegan(const std::vector& touches, Event *event); -// void onTouchesMoved(const std::vector& touches, Event *event); + virtual void onEnter() override; + void onTouchesBegan(const std::vector& touches, Event *event) override; +// void onTouchesMoved(const std::vector& touches, Event *event) override; void touchEvent(Ref* pSender, Widget::TouchEventType type); @@ -29,7 +29,7 @@ private: class CustomGUITestScene : public TestScene { public: - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(Ref* pSender); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h index a9fdc25fe5..09ea196575 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h @@ -10,13 +10,13 @@ class CustomImageLayer : public cocos2d::Layer { public: - virtual void onEnter(); + virtual void onEnter() override; }; class CustomImageScene : public TestScene { public: - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(cocos2d::Ref* pSender); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h index 01e8c756e1..68c994e55f 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h @@ -16,13 +16,13 @@ class CustomParticleWidgetLayer : public cocos2d::Layer { public: - virtual void onEnter(); + virtual void onEnter() override; }; class CustomParticleWidgetScene : public cocos2d::Scene { public: - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(cocos2d::Ref* pSender); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomWidgetCallbackBindTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomWidgetCallbackBindTest.h index c5699eaa32..a7c54b0729 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomWidgetCallbackBindTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomWidgetCallbackBindTest/CustomWidgetCallbackBindTest.h @@ -9,7 +9,7 @@ class CustomWidgetCallbackBindScene : public TestScene { public: - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(cocos2d::Ref* pSender); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h index 0ff54f74d3..51ea40700f 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h @@ -36,7 +36,7 @@ public: void stopParticle(); protected: - virtual bool init(); + virtual bool init() override; virtual void initRenderer(); virtual void removeAllChildren(); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.h index 48fa4a31cb..6641071755 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/GUIEditorTest.h @@ -8,10 +8,10 @@ class GUIEditorMainLayer : public Layer { public: - virtual void onEnter(); + virtual void onEnter() override; void menuCallback(Ref* pSender); - void onTouchesBegan(const std::vector& touches, Event *event); - void onTouchesMoved(const std::vector& touches, Event *event); + void onTouchesBegan(const std::vector& touches, Event *event) override; + void onTouchesMoved(const std::vector& touches, Event *event) override; private: Vec2 _beginPos; Menu* _itemMenu; @@ -22,7 +22,7 @@ private: class GUIEditorTestScene : public TestScene { public: - virtual void onEnter(); + virtual void onEnter() override; virtual void runThisTest(); void BackCallback(Ref* pSender); }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h index c81f02a322..0292f85e7b 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h @@ -129,7 +129,7 @@ protected: class UILayoutComponentTest : public UIScene { public: - virtual bool init(); + virtual bool init() override; void touchEvent(Ref *pSender, Widget::TouchEventType type); protected: LayerColor* _baseLayer; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h index 1bbc51cea7..15497c6219 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h @@ -149,7 +149,7 @@ class UILayoutComponentTest_Editor : public UIScene_Editor public: UILayoutComponentTest_Editor(); ~UILayoutComponentTest_Editor(); - virtual bool init(); + virtual bool init() override; void configureGUIScene(); protected: UI_SCENE_EDITOR_CREATE_FUNC(UILayoutComponentTest_Editor) diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h index 79428689b4..9a71e3f8b0 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h @@ -112,7 +112,7 @@ class UILoadingBarReloadTexture : public UIScene public: UILoadingBarReloadTexture(); ~UILoadingBarReloadTexture(); - void update(float dt); + void update(float dt) override; bool init(); protected: diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h index 64a06105f9..fb97f017ba 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h @@ -10,7 +10,7 @@ class VideoPlayerTest : public UIScene public: UI_SCENE_CREATE_FUNC(VideoPlayerTest); - virtual bool init(); + virtual bool init() override; void menuCloseCallback(Ref* sender); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h index f759786599..e1b67da06b 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h @@ -36,7 +36,7 @@ public: virtual ~WebViewTest(); UI_SCENE_CREATE_FUNC(WebViewTest); - virtual bool init(); + virtual bool init() override; bool onWebViewShouldStartLoading(experimental::ui::WebView *sender, const std::string &url); void onWebViewDidFinishLoading(experimental::ui::WebView *sender, const std::string &url); void onWebViewDidFailLoading(experimental::ui::WebView *sender, const std::string &url); diff --git a/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h b/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h index e9598fa57e..e31b201e5a 100644 --- a/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h +++ b/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h @@ -9,9 +9,9 @@ class ZwoptexTest : public BaseTest public: virtual void onEnter() override; - void restartCallback(Ref* sender); - void nextCallback(Ref* sender); - void backCallback(Ref* sender); + void restartCallback(Ref* sender) override; + void nextCallback(Ref* sender) override; + void backCallback(Ref* sender) override; virtual std::string title() const override; virtual std::string subtitle() const override; diff --git a/tests/lua-tests/project/Classes/lua_test_bindings.cpp b/tests/lua-tests/project/Classes/lua_test_bindings.cpp index 2a014fb2da..413898cdce 100644 --- a/tests/lua-tests/project/Classes/lua_test_bindings.cpp +++ b/tests/lua-tests/project/Classes/lua_test_bindings.cpp @@ -59,7 +59,7 @@ public: CC_CONSTRUCTOR_ACCESS: DrawNode3D(); virtual ~DrawNode3D(); - virtual bool init(); + virtual bool init() override; protected: struct V3F_C4B