TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rest of virtuals removed

Browse source 
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:
marauder2k7 2024-03-18 18:40:22 +00:00
parent efbe5e90f5
commit 2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/gui/containers/guiAutoScrollCtrl.h
View file

@ -136,17 +136,17 @@ class GuiAutoScrollCtrl : public GuiTickCtrl
void reset();
virtual bool onWake();
virtual void onSleep();
bool onWake() override;
void onSleep() override;
virtual void onChildAdded( GuiControl* control );
virtual void onChildRemoved( GuiControl* control );
virtual bool resize( const Point2I& newPosition, const Point2I& newExtent );
virtual void childResized( GuiControl *child );
void onChildAdded( GuiControl* control ) override;
void onChildRemoved( GuiControl* control ) override;
bool resize( const Point2I& newPosition, const Point2I& newExtent ) override;
void childResized( GuiControl *child ) override;
virtual void processTick();
virtual void advanceTime( F32 timeDelta );
virtual void inspectPostApply();
void processTick() override;
void advanceTime( F32 timeDelta ) override;
void inspectPostApply() override;
static void initPersistFields();

14
Engine/source/gui/containers/guiCtrlArrayCtrl.h
View file

@ -47,18 +47,18 @@ private:
public:
GuiControlArrayControl();
bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
bool onWake();
void onSleep();
void inspectPostApply();
bool onWake() override;
void onSleep() override;
void inspectPostApply() override;
bool updateArray();
void addObject(SimObject *obj);
void removeObject(SimObject *obj);
void addObject(SimObject *obj) override;
void removeObject(SimObject *obj) override;
bool reOrder(SimObject* obj, SimObject* target = 0);
bool reOrder(SimObject* obj, SimObject* target = 0) override;
static void initPersistFields();
DECLARE_CONOBJECT(GuiControlArrayControl);

6
Engine/source/gui/containers/guiDragAndDropCtrl.h
View file

@ -72,9 +72,9 @@ class GuiDragAndDropControl : public GuiControl
void startDragging(Point2I offset = Point2I(0, 0));
// GuiControl.
virtual void onMouseDown(const GuiEvent& event);
virtual void onMouseDragged(const GuiEvent& event);
virtual void onMouseUp(const GuiEvent& event);
void onMouseDown(const GuiEvent& event) override;
void onMouseDragged(const GuiEvent& event) override;
void onMouseUp(const GuiEvent& event) override;
static void initPersistFields();

8
Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h
View file

@ -47,14 +47,14 @@ public:
static void initPersistFields();
// SimObject
void inspectPostApply();
void inspectPostApply() override;
// SimSet
void addObject(SimObject *obj);
void addObject(SimObject *obj) override;
// GuiControl
bool resize(const Point2I &newPosition, const Point2I &newExtent);
void childResized(GuiControl *child);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void childResized(GuiControl *child) override;
// GuiDynamicCtrlArrayCtrl
void refresh();

24
Engine/source/gui/containers/guiFormCtrl.h
View file

@ -95,21 +95,21 @@ public:
void setCaption( const char* caption ) { mCaption = caption; }
void setHasMenu( bool value );
bool resize(const Point2I &newPosition, const Point2I &newExtent);
void onRender(Point2I offset, const RectI &updateRect);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void onRender(Point2I offset, const RectI &updateRect) override;
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
virtual void addObject( SimObject *object );
virtual void removeObject( SimObject* object );
virtual bool acceptsAsChild( SimObject* object ) const;
void addObject( SimObject *object ) override;
void removeObject( SimObject* object ) override;
bool acceptsAsChild( SimObject* object ) const override;
void onMouseDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseMove(const GuiEvent &event);
void onMouseLeave(const GuiEvent &event);
void onMouseEnter(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseMove(const GuiEvent &event) override;
void onMouseLeave(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &event) override;
U32 getMenuBarID();

20
Engine/source/gui/containers/guiFrameCtrl.h
View file

@ -99,17 +99,17 @@ public:
GuiFrameSetCtrl(U32 columns, U32 rows, const U32 columnOffsets[] = NULL, const U32 rowOffsets[] = NULL);
virtual ~GuiFrameSetCtrl();
void addObject(SimObject *obj);
void removeObject(SimObject *obj);
void addObject(SimObject *obj) override;
void removeObject(SimObject *obj) override;
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
bool onAdd();
void onRender(Point2I offset, const RectI &updateRect );
bool onAdd() override;
void onRender(Point2I offset, const RectI &updateRect ) override;
protected:
/* member variables */
Vector<S32> mColumnOffsets;
@ -133,7 +133,7 @@ protected:
bool hitVerticalDivider(S32 x, const Point2I &point);
bool hitHorizontalDivider(S32 y, const Point2I &point);
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
void rebalance(const Point2I &newExtent);
void computeSizes(bool balanceFrames = false);
@ -159,7 +159,7 @@ public:
void balanceFrames() { computeSizes(true); }
void updateSizes() { computeSizes(); }
bool onWake();
bool onWake() override;
private:
GuiFrameSetCtrl(const GuiFrameSetCtrl &);

16
Engine/source/gui/containers/guiPaneCtrl.h
View file

@ -97,16 +97,16 @@ class GuiPaneControl : public GuiControl
virtual void setCaptionID(const char *id);
// GuiControl.
virtual bool onWake();
bool onWake() override;
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseMove(const GuiEvent &event);
virtual void onMouseLeave(const GuiEvent &event);
virtual void onMouseEnter(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseMove(const GuiEvent &event) override;
void onMouseLeave(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &event) override;
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
virtual void onRender(Point2I offset, const RectI &updateRect);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields();

4
Engine/source/gui/containers/guiPanel.h
View file

@ -52,8 +52,8 @@ public:
DECLARE_CONOBJECT(GuiPanel);
// GuiControl
void onRender(Point2I offset, const RectI &updateRect);
void setVisible(bool value) { Parent::setVisible(value); setUpdateLayout( updateParent ); }
void onRender(Point2I offset, const RectI &updateRect) override;
void setVisible(bool value) override { Parent::setVisible(value); setUpdateLayout( updateParent ); }
};
/// @}

22
Engine/source/gui/containers/guiSplitContainer.h
View file

@ -68,24 +68,24 @@ public:
// ConsoleObject
static void initPersistFields();
virtual bool onAdd();
bool onAdd() override;
// GuiControl
virtual bool onWake();
virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
virtual void onRender(Point2I offset, const RectI &updateRect);
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
bool onWake() override;
void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
void onRender(Point2I offset, const RectI &updateRect) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
virtual bool layoutControls( RectI &clientRect );
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
bool layoutControls( RectI &clientRect ) override;
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
virtual inline Point2I getSplitPoint() { return mSplitPoint; };
/// The Splitters entire Client Rectangle, this takes into account padding of this control
virtual inline RectI getSplitRect() { return mSplitRect; };
virtual void solvePanelConstraints(Point2I newDragPos, GuiContainer * firstPanel, GuiContainer * secondPanel, const RectI& clientRect);
virtual Point2I getMinExtent() const;
Point2I getMinExtent() const override;
//Set the positin of the split handler
void setSplitPoint(Point2I splitPoint);

36
Engine/source/gui/containers/guiTabBookCtrl.h
View file

@ -133,18 +133,18 @@ class GuiTabBookCtrl : public GuiContainer
/// @name Control Events
/// @{
bool onWake();
void onRender( Point2I offset, const RectI &updateRect );
bool onWake() override;
void onRender( Point2I offset, const RectI &updateRect ) override;
/// @}
/// @name Child events
/// @{
void onChildRemoved( GuiControl* child );
void onChildAdded( GuiControl *child );
bool reOrder(SimObject* obj, SimObject* target);
bool acceptsAsChild( SimObject* object ) const;
void onChildRemoved( GuiControl* child ) override;
void onChildAdded( GuiControl *child ) override;
bool reOrder(SimObject* obj, SimObject* target) override;
bool acceptsAsChild( SimObject* object ) const override;
/// @}
@ -203,7 +203,7 @@ class GuiTabBookCtrl : public GuiContainer
/// @{
/// Update ourselves by hooking common GuiControl functionality.
void setUpdate();
void setUpdate() override;
/// Balance a top/bottom tab row
void balanceRow( S32 row, S32 totalTabWidth );
@ -218,7 +218,7 @@ class GuiTabBookCtrl : public GuiContainer
void calculatePageTabs();
/// Get client area of tab book
virtual const RectI getClientRect();
const RectI getClientRect() override;
/// Find the tab that was hit by the current event, if any
/// @param event The GuiEvent that caused this function call
@ -240,7 +240,7 @@ class GuiTabBookCtrl : public GuiContainer
///
/// @param newPosition The new position of the control
/// @param newExtent The new extent of the control
bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
/// Called when a child page is resized
/// This method is overridden so that we may handle resizing of our child tab
@ -248,23 +248,23 @@ class GuiTabBookCtrl : public GuiContainer
/// This ensures we keep our sizing in sync when we our children are sized or moved.
///
/// @param child A pointer to the child control that has been resized
void childResized(GuiControl *child);
void childResized(GuiControl *child) override;
/// @}
virtual bool onKeyDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
/// @name Mouse Events
/// @{
virtual void onMouseDown( const GuiEvent &event );
virtual void onMouseUp( const GuiEvent &event );
virtual void onMouseDragged( const GuiEvent &event );
virtual void onMouseMove( const GuiEvent &event );
virtual void onMouseLeave( const GuiEvent &event );
virtual bool onMouseDownEditor( const GuiEvent &event, Point2I offset );
virtual void onRightMouseUp( const GuiEvent& event );
void onMouseDown( const GuiEvent &event ) override;
void onMouseUp( const GuiEvent &event ) override;
void onMouseDragged( const GuiEvent &event ) override;
void onMouseMove( const GuiEvent &event ) override;
void onMouseLeave( const GuiEvent &event ) override;
bool onMouseDownEditor( const GuiEvent &event, Point2I offset ) override;
void onRightMouseUp( const GuiEvent& event ) override;
/// @}
};

30
Engine/source/gui/containers/guiWindowCtrl.h
View file

@ -214,26 +214,26 @@ class GuiWindowCtrl : public GuiContainer
bool isMinimized(S32 &index);
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
void setFont(S32 fntTag);
void setCloseCommand(const char *newCmd);
GuiControl* findHitControl (const Point2I &pt, S32 initialLayer = -1 );
GuiControl* findHitControl (const Point2I &pt, S32 initialLayer = -1 ) override;
S32 findHitEdges( const Point2I &globalPoint );
void getSnappableWindows( Vector<GuiWindowCtrl*> &windowOutVector, bool canCollapse = false );
bool resize( const Point2I &newPosition, const Point2I &newExtent );
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
//only cycle tabs through the current window, so overwrite the method
GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true);
GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true);
GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true) override;
GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true) override;
S32 getTabIndex(void) { return mTabIndex; }
void selectWindow(void);
////
const RectI getClientRect();
const RectI getClientRect() override;
/// Mutators for window properties from code.
/// Using setDataField is a bit overkill.
@ -271,15 +271,15 @@ class GuiWindowCtrl : public GuiContainer
/// @}
// GuiContainer.
virtual bool onWake();
virtual void onSleep();
virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseMove(const GuiEvent &event);
virtual bool onKeyDown(const GuiEvent &event);
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onSleep() override;
void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseMove(const GuiEvent &event) override;
bool onKeyDown(const GuiEvent &event) override;
void onRender(Point2I offset, const RectI &updateRect) override;
DECLARE_CONOBJECT( GuiWindowCtrl );
DECLARE_DESCRIPTION( "A control that shows an independent window inside the canvas." );