Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds override for override functions (onEnter, onExit) in cpp-tests.

This commit is contained in:
James Chen 2014-02-27 21:10:03 +08:00
parent 2d0032c825
commit a96f44f31d
46 changed files with 292 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCTransition.h
View File

@ -570,12 +570,12 @@ public:
* @js NA
* @lua NA
*/
virtual void onEnter();
virtual void onEnter() override;
/**
* @js NA
* @lua NA
*/
virtual void onExit();
virtual void onExit() override;
protected:
TransitionFade();

2
cocos/gui/UITextField.h
View File

@ -41,7 +41,7 @@ public:
UICCTextField();
~UICCTextField();
virtual void onEnter();
virtual void onEnter() override;
// static
static UICCTextField* create(const char *placeholder, const char *fontName, float fontSize);

10
tests/Classes/ActionManagerTest/ActionManagerTest.h
View File

@ -26,7 +26,7 @@ class CrashTest : public ActionManagerTest
{
public:
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
void removeThis();
};
@ -34,7 +34,7 @@ class LogicTest : public ActionManagerTest
{
public:
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
void bugMe(Node* node);
};
@ -42,7 +42,7 @@ class PauseTest : public ActionManagerTest
{
public:
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
void unpause(float dt);
};
@ -50,7 +50,7 @@ class RemoveTest : public ActionManagerTest
{
public:
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
void stopAction();
};
@ -58,7 +58,7 @@ class ResumeTest : public ActionManagerTest
{
public:
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
void resumeGrossini(float time);
};

2
tests/Classes/ActionsEaseTest/ActionsEaseTest.h
View File

@ -46,7 +46,7 @@ public:
~EaseSpriteDemo(void);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
void centerSprites(unsigned int numberOfSprites);

16
tests/Classes/ActionsProgressTest/ActionsProgressTest.h
View File

@ -37,7 +37,7 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
@ -47,49 +47,49 @@ public:
class SpriteProgressToRadial : public SpriteDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteProgressToHorizontal : public SpriteDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteProgressToVertical : public SpriteDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteProgressToRadialMidpointChanged : public SpriteDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteProgressBarVarious : public SpriteDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteProgressBarTintAndFade : public SpriteDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class SpriteProgressWithSpriteFrame : public SpriteDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};

6
tests/Classes/ActionsTest/ActionsTest.h
View File

@ -50,7 +50,7 @@ protected:
Sprite* _kathia;
public:
virtual void onEnter() override;
virtual void onExit();
virtual void onExit() override;
void centerSprites(unsigned int numberOfSprites);
void alignSpritesLeft(unsigned int numberOfSprites);
@ -194,7 +194,7 @@ public:
CREATE_FUNC(ActionAnimate);
virtual void onEnter() override;
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -491,7 +491,7 @@ public:
CREATE_FUNC(Issue1305);
virtual void onEnter() override;
virtual void onExit();
virtual void onExit() override;
void log(Node* sender);
void addSprite(float dt);
virtual std::string title() const override;

2
tests/Classes/BugsTest/Bug-1159.h
View File

@ -7,7 +7,7 @@ class Bug1159Layer : public BugsTestBaseLayer
{
public:
virtual bool init();
virtual void onExit();
virtual void onExit() override;
static Scene* scene();
void callBack(Ref* sender);

4
tests/Classes/BugsTest/BugsTest.h
View File

@ -6,7 +6,7 @@
class BugsTestMainLayer : public Layer
{
public:
virtual void onEnter();
virtual void onEnter() override;
void onTouchesBegan(const std::vector<Touch*>& touches, Event *event);
void onTouchesMoved(const std::vector<Touch*>&touches, Event *event);
@ -19,7 +19,7 @@ protected:
class BugsTestBaseLayer : public Layer
{
public:
virtual void onEnter();
virtual void onEnter() override;
void backCallback(Ref* sender);
};

2
tests/Classes/CocosDenshionTest/CocosDenshionTest.h
View File

@ -11,7 +11,7 @@ public:
CocosDenshionTest(void);
~CocosDenshionTest(void);
virtual void onExit();
virtual void onExit() override;
private:
void addButtons();

14
tests/Classes/ConfigurationTest/ConfigurationTest.h
View File

@ -21,8 +21,8 @@ class ConfigurationBase : public BaseTest
protected:
public:
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -37,7 +37,7 @@ class ConfigurationLoadConfig : public ConfigurationBase
public:
CREATE_FUNC(ConfigurationLoadConfig);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
@ -46,7 +46,7 @@ class ConfigurationQuery : public ConfigurationBase
public:
CREATE_FUNC(ConfigurationQuery);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
@ -55,7 +55,7 @@ class ConfigurationInvalid : public ConfigurationBase
public:
CREATE_FUNC(ConfigurationInvalid);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
@ -64,7 +64,7 @@ class ConfigurationDefault : public ConfigurationBase
public:
CREATE_FUNC(ConfigurationDefault);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
@ -73,7 +73,7 @@ class ConfigurationSet : public ConfigurationBase
public:
CREATE_FUNC(ConfigurationSet);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string subtitle() const override;
};

2
tests/Classes/DataVisitorTest/DataVisitorTest.h
View File

@ -10,7 +10,7 @@ class PrettyPrinterDemo : public Layer
public:
virtual std::string title() const;
virtual std::string subtitle() const;
virtual void onEnter();
virtual void onEnter() override;
void addSprite();
protected:
std::string _title;

2
tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h
View File

@ -17,7 +17,7 @@ public:
void backCallback(Ref* sender);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class DrawPrimitivesTest : public BaseLayer

16
tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h
View File

@ -17,7 +17,7 @@ protected:
Node* _target2;
public:
virtual void onEnter();
virtual void onEnter() override;
~EffectAdvanceTextLayer(void);
virtual std::string title() const override;
@ -31,43 +31,43 @@ public:
class Effect1 : public EffectAdvanceTextLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class Effect2 : public EffectAdvanceTextLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class Effect3 : public EffectAdvanceTextLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class Effect4 : public EffectAdvanceTextLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class Effect5 : public EffectAdvanceTextLayer
{
public:
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
};
class Issue631 : public EffectAdvanceTextLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};

2
tests/Classes/EffectsTest/EffectsTest.h
View File

@ -21,7 +21,7 @@ public:
void checkAnim(float dt);
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);

46
tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
View File

@ -73,7 +73,7 @@ protected:
class TestAsynchronousLoading : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void restartCallback(Ref* pSender);
@ -84,13 +84,13 @@ public:
class TestDirectLoading : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class TestCSWithSkeleton : public ArmatureTestLayer
{
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -98,7 +98,7 @@ class TestCSWithSkeleton : public ArmatureTestLayer
class TestDragonBones20 : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -108,7 +108,7 @@ class TestPerformance : public ArmatureTestLayer
public:
~TestPerformance();
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onIncrease(Ref* pSender);
@ -128,7 +128,7 @@ public:
class TestPerformanceBatchNode : public TestPerformance
{
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual void addArmatureToParent(cocostudio::Armature *armature);
virtual void removeArmatureFromParent(int tag);
@ -138,7 +138,7 @@ class TestPerformanceBatchNode : public TestPerformance
class TestChangeZorder : public ArmatureTestLayer
{
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
void changeZorder(float dt);
@ -150,7 +150,7 @@ class TestAnimationEvent : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
void animationEvent(cocostudio::Armature *armature, cocostudio::MovementEventType movementType, const std::string& movementID);
void callback1();
@ -163,7 +163,7 @@ public:
class TestFrameEvent : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
void onFrameEvent(cocostudio::Bone *bone, const std::string& evt, int originFrameIndex, int currentFrameIndex);
void checkAction(float dt);
@ -174,8 +174,8 @@ protected:
class TestUseMutiplePicture : public ArmatureTestLayer
{
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
void onTouchesEnded(const std::vector<Touch*>& touches, Event* event);
@ -186,8 +186,8 @@ class TestUseMutiplePicture : public ArmatureTestLayer
class TestParticleDisplay : public ArmatureTestLayer
{
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
void onTouchesEnded(const std::vector<Touch*>& touches, Event* event);
@ -208,8 +208,8 @@ class TestColliderDetector : public ArmatureTestLayer
public:
~TestColliderDetector();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual void draw();
virtual void update(float delta);
@ -238,8 +238,8 @@ class TestColliderDetector : public ArmatureTestLayer
public:
~TestColliderDetector();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual void update(float delta);
@ -267,7 +267,7 @@ class TestColliderDetector : public ArmatureTestLayer
public:
~TestColliderDetector();
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual void update(float delta);
virtual void draw();
@ -291,7 +291,7 @@ public:
class TestBoundingBox : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual void draw();
@ -306,15 +306,15 @@ protected:
class TestAnchorPoint : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class TestArmatureNesting : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
void onTouchesEnded(const std::vector<Touch*>& touches, Event* event);
@ -361,7 +361,7 @@ private:
class TestPlaySeveralMovement : public ArmatureTestLayer
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};

2
tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h
View File

@ -37,7 +37,7 @@ using namespace ui;
class CocosGUITestMainLayer : public Layer
{
public:
virtual void onEnter();
virtual void onEnter() override;
void onTouchesBegan(const std::vector<Touch*>& touches, Event *event);
void onTouchesMoved(const std::vector<Touch*>& touches, Event *event);

44
tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h
View File

@ -33,8 +33,8 @@ enum {
class SceneEditorTestLayer : public cocos2d::Layer
{
public:
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title();
virtual std::string subtitle();
@ -58,8 +58,8 @@ public:
~LoadSceneEdtiorFileTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
cocos2d::Node* createGameScene();
};
@ -71,8 +71,8 @@ public:
~SpriteComponentTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
cocos2d::Node* createGameScene();
};
@ -84,8 +84,8 @@ public:
~ArmatureComponentTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
cocos2d::Node* createGameScene();
};
@ -97,8 +97,8 @@ public:
~UIComponentTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
cocos2d::Node* createGameScene();
void touchEvent(cocos2d::Ref *pSender, cocos2d::ui::TouchEventType type);
private:
@ -112,8 +112,8 @@ public:
~TmxMapComponentTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
cocos2d::Node* createGameScene();
};
@ -125,8 +125,8 @@ public:
~ParticleComponentTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
cocos2d::Node* createGameScene();
};
@ -137,8 +137,8 @@ public:
~EffectComponentTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
cocos2d::Node* createGameScene();
void animationEvent(cocostudio::Armature *armature, cocostudio::MovementEventType movementType, const std::string& movementID);
private:
@ -152,8 +152,8 @@ public:
~BackgroundComponentTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
cocos2d::Node* createGameScene();
};
@ -164,8 +164,8 @@ public:
~AttributeComponentTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
bool initData();
cocos2d::Node* createGameScene();
private:
@ -179,8 +179,8 @@ public:
~TriggerTest();
virtual std::string title();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
// default implements are used to call script callback if exist
virtual bool onTouchBegan(Touch *touch, Event *unused_event);

2
tests/Classes/ExtensionsTest/ExtensionsTest.h
View File

@ -6,7 +6,7 @@
class ExtensionsMainLayer : public Layer
{
public:
virtual void onEnter();
virtual void onEnter() override;
void onTouchesBegan(const std::vector<Touch*>& touches, Event *event);
void onTouchesMoved(const std::vector<Touch*>& touches, Event *event);

30
tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h
View File

@ -38,7 +38,7 @@ public:
class S9SpriteTestDemo : public BaseTest
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual void restartCallback(Ref* sender);
virtual void nextCallback(Ref* sender);
@ -52,7 +52,7 @@ class S9BatchNodeBasic : public S9SpriteTestDemo
public:
CREATE_FUNC(S9BatchNodeBasic);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -65,7 +65,7 @@ class S9FrameNameSpriteSheet : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheet);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -78,7 +78,7 @@ class S9FrameNameSpriteSheetRotated : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheetRotated);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -91,7 +91,7 @@ class S9BatchNodeScaledNoInsets : public S9SpriteTestDemo
public:
CREATE_FUNC(S9BatchNodeScaledNoInsets);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -104,7 +104,7 @@ class S9FrameNameSpriteSheetScaledNoInsets : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheetScaledNoInsets);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -117,7 +117,7 @@ class S9FrameNameSpriteSheetRotatedScaledNoInsets : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheetRotatedScaledNoInsets);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -131,7 +131,7 @@ class S9BatchNodeScaleWithCapInsets : public S9SpriteTestDemo
public:
CREATE_FUNC(S9BatchNodeScaleWithCapInsets);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -144,7 +144,7 @@ class S9FrameNameSpriteSheetInsets : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheetInsets);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -157,7 +157,7 @@ class S9FrameNameSpriteSheetInsetsScaled : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheetInsetsScaled);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -170,7 +170,7 @@ class S9FrameNameSpriteSheetRotatedInsets : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheetRotatedInsets);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -183,7 +183,7 @@ class S9_TexturePacker : public S9SpriteTestDemo
public:
CREATE_FUNC(S9_TexturePacker);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -196,7 +196,7 @@ class S9FrameNameSpriteSheetRotatedInsetsScaled : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheetRotatedInsetsScaled);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -209,7 +209,7 @@ class S9FrameNameSpriteSheetRotatedSetCapInsetLater : public S9SpriteTestDemo
public:
CREATE_FUNC(S9FrameNameSpriteSheetRotatedSetCapInsetLater);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -222,7 +222,7 @@ class S9CascadeOpacityAndColor : public S9SpriteTestDemo
public:
CREATE_FUNC(S9CascadeOpacityAndColor);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;

22
tests/Classes/FileUtilsTest/FileUtilsTest.h
View File

@ -15,7 +15,7 @@ public:
class FileUtilsDemo : public BaseTest
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
void backCallback(Ref* sender);
@ -28,8 +28,8 @@ class TestResolutionDirectories : public FileUtilsDemo
public:
CREATE_FUNC(TestResolutionDirectories);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
private:
@ -42,8 +42,8 @@ class TestSearchPath : public FileUtilsDemo
public:
CREATE_FUNC(TestSearchPath);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
private:
@ -56,8 +56,8 @@ class TestFilenameLookup : public FileUtilsDemo
public:
CREATE_FUNC(TestFilenameLookup);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -67,8 +67,8 @@ class TestIsFileExist : public FileUtilsDemo
public:
CREATE_FUNC(TestIsFileExist);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -78,8 +78,8 @@ class TextWritePlist : public FileUtilsDemo
public:
CREATE_FUNC(TextWritePlist);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};

4
tests/Classes/LabelTest/LabelTest.h
View File

@ -17,7 +17,7 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
@ -429,7 +429,7 @@ class LabelBMFontCrashTest : public AtlasDemo
public:
CREATE_FUNC(LabelBMFontCrashTest);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};

2
tests/Classes/LabelTest/LabelTestNew.h
View File

@ -18,7 +18,7 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);

24
tests/Classes/LayerTest/LayerTest.h
View File

@ -16,7 +16,7 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
@ -27,7 +27,7 @@ class LayerTestCascadingOpacityA : public LayerTest
{
public:
CREATE_FUNC(LayerTestCascadingOpacityA);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -35,7 +35,7 @@ class LayerTestCascadingOpacityB : public LayerTest
{
public:
CREATE_FUNC(LayerTestCascadingOpacityB);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -43,7 +43,7 @@ class LayerTestCascadingOpacityC : public LayerTest
{
public:
CREATE_FUNC(LayerTestCascadingOpacityC);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -51,7 +51,7 @@ class LayerTestCascadingColorA : public LayerTest
{
public:
CREATE_FUNC(LayerTestCascadingColorA);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -59,7 +59,7 @@ class LayerTestCascadingColorB : public LayerTest
{
public:
CREATE_FUNC(LayerTestCascadingColorB);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -67,7 +67,7 @@ class LayerTestCascadingColorC : public LayerTest
{
public:
CREATE_FUNC(LayerTestCascadingColorC);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -77,7 +77,7 @@ class LayerTest1 : public LayerTest
public:
CREATE_FUNC(LayerTest1);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
void updateSize(Point &touchLocation);
@ -91,7 +91,7 @@ class LayerTest2 : public LayerTest
{
public:
CREATE_FUNC(LayerTest2);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -139,7 +139,7 @@ class LayerIgnoreAnchorPointPos : public LayerTest
{
public:
CREATE_FUNC(LayerIgnoreAnchorPointPos);
virtual void onEnter();
virtual void onEnter() override;
void onToggle(Ref* pObject);
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -149,7 +149,7 @@ class LayerIgnoreAnchorPointRot : public LayerTest
{
public:
CREATE_FUNC(LayerIgnoreAnchorPointRot);
virtual void onEnter();
virtual void onEnter() override;
void onToggle(Ref* pObject);
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -159,7 +159,7 @@ class LayerIgnoreAnchorPointScale : public LayerTest
{
public:
CREATE_FUNC(LayerIgnoreAnchorPointScale);
virtual void onEnter();
virtual void onEnter() override;
void onToggle(Ref* pObject);
virtual std::string title() const override;
virtual std::string subtitle() const override;

8
tests/Classes/MotionStreakTest/MotionStreakTest.h
View File

@ -15,7 +15,7 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
@ -33,7 +33,7 @@ protected:
public:
CREATE_FUNC(MotionStreakTest1);
virtual void onEnter();
virtual void onEnter() override;
void onUpdate(float delta);
virtual std::string title() const override;
};
@ -46,7 +46,7 @@ protected:
public:
CREATE_FUNC(MotionStreakTest2);
virtual void onEnter();
virtual void onEnter() override;
void onTouchesMoved(const std::vector<Touch*>& touches, Event* event);
virtual std::string title() const override;
};
@ -58,7 +58,7 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
virtual void update(float dt);
private:
Point _center;

6
tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
View File

@ -35,7 +35,7 @@ class TouchableSpriteTest : public EventDispatcherTestDemo
{
public:
CREATE_FUNC(TouchableSpriteTest);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -44,7 +44,7 @@ class FixedPriorityTest : public EventDispatcherTestDemo
{
public:
CREATE_FUNC(FixedPriorityTest);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -53,7 +53,7 @@ class RemoveListenerWhenDispatching : public EventDispatcherTestDemo
{
public:
CREATE_FUNC(RemoveListenerWhenDispatching);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};

2
tests/Classes/NewRendererTest/NewRendererTest.h
View File

@ -27,7 +27,7 @@ public:
CREATE_FUNC(MultiSceneTest);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);

4
tests/Classes/NodeTest/NodeTest.h
View File

@ -36,7 +36,7 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
@ -51,7 +51,7 @@ class Test2 : public TestCocosNodeDemo
{
public:
CREATE_FUNC(Test2);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};

2
tests/Classes/ParallaxTest/ParallaxTest.h
View File

@ -14,7 +14,7 @@ public:
~ParallaxDemo(void);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);

40
tests/Classes/ParticleTest/ParticleTest.h
View File

@ -44,112 +44,112 @@ public:
class DemoFirework : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoFire : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoSun : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoGalaxy : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoFlower : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoBigFlower : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoRotFlower : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoMeteor : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoSpiral : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoExplosion : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoSmoke : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoSnow : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoRain : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoModernArt : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class DemoRing : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class ParallaxParticle : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
@ -161,7 +161,7 @@ public:
{
_title = file;
}
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override
{
return _title;
@ -171,21 +171,21 @@ public:
class RadiusMode1 : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class RadiusMode2 : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
};
class Issue704 : public ParticleDemo
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};

2
tests/Classes/PerformanceTest/PerformanceScenarioTest.h
View File

@ -13,7 +13,7 @@ public:
virtual void showCurrentTest();
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const;
virtual std::string subtitle() const;
virtual void performTests() = 0;

4
tests/Classes/PerformanceTest/PerformanceSpriteTest.h
View File

@ -76,8 +76,8 @@ public:
int getSubTestNum() { return subtestNumber; }
int getNodesNum() { return quantityNodes; }
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
void updateAutoTest(float dt);
void onAutoTest(Ref* sender);

2
tests/Classes/PerformanceTest/PerformanceTest.h
View File

@ -6,7 +6,7 @@
class PerformanceMainLayer : public Layer
{
public:
virtual void onEnter();
virtual void onEnter() override;
bool onTouchBegan(Touch* touches, Event *event);
void onTouchMoved(Touch* touches, Event *event);

2
tests/Classes/PerformanceTest/PerformanceTextureTest.h
View File

@ -13,7 +13,7 @@ public:
virtual void showCurrentTest();
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const;
virtual std::string subtitle() const;
virtual void performTests() = 0;

2
tests/Classes/RenderTextureTest/RenderTextureTest.h
View File

@ -9,7 +9,7 @@
class RenderTextureTest : public BaseTest
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;

6
tests/Classes/RotateWorldTest/RotateWorldTest.h
View File

@ -12,14 +12,14 @@ public:
class SpriteLayer : public Layer
{
public:
virtual void onEnter();
virtual void onEnter() override;
CREATE_FUNC(SpriteLayer)
};
class TestLayer : public Layer
{
public:
virtual void onEnter();
virtual void onEnter() override;
CREATE_FUNC(TestLayer)
};
@ -27,7 +27,7 @@ public:
class RotateWorldMainLayer : public Layer
{
public:
virtual void onEnter();
virtual void onEnter() override;
CREATE_FUNC(RotateWorldMainLayer)
};

4
tests/Classes/SceneTest/SceneTest.h
View File

@ -10,8 +10,8 @@ public:
SceneTestLayer1();
~SceneTestLayer1();
virtual void onEnter();
virtual void onEnterTransitionDidFinish();
virtual void onEnter() override;
virtual void onEnterTransitionDidFinish() override;
void testDealloc(float dt);
void onPushScene(Ref* sender);

45
tests/Classes/SchedulerTest/SchedulerTest.h
View File

@ -11,7 +11,7 @@ USING_NS_CC_EXT;
class SchedulerTestLayer : public BaseTest
{
public:
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -21,23 +21,12 @@ public:
void restartCallback(Ref* sender);
};
// class SchedulerTestLayer : Layer
// {
// }
// -(String*) title;
// -(String*) subtitle;
//
// -(void) backCallback:(id) sender;
// -(void) nextCallback:(id) sender;
// -(void) restartCallback:(id) sender;
//
class SchedulerAutoremove : public SchedulerTestLayer
{
public:
CREATE_FUNC(SchedulerAutoremove);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -52,7 +41,7 @@ class SchedulerPauseResume : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerPauseResume);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -68,8 +57,8 @@ public:
SchedulerPauseResumeAll();
virtual ~SchedulerPauseResumeAll();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual void update(float delta);
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -89,8 +78,8 @@ public:
SchedulerPauseResumeAllUser();
virtual ~SchedulerPauseResumeAllUser();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -107,7 +96,7 @@ class SchedulerUnscheduleAll : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerUnscheduleAll);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -123,8 +112,8 @@ class SchedulerUnscheduleAllHard : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerUnscheduleAllHard);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -142,7 +131,7 @@ class SchedulerUnscheduleAllUserLevel : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerUnscheduleAllUserLevel);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -158,7 +147,7 @@ class SchedulerSchedulesAndRemove : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerSchedulesAndRemove);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -174,7 +163,7 @@ class SchedulerUpdate : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerUpdate);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -186,7 +175,7 @@ class SchedulerUpdateAndCustom : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerUpdateAndCustom);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -200,7 +189,7 @@ class SchedulerUpdateFromCustom : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerUpdateFromCustom);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -227,7 +216,7 @@ class RescheduleSelector : public SchedulerTestLayer
public:
CREATE_FUNC(RescheduleSelector);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -242,7 +231,7 @@ class SchedulerDelayAndRepeat : public SchedulerTestLayer
public:
CREATE_FUNC(SchedulerDelayAndRepeat);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
void update(float dt);

46
tests/Classes/SpriteTest/SpriteTest.h
View File

@ -176,8 +176,8 @@ class SpriteZVertex: public SpriteTestDemo
public:
CREATE_FUNC(SpriteZVertex);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
SpriteZVertex();
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -192,8 +192,8 @@ class SpriteBatchNodeZVertex: public SpriteTestDemo
public:
CREATE_FUNC(SpriteBatchNodeZVertex);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
SpriteBatchNodeZVertex();
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -258,8 +258,8 @@ class SpriteAliased : public SpriteTestDemo
public:
CREATE_FUNC(SpriteAliased);
SpriteAliased();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -269,8 +269,8 @@ class SpriteBatchNodeAliased : public SpriteTestDemo
public:
CREATE_FUNC(SpriteBatchNodeAliased);
SpriteBatchNodeAliased();
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -312,8 +312,8 @@ class SpriteFrameTest: public SpriteTestDemo
{
public:
CREATE_FUNC(SpriteFrameTest);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
@ -331,8 +331,8 @@ class SpriteFrameAliasNameTest : public SpriteTestDemo
public:
CREATE_FUNC(SpriteFrameAliasNameTest);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -343,7 +343,7 @@ public:
CREATE_FUNC(SpriteOffsetAnchorRotation);
SpriteOffsetAnchorRotation();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -353,7 +353,7 @@ class SpriteBatchNodeOffsetAnchorRotation: public SpriteTestDemo
public:
CREATE_FUNC(SpriteBatchNodeOffsetAnchorRotation);
SpriteBatchNodeOffsetAnchorRotation();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -363,7 +363,7 @@ class SpriteOffsetAnchorScale: public SpriteTestDemo
public:
CREATE_FUNC(SpriteOffsetAnchorScale);
SpriteOffsetAnchorScale();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -373,7 +373,7 @@ class SpriteBatchNodeOffsetAnchorScale: public SpriteTestDemo
public:
CREATE_FUNC(SpriteBatchNodeOffsetAnchorScale);
SpriteBatchNodeOffsetAnchorScale();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -483,7 +483,7 @@ class SpriteAnimationSplit : public SpriteTestDemo
public:
CREATE_FUNC(SpriteAnimationSplit);
SpriteAnimationSplit();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
};
@ -495,7 +495,7 @@ public:
SpriteHybrid();
void reparentSprite(float dt);
virtual std::string title() const override;
virtual void onExit();
virtual void onExit() override;
protected:
bool _usingSpriteBatchNode;
@ -506,7 +506,7 @@ class SpriteBatchNodeChildren: public SpriteTestDemo
public:
CREATE_FUNC(SpriteBatchNodeChildren);
SpriteBatchNodeChildren();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
};
@ -515,7 +515,7 @@ class SpriteBatchNodeChildrenZ : public SpriteTestDemo
public:
CREATE_FUNC(SpriteBatchNodeChildrenZ);
SpriteBatchNodeChildrenZ();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
};
@ -524,7 +524,7 @@ class SpriteChildrenVisibility: public SpriteTestDemo
public:
CREATE_FUNC(SpriteChildrenVisibility);
SpriteChildrenVisibility();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
};
@ -543,7 +543,7 @@ class SpriteChildrenAnchorPoint: public SpriteTestDemo
public:
CREATE_FUNC(SpriteChildrenAnchorPoint);
SpriteChildrenAnchorPoint();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -553,7 +553,7 @@ class SpriteBatchNodeChildrenAnchorPoint: public SpriteTestDemo
public:
CREATE_FUNC(SpriteBatchNodeChildrenAnchorPoint);
SpriteBatchNodeChildrenAnchorPoint();
virtual void onExit();
virtual void onExit() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};

8
tests/Classes/TextInputTest/TextInputTest.h
View File

@ -22,7 +22,7 @@ public:
virtual std::string title() const;
void addKeyboardNotificationLayer(KeyboardNotificationLayer * layer);
virtual void onEnter();
virtual void onEnter() override;
};
//////////////////////////////////////////////////////////////////////////
@ -60,7 +60,7 @@ public:
virtual void onClickTrackNode(bool bClicked);
// Layer
virtual void onEnter();
virtual void onEnter() override;
};
//////////////////////////////////////////////////////////////////////////
@ -82,8 +82,8 @@ public:
virtual void onClickTrackNode(bool bClicked);
// Layer
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
// TextFieldDelegate
virtual bool onTextFieldAttachWithIME(TextFieldTTF * sender);

110
tests/Classes/Texture2dTest/Texture2dTest.h
View File

@ -37,7 +37,7 @@ public:
virtual ~TextureDemo();
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
@ -49,7 +49,7 @@ class TextureTIFF : public TextureDemo
public:
CREATE_FUNC(TextureTIFF);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
@ -58,7 +58,7 @@ class TextureTGA : public TextureDemo
public:
CREATE_FUNC(TextureTGA);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePNG : public TextureDemo
@ -66,7 +66,7 @@ class TexturePNG : public TextureDemo
public:
CREATE_FUNC(TexturePNG);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureJPEG : public TextureDemo
@ -74,7 +74,7 @@ class TextureJPEG : public TextureDemo
public:
CREATE_FUNC(TextureJPEG);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureWEBP : public TextureDemo
@ -82,7 +82,7 @@ class TextureWEBP : public TextureDemo
public:
CREATE_FUNC(TextureWEBP);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureMipMap : public TextureDemo
@ -91,7 +91,7 @@ public:
CREATE_FUNC(TextureMipMap);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRTest : public TextureDemo
@ -99,7 +99,7 @@ class TexturePVRTest : public TextureDemo
public:
CREATE_FUNC(TexturePVRTest);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVR2BPP : public TextureDemo
@ -107,7 +107,7 @@ class TexturePVR2BPP : public TextureDemo
public:
CREATE_FUNC(TexturePVR2BPP);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVR4BPP : public TextureDemo
@ -115,7 +115,7 @@ class TexturePVR4BPP : public TextureDemo
public:
CREATE_FUNC(TexturePVR4BPP);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGBA8888 : public TextureDemo
@ -123,7 +123,7 @@ class TexturePVRRGBA8888 : public TextureDemo
public:
CREATE_FUNC(TexturePVRRGBA8888);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRBGRA8888 : public TextureDemo
@ -131,7 +131,7 @@ class TexturePVRBGRA8888 : public TextureDemo
public:
CREATE_FUNC(TexturePVRBGRA8888);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGBA4444 : public TextureDemo
@ -139,7 +139,7 @@ class TexturePVRRGBA4444 : public TextureDemo
public:
CREATE_FUNC(TexturePVRRGBA4444);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGBA4444GZ : public TextureDemo
@ -148,7 +148,7 @@ public:
CREATE_FUNC(TexturePVRRGBA4444GZ);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGBA4444CCZ : public TextureDemo
@ -157,7 +157,7 @@ public:
CREATE_FUNC(TexturePVRRGBA4444CCZ);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGBA5551 : public TextureDemo
@ -165,7 +165,7 @@ class TexturePVRRGBA5551 : public TextureDemo
public:
CREATE_FUNC(TexturePVRRGBA5551);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGB565 : public TextureDemo
@ -173,7 +173,7 @@ class TexturePVRRGB565 : public TextureDemo
public:
CREATE_FUNC(TexturePVRRGB565);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGB888 : public TextureDemo
@ -181,7 +181,7 @@ class TexturePVRRGB888 : public TextureDemo
public:
CREATE_FUNC(TexturePVRRGB888);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRA8 : public TextureDemo
@ -189,7 +189,7 @@ class TexturePVRA8 : public TextureDemo
public:
CREATE_FUNC(TexturePVRA8);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRI8 : public TextureDemo
@ -197,7 +197,7 @@ class TexturePVRI8 : public TextureDemo
public:
CREATE_FUNC(TexturePVRI8);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRAI88 : public TextureDemo
@ -205,7 +205,7 @@ class TexturePVRAI88 : public TextureDemo
public:
CREATE_FUNC(TexturePVRAI88);
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVR2BPPv3 : public TextureDemo
@ -214,7 +214,7 @@ public:
CREATE_FUNC(TexturePVR2BPPv3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRII2BPPv3 : public TextureDemo
@ -223,7 +223,7 @@ public:
CREATE_FUNC(TexturePVRII2BPPv3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVR4BPPv3 : public TextureDemo
@ -232,7 +232,7 @@ public:
CREATE_FUNC(TexturePVR4BPPv3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRII4BPPv3 : public TextureDemo
@ -241,7 +241,7 @@ public:
CREATE_FUNC(TexturePVRII4BPPv3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGBA8888v3 : public TextureDemo
@ -250,7 +250,7 @@ public:
CREATE_FUNC(TexturePVRRGBA8888v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRBGRA8888v3 : public TextureDemo
@ -259,7 +259,7 @@ public:
CREATE_FUNC(TexturePVRBGRA8888v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGBA4444v3 : public TextureDemo
@ -268,7 +268,7 @@ public:
CREATE_FUNC(TexturePVRRGBA4444v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGBA5551v3 : public TextureDemo
@ -277,7 +277,7 @@ public:
CREATE_FUNC(TexturePVRRGBA5551v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGB565v3 : public TextureDemo
@ -286,7 +286,7 @@ public:
CREATE_FUNC(TexturePVRRGB565v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRRGB888v3 : public TextureDemo
@ -295,7 +295,7 @@ public:
CREATE_FUNC(TexturePVRRGB888v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRA8v3 : public TextureDemo
@ -304,7 +304,7 @@ public:
CREATE_FUNC(TexturePVRA8v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRI8v3 : public TextureDemo
@ -313,7 +313,7 @@ public:
CREATE_FUNC(TexturePVRI8v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRAI88v3 : public TextureDemo
@ -322,7 +322,7 @@ public:
CREATE_FUNC(TexturePVRAI88v3);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRBadEncoding : public TextureDemo
@ -331,7 +331,7 @@ public:
CREATE_FUNC(TexturePVRBadEncoding);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRMipMap : public TextureDemo
@ -340,7 +340,7 @@ public:
CREATE_FUNC(TexturePVRMipMap);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRMipMap2 : public TextureDemo
@ -349,7 +349,7 @@ public:
CREATE_FUNC(TexturePVRMipMap2);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRNonSquare : public TextureDemo
@ -358,7 +358,7 @@ public:
CREATE_FUNC(TexturePVRNonSquare);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRNPOT4444 : public TextureDemo
@ -367,7 +367,7 @@ public:
CREATE_FUNC(TexturePVRNPOT4444);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePVRNPOT8888 : public TextureDemo
@ -376,7 +376,7 @@ public:
CREATE_FUNC(TexturePVRNPOT8888);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureAlias : public TextureDemo
@ -385,7 +385,7 @@ public:
CREATE_FUNC(TextureAlias);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TexturePixelFormat : public TextureDemo
@ -394,7 +394,7 @@ public:
CREATE_FUNC(TexturePixelFormat);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureBlend : public TextureDemo
@ -403,7 +403,7 @@ public:
CREATE_FUNC(TextureBlend);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureAsync : public TextureDemo
@ -415,7 +415,7 @@ public:
void imageLoaded(cocos2d::Texture2D* texture);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
private:
int _imageOffset;
};
@ -427,7 +427,7 @@ public:
virtual ~TextureGlRepeat();
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureGlClamp : public TextureDemo
@ -437,7 +437,7 @@ public:
virtual ~TextureGlClamp();
virtual std::string title() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureSizeTest : public TextureDemo
@ -446,7 +446,7 @@ public:
CREATE_FUNC(TextureSizeTest);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureCache1 : public TextureDemo
@ -455,7 +455,7 @@ public:
CREATE_FUNC(TextureCache1);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
};
class TextureDrawAtPoint : public TextureDemo
@ -465,7 +465,7 @@ public:
~TextureDrawAtPoint();
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
virtual void draw();
protected:
CustomCommand _renderCmd;
@ -481,7 +481,7 @@ public:
~TextureDrawInRect();
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
virtual void draw();
protected:
CustomCommand _renderCmd;
@ -501,7 +501,7 @@ class TextureMemoryAlloc : public TextureDemo
{
public:
CREATE_FUNC(TextureMemoryAlloc);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
void updateImage(Ref *sender);
@ -616,7 +616,7 @@ class TextureConvertRGB888 : public TextureDemo
{
public:
CREATE_FUNC(TextureConvertRGB888);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -626,7 +626,7 @@ class TextureConvertRGBA8888 : public TextureDemo
{
public:
CREATE_FUNC(TextureConvertRGBA8888);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -636,7 +636,7 @@ class TextureConvertI8 : public TextureDemo
{
public:
CREATE_FUNC(TextureConvertI8);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};
@ -646,7 +646,7 @@ class TextureConvertAI88 : public TextureDemo
{
public:
CREATE_FUNC(TextureConvertAI88);
virtual void onEnter();
virtual void onEnter() override;
virtual std::string title() const override;
virtual std::string subtitle() const override;
};

2
tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h
View File

@ -10,7 +10,7 @@ class TextureAtlasEncryptionDemo : public Layer
public:
virtual std::string title() const;
virtual std::string subtitle() const;
virtual void onEnter();
virtual void onEnter() override;
protected:
std::string _title;

14
tests/Classes/TileMapTest/TileMapTest.h
View File

@ -13,7 +13,7 @@ public:
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
@ -44,8 +44,8 @@ public:
TMXOrthoTest(void);
virtual std::string title() const override;
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
};
class TMXOrthoTest2 : public TileDemo
@ -198,8 +198,8 @@ public:
~TMXIsoVertexZ();
void repositionSprite(float dt);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
};
class TMXOrthoVertexZ : public TileDemo
@ -212,8 +212,8 @@ public:
~TMXOrthoVertexZ();
void repositionSprite(float dt);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
};
class TMXIsoMoveLayer : public TileDemo

4
tests/Classes/TouchesTest/Paddle.h
View File

@ -21,8 +21,8 @@ public:
Rect getRect();
bool initWithTexture(Texture2D* aTexture);
virtual void onEnter();
virtual void onExit();
virtual void onEnter() override;
virtual void onExit() override;
bool containsTouchLocation(Touch* touch);
bool onTouchBegan(Touch* touch, Event* event);
void onTouchMoved(Touch* touch, Event* event);

16
tests/Classes/TransitionsTest/TransitionsTest.h
View File

@ -48,10 +48,10 @@ public:
void step(float dt);
virtual void onEnter();
virtual void onEnterTransitionDidFinish();
virtual void onExitTransitionDidStart();
virtual void onExit();
virtual void onEnter() override;
virtual void onEnterTransitionDidFinish() override;
virtual void onExitTransitionDidStart() override;
virtual void onExit() override;
};
class TestLayer2 : public Layer
@ -66,10 +66,10 @@ public:
void step(float dt);
virtual void onEnter();
virtual void onEnterTransitionDidFinish();
virtual void onExitTransitionDidStart();
virtual void onExit();
virtual void onEnter() override;
virtual void onEnterTransitionDidFinish() override;
virtual void onExitTransitionDidStart() override;
virtual void onExit() override;
};
#endif

4
tests/Classes/ZwoptexTest/ZwoptexTest.h
View File

@ -7,7 +7,7 @@
class ZwoptexTest : public BaseTest
{
public:
virtual void onEnter();
virtual void onEnter() override;
void restartCallback(Ref* sender);
void nextCallback(Ref* sender);
@ -21,7 +21,7 @@ class ZwoptexGenericTest : public ZwoptexTest
{
public:
~ZwoptexGenericTest();
virtual void onEnter();
virtual void onEnter() override;
void flipSprites(float dt);
void startIn05Secs(float dt);

2
tests/Classes/testBasic.h
View File

@ -10,7 +10,7 @@ class TestScene : public Scene
{
public:
TestScene(bool bPortrait = false, bool physics = false);
virtual void onEnter();
virtual void onEnter() override;
virtual void runThisTest() = 0;
};