TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 00:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtuals removed

Browse source 
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
marauder2k7 2024-03-18 18:13:00 +00:00
parent 88a43f3137
commit efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,21 +133,21 @@ class GuiContainer : public GuiControl
/// @name GuiControl Inherited
/// @{
virtual void onChildAdded(GuiControl* control);
virtual void onChildRemoved(GuiControl* control);
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
virtual void childResized(GuiControl *child);
virtual void addObject(SimObject *obj);
virtual void removeObject(SimObject *obj);
virtual bool reOrder(SimObject* obj, SimObject* target);
virtual void onPreRender();
void onChildAdded(GuiControl* control) override;
void onChildRemoved(GuiControl* control) override;
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
void childResized(GuiControl *child) override;
void addObject(SimObject *obj) override;
void removeObject(SimObject *obj) override;
bool reOrder(SimObject* obj, SimObject* target) override;
void onPreRender() override;
/// GuiContainer deals with parentResized calls differently than GuiControl. It will
/// update the layout for all of it's non-docked child controls. parentResized calls
/// on the child controls will be handled by their default functions, but for our
/// purposes we want at least our immediate children to use the anchors that they have
/// set on themselves. - JDD [9/20/2006]
virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
/// @}
};

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

@ -118,7 +118,7 @@ class GuiRolloutCtrl : public GuiTickCtrl
DECLARE_CALLBACK( void, onCollapsed, () );
/// @}
virtual void processTick();
void processTick() override;
public:
@ -134,20 +134,20 @@ class GuiRolloutCtrl : public GuiTickCtrl
static void initPersistFields();
// Control Events
bool onWake();
void addObject(SimObject *obj);
void removeObject(SimObject *obj);
virtual void childResized(GuiControl *child);
bool onWake() override;
void addObject(SimObject *obj) override;
void removeObject(SimObject *obj) override;
void childResized(GuiControl *child) override;
// Mouse Events
virtual void onMouseDown( const GuiEvent& event );
virtual void onMouseUp( const GuiEvent& event );
virtual void onRightMouseUp( const GuiEvent& event );
virtual bool onMouseUpEditor( const GuiEvent& event, Point2I offset );
void onMouseDown( const GuiEvent& event ) override;
void onMouseUp( const GuiEvent& event ) override;
void onRightMouseUp( const GuiEvent& event ) override;
bool onMouseUpEditor( const GuiEvent& event, Point2I offset ) override;
// Sizing Helpers
virtual void calculateHeights();
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
virtual void sizeToContents();
inline bool isExpanded() const { return mIsExpanded; }
@ -172,8 +172,8 @@ class GuiRolloutCtrl : public GuiTickCtrl
void setCanCollapse( bool value ) { mCanCollapse = value; }
// Control Rendering
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onAdd();
void onRender(Point2I offset, const RectI &updateRect) override;
bool onAdd() override;
};
#endif // _GUI_ROLLOUTCTRL_H_

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

@ -219,9 +219,9 @@ class GuiScrollCtrl : public GuiContainer
// you can change the bitmap array dynamically.
void loadBitmapArray();
void addObject(SimObject *obj);
bool resize(const Point2I &newPosition, const Point2I &newExtent);
void childResized(GuiControl *child);
void addObject(SimObject *obj) override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void childResized(GuiControl *child) override;
Point2I getChildPos() { return mChildPos; }
Point2I getChildRelPos() { return mChildRelPos; };
Point2I getChildExtent() { return mChildExt; }
@ -244,24 +244,24 @@ class GuiScrollCtrl : public GuiContainer
Region getCurHitRegion(void) { return mHitRegion; }
// GuiControl
virtual bool onKeyDown(const GuiEvent &event);
virtual void onMouseDown(const GuiEvent &event);
virtual bool onMouseDownEditor( const GuiEvent& event, Point2I offset );
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
virtual bool onMouseWheelUp(const GuiEvent &event);
virtual bool onMouseWheelDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
void onMouseDown(const GuiEvent &event) override;
bool onMouseDownEditor( const GuiEvent& event, Point2I offset ) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
bool onMouseWheelUp(const GuiEvent &event) override;
bool onMouseWheelDown(const GuiEvent &event) override;
virtual bool onWake();
virtual void onSleep();
bool onWake() override;
void onSleep() override;
virtual void onPreRender();
virtual void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
virtual void drawBorder(const Point2I &offset, bool isFirstResponder);
virtual void drawVScrollBar(const Point2I &offset);
virtual void drawHScrollBar(const Point2I &offset);
virtual void drawScrollCorner(const Point2I &offset);
virtual GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1);
GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1) override;
static void initPersistFields();

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

@ -73,14 +73,14 @@ public:
vertStackBottom, ///< Stack from bottom to top when vertical
};
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;
bool isFrozen() { return mResizing; };
/// prevent resizing. useful when adding many items.
void freeze(bool);
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
void updatePanes();
@ -89,10 +89,10 @@ public:
S32 getCount() { return size(); }; /// Returns the number of children in the stack
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();