mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 22:54:34 +00:00
rest of virtuals removed
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
This commit is contained in:
parent
efbe5e90f5
commit
2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
|
|
@ -32,12 +32,12 @@ public:
|
|||
static void initPersistFields();
|
||||
|
||||
//Parental methods
|
||||
bool onWake();
|
||||
void onSleep();
|
||||
bool onWake() override;
|
||||
void onSleep() override;
|
||||
|
||||
void setBitmap(const char *name);
|
||||
|
||||
void onRender(Point2I offset, const RectI &updateRect);
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
|
||||
void onImageChanged() {}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -69,12 +69,12 @@ class GuiFadeinBitmapCtrl : public GuiBitmapCtrl
|
|||
GuiFadeinBitmapCtrl();
|
||||
|
||||
// GuiControl.
|
||||
virtual void onPreRender();
|
||||
virtual void onMouseDown(const GuiEvent &);
|
||||
virtual bool onKeyDown(const GuiEvent &);
|
||||
virtual bool onGamepadButtonDown(const GuiEvent& event);
|
||||
virtual bool onWake();
|
||||
virtual void onRender(Point2I offset, const RectI &updateRect);
|
||||
void onPreRender() override;
|
||||
void onMouseDown(const GuiEvent &) override;
|
||||
bool onKeyDown(const GuiEvent &) override;
|
||||
bool onGamepadButtonDown(const GuiEvent& event) override;
|
||||
bool onWake() override;
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
|
|
|
|||
|
|
@ -53,21 +53,21 @@ public:
|
|||
doFadeIn = false;
|
||||
doFadeOut = false;
|
||||
}
|
||||
void onPreRender()
|
||||
void onPreRender() override
|
||||
{
|
||||
Parent::onPreRender();
|
||||
setUpdate();
|
||||
}
|
||||
void onMouseDown(const GuiEvent &)
|
||||
void onMouseDown(const GuiEvent &) override
|
||||
{
|
||||
Con::executef(this, "click");
|
||||
}
|
||||
bool onKeyDown(const GuiEvent &)
|
||||
bool onKeyDown(const GuiEvent &) override
|
||||
{
|
||||
Con::executef(this, "click");
|
||||
return true;
|
||||
}
|
||||
bool onWake()
|
||||
bool onWake() override
|
||||
{
|
||||
if(!Parent::onWake())
|
||||
return false;
|
||||
|
|
@ -91,7 +91,7 @@ public:
|
|||
done = false;
|
||||
}
|
||||
|
||||
void onRender(Point2I offset, const RectI &updateRect)
|
||||
void onRender(Point2I offset, const RectI &updateRect) override
|
||||
{
|
||||
U32 elapsed = Platform::getRealMilliseconds() - wakeTime;
|
||||
|
||||
|
|
|
|||
|
|
@ -63,17 +63,17 @@ class GuiMessageVectorCtrl : public GuiControl
|
|||
|
||||
// Gui control overrides
|
||||
protected:
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
bool onWake();
|
||||
void onSleep();
|
||||
void onRender(Point2I offset, const RectI &updateRect);
|
||||
void inspectPostApply();
|
||||
void parentResized(const RectI& oldParentRect, const RectI& newParentRect);
|
||||
bool onWake() override;
|
||||
void onSleep() override;
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
void inspectPostApply() override;
|
||||
void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override;
|
||||
|
||||
void onMouseUp(const GuiEvent &event);
|
||||
void onMouseDown(const GuiEvent &event);
|
||||
void onMouseUp(const GuiEvent &event) override;
|
||||
void onMouseDown(const GuiEvent &event) override;
|
||||
// void onMouseMove(const GuiEvent &event);
|
||||
|
||||
// Overrideables
|
||||
|
|
|
|||
|
|
@ -70,13 +70,13 @@ class GuiProgressBitmapCtrl : public GuiTextCtrl
|
|||
void setBitmap( const char* name );
|
||||
|
||||
//console related methods
|
||||
virtual const char *getScriptValue();
|
||||
virtual void setScriptValue(const char *value);
|
||||
const char *getScriptValue() override;
|
||||
void setScriptValue(const char *value) override;
|
||||
|
||||
// GuiTextCtrl.
|
||||
virtual void onPreRender();
|
||||
virtual void onRender( Point2I offset, const RectI &updateRect );
|
||||
virtual bool onWake();
|
||||
void onPreRender() override;
|
||||
void onRender( Point2I offset, const RectI &updateRect ) override;
|
||||
bool onWake() override;
|
||||
|
||||
DECLARE_CONOBJECT( GuiProgressBitmapCtrl );
|
||||
DECLARE_CATEGORY( "Gui Values" );
|
||||
|
|
|
|||
|
|
@ -48,11 +48,11 @@ public:
|
|||
GuiProgressCtrl();
|
||||
|
||||
//console related methods
|
||||
virtual const char *getScriptValue();
|
||||
virtual void setScriptValue(const char *value);
|
||||
const char *getScriptValue() override;
|
||||
void setScriptValue(const char *value) override;
|
||||
|
||||
void onPreRender();
|
||||
void onRender(Point2I offset, const RectI &updateRect);
|
||||
void onPreRender() override;
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue