mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 07:34:45 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -172,15 +172,15 @@ class GuiBitmapButtonCtrl : public GuiButtonCtrl
|
|||
void setBitmapHandles( GFXTexHandle normal, GFXTexHandle highlighted, GFXTexHandle depressed, GFXTexHandle inactive );
|
||||
|
||||
//Parent methods
|
||||
virtual bool onWake();
|
||||
virtual void onSleep();
|
||||
virtual void onAction();
|
||||
virtual void inspectPostApply();
|
||||
bool onWake() override;
|
||||
void onSleep() override;
|
||||
void onAction() override;
|
||||
void inspectPostApply() override;
|
||||
|
||||
virtual void onRender(Point2I offset, const RectI &updateRect);
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
|
||||
static void initPersistFields();
|
||||
bool pointInControl(const Point2I& parentCoordPoint);
|
||||
bool pointInControl(const Point2I& parentCoordPoint) override;
|
||||
|
||||
DECLARE_CONOBJECT(GuiBitmapButtonCtrl);
|
||||
DECLARE_DESCRIPTION( "A button control rendered entirely from bitmaps.\n"
|
||||
|
|
@ -207,7 +207,7 @@ class GuiBitmapButtonTextCtrl : public GuiBitmapButtonCtrl
|
|||
|
||||
protected:
|
||||
|
||||
virtual void renderButton( GFXTexHandle &texture, const Point2I& offset, const RectI& updateRect );
|
||||
void renderButton( GFXTexHandle &texture, const Point2I& offset, const RectI& updateRect ) override;
|
||||
|
||||
public:
|
||||
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ protected:
|
|||
public:
|
||||
|
||||
GuiButtonBaseCtrl();
|
||||
bool onWake();
|
||||
bool onWake() override;
|
||||
|
||||
DECLARE_CONOBJECT(GuiButtonBaseCtrl);
|
||||
DECLARE_CATEGORY("Gui Buttons");
|
||||
|
|
@ -101,25 +101,25 @@ public:
|
|||
void setHighlighted(bool highlighted);
|
||||
bool isHighlighted() { return mHighlighted; }
|
||||
|
||||
void acceleratorKeyPress(U32 index);
|
||||
void acceleratorKeyRelease(U32 index);
|
||||
void acceleratorKeyPress(U32 index) override;
|
||||
void acceleratorKeyRelease(U32 index) override;
|
||||
|
||||
void onMouseDown(const GuiEvent&);
|
||||
void onMouseUp(const GuiEvent&);
|
||||
void onMouseDragged(const GuiEvent& event);
|
||||
void onRightMouseUp(const GuiEvent&);
|
||||
void onMouseDown(const GuiEvent&) override;
|
||||
void onMouseUp(const GuiEvent&) override;
|
||||
void onMouseDragged(const GuiEvent& event) override;
|
||||
void onRightMouseUp(const GuiEvent&) override;
|
||||
|
||||
void onMouseEnter(const GuiEvent&);
|
||||
void onMouseLeave(const GuiEvent&);
|
||||
void onMouseEnter(const GuiEvent&) override;
|
||||
void onMouseLeave(const GuiEvent&) override;
|
||||
|
||||
bool onKeyDown(const GuiEvent& event);
|
||||
bool onKeyUp(const GuiEvent& event);
|
||||
bool onKeyDown(const GuiEvent& event) override;
|
||||
bool onKeyUp(const GuiEvent& event) override;
|
||||
|
||||
void setScriptValue(const char* value);
|
||||
const char* getScriptValue();
|
||||
void setScriptValue(const char* value) override;
|
||||
const char* getScriptValue() override;
|
||||
|
||||
void onMessage(GuiControl*, S32 msg);
|
||||
void onAction();
|
||||
void onMessage(GuiControl*, S32 msg) override;
|
||||
void onAction() override;
|
||||
|
||||
bool usesMouseEvents() const { return mUseMouseEvents; }
|
||||
void setUseMouseEvents(bool val) { mUseMouseEvents = val; }
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ protected:
|
|||
public:
|
||||
DECLARE_CONOBJECT(GuiButtonCtrl);
|
||||
GuiButtonCtrl();
|
||||
bool onWake();
|
||||
void onRender(Point2I offset, const RectI &updateRect);
|
||||
bool onWake() override;
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
};
|
||||
|
||||
#endif //_GUI_BUTTON_CTRL_H
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ class GuiCheckBoxCtrl : public GuiButtonBaseCtrl
|
|||
S32 getIndent() const { return mIndent; }
|
||||
void setIndent( S32 value ) { mIndent = value; }
|
||||
|
||||
void onRender( Point2I offset, const RectI &updateRect );
|
||||
bool onWake();
|
||||
void onRender( Point2I offset, const RectI &updateRect ) override;
|
||||
bool onWake() override;
|
||||
|
||||
void autoSize();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue