mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-28 07:45:40 +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
|
|
@ -63,25 +63,25 @@ class GuiMeshRoadEditorCtrl : public EditTSCtrl
|
|||
DECLARE_CONOBJECT(GuiMeshRoadEditorCtrl);
|
||||
|
||||
// SimObject
|
||||
bool onAdd();
|
||||
bool onAdd() override;
|
||||
static void initPersistFields();
|
||||
|
||||
// GuiControl
|
||||
virtual void onSleep();
|
||||
void onSleep() override;
|
||||
|
||||
// EditTSCtrl
|
||||
bool onKeyDown(const GuiEvent& event);
|
||||
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
|
||||
void on3DMouseDown(const Gui3DMouseEvent & event);
|
||||
void on3DMouseUp(const Gui3DMouseEvent & event);
|
||||
void on3DMouseMove(const Gui3DMouseEvent & event);
|
||||
void on3DMouseDragged(const Gui3DMouseEvent & event);
|
||||
void on3DMouseEnter(const Gui3DMouseEvent & event);
|
||||
void on3DMouseLeave(const Gui3DMouseEvent & event);
|
||||
void on3DRightMouseDown(const Gui3DMouseEvent & event);
|
||||
void on3DRightMouseUp(const Gui3DMouseEvent & event);
|
||||
void updateGuiInfo();
|
||||
void renderScene(const RectI & updateRect);
|
||||
bool onKeyDown(const GuiEvent& event) override;
|
||||
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
|
||||
void on3DMouseDown(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseUp(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseMove(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseDragged(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseEnter(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseLeave(const Gui3DMouseEvent & event) override;
|
||||
void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
|
||||
void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
|
||||
void updateGuiInfo() override;
|
||||
void renderScene(const RectI & updateRect) override;
|
||||
|
||||
// GuiRiverEditorCtrl
|
||||
bool getStaticPos( const Gui3DMouseEvent & event, Point3F &tpos );
|
||||
|
|
@ -189,8 +189,8 @@ class GuiMeshRoadEditorUndoAction : public UndoAction
|
|||
SimObjectId mObjId;
|
||||
F32 mMetersPerSegment;
|
||||
|
||||
virtual void undo();
|
||||
virtual void redo() { undo(); }
|
||||
void undo() override;
|
||||
void redo() override { undo(); }
|
||||
};
|
||||
|
||||
#endif // _GUIMESHROADEDITORCTRL_H_
|
||||
|
|
|
|||
|
|
@ -68,26 +68,26 @@ class GuiRiverEditorCtrl : public EditTSCtrl
|
|||
DECLARE_CONOBJECT(GuiRiverEditorCtrl);
|
||||
|
||||
// SimObject
|
||||
bool onAdd();
|
||||
bool onAdd() override;
|
||||
static void initPersistFields();
|
||||
|
||||
// GuiControl
|
||||
virtual void onSleep();
|
||||
virtual void onRender(Point2I offset, const RectI &updateRect);
|
||||
void onSleep() override;
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
|
||||
// EditTSCtrl
|
||||
bool onKeyDown(const GuiEvent& event);
|
||||
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
|
||||
void on3DMouseDown(const Gui3DMouseEvent & event);
|
||||
void on3DMouseUp(const Gui3DMouseEvent & event);
|
||||
void on3DMouseMove(const Gui3DMouseEvent & event);
|
||||
void on3DMouseDragged(const Gui3DMouseEvent & event);
|
||||
void on3DMouseEnter(const Gui3DMouseEvent & event);
|
||||
void on3DMouseLeave(const Gui3DMouseEvent & event);
|
||||
void on3DRightMouseDown(const Gui3DMouseEvent & event);
|
||||
void on3DRightMouseUp(const Gui3DMouseEvent & event);
|
||||
void updateGuiInfo();
|
||||
void renderScene(const RectI & updateRect);
|
||||
bool onKeyDown(const GuiEvent& event) override;
|
||||
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
|
||||
void on3DMouseDown(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseUp(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseMove(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseDragged(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseEnter(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseLeave(const Gui3DMouseEvent & event) override;
|
||||
void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
|
||||
void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
|
||||
void updateGuiInfo() override;
|
||||
void renderScene(const RectI & updateRect) override;
|
||||
|
||||
// GuiRiverEditorCtrl
|
||||
bool getStaticPos( const Gui3DMouseEvent & event, Point3F &tpos );
|
||||
|
|
@ -195,8 +195,8 @@ class GuiRiverEditorUndoAction : public UndoAction
|
|||
F32 mMetersPerSegment;
|
||||
U32 mSegmentsPerBatch;
|
||||
|
||||
virtual void undo();
|
||||
virtual void redo() { undo(); }
|
||||
void undo() override;
|
||||
void redo() override { undo(); }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -59,27 +59,27 @@ class GuiRoadEditorCtrl : public EditTSCtrl
|
|||
DECLARE_CONOBJECT(GuiRoadEditorCtrl);
|
||||
|
||||
// SimObject
|
||||
bool onAdd();
|
||||
bool onAdd() override;
|
||||
static void initPersistFields();
|
||||
|
||||
// GuiControl
|
||||
virtual void onSleep();
|
||||
virtual void onRender(Point2I offset, const RectI &updateRect);
|
||||
void onSleep() override;
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
|
||||
// EditTSCtrl
|
||||
bool onKeyDown(const GuiEvent& event);
|
||||
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
|
||||
void on3DMouseDown(const Gui3DMouseEvent & event);
|
||||
void on3DMouseUp(const Gui3DMouseEvent & event);
|
||||
void on3DMouseMove(const Gui3DMouseEvent & event);
|
||||
void on3DMouseDragged(const Gui3DMouseEvent & event);
|
||||
void on3DMouseEnter(const Gui3DMouseEvent & event);
|
||||
void on3DMouseLeave(const Gui3DMouseEvent & event);
|
||||
void on3DRightMouseDown(const Gui3DMouseEvent & event);
|
||||
void on3DRightMouseUp(const Gui3DMouseEvent & event);
|
||||
void updateGuiInfo();
|
||||
void renderScene(const RectI & updateRect);
|
||||
void renderGui(Point2I offset, const RectI &updateRect);
|
||||
bool onKeyDown(const GuiEvent& event) override;
|
||||
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
|
||||
void on3DMouseDown(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseUp(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseMove(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseDragged(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseEnter(const Gui3DMouseEvent & event) override;
|
||||
void on3DMouseLeave(const Gui3DMouseEvent & event) override;
|
||||
void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
|
||||
void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
|
||||
void updateGuiInfo() override;
|
||||
void renderScene(const RectI & updateRect) override;
|
||||
void renderGui(Point2I offset, const RectI &updateRect) override;
|
||||
|
||||
bool getTerrainPos( const Gui3DMouseEvent & event, Point3F &tpos );
|
||||
void deleteSelectedNode();
|
||||
|
|
@ -165,8 +165,8 @@ class GuiRoadEditorUndoAction : public UndoAction
|
|||
U32 mSegmentsPerBatch;
|
||||
F32 mTextureLength;
|
||||
|
||||
virtual void undo();
|
||||
virtual void redo() { undo(); }
|
||||
void undo() override;
|
||||
void redo() override { undo(); }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue