mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 07:04:36 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
marauder2k7
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -51,18 +51,18 @@ public:
|
|||
static void initPersistFields();
|
||||
|
||||
// SimObject
|
||||
virtual void onRemove();
|
||||
virtual void onDeleteNotify( SimObject *object );
|
||||
void onRemove() override;
|
||||
void onDeleteNotify( SimObject *object ) override;
|
||||
|
||||
// GuiControl
|
||||
virtual void parentResized( const RectI &oldParentRect, const RectI &newParentRect );
|
||||
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
|
||||
virtual GuiControl* findHitControl( const Point2I &pt, S32 initialLayer );
|
||||
virtual void getCursor( GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent );
|
||||
virtual void onMouseMove( const GuiEvent &event );
|
||||
virtual void onMouseDown( const GuiEvent &event );
|
||||
virtual void onMouseUp( const GuiEvent &event );
|
||||
virtual void onMouseDragged( const GuiEvent &event );
|
||||
void parentResized( const RectI &oldParentRect, const RectI &newParentRect ) override;
|
||||
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
|
||||
GuiControl* findHitControl( const Point2I &pt, S32 initialLayer ) override;
|
||||
void getCursor( GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent ) override;
|
||||
void onMouseMove( const GuiEvent &event ) override;
|
||||
void onMouseDown( const GuiEvent &event ) override;
|
||||
void onMouseUp( const GuiEvent &event ) override;
|
||||
void onMouseDragged( const GuiEvent &event ) override;
|
||||
|
||||
// GuiInspector
|
||||
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual void setValue( StringTableEntry newValue );
|
||||
GuiControl* constructEditControl() override;
|
||||
void setValue( StringTableEntry newValue ) override;
|
||||
virtual void _populateMenu( GuiPopUpMenuCtrlEx *menu );
|
||||
};
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeEnum);
|
||||
static void consoleInit();
|
||||
|
||||
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
|
||||
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -92,7 +92,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeCubemapName);
|
||||
static void consoleInit();
|
||||
|
||||
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
|
||||
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
|
|
@ -119,8 +119,8 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual bool updateRects();
|
||||
GuiControl* constructEditControl() override;
|
||||
bool updateRects() override;
|
||||
};
|
||||
|
||||
class GuiInspectorTypeRegularMaterialName : public GuiInspectorTypeMaterialName
|
||||
|
|
@ -150,7 +150,7 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
GuiControl* constructEditControl() override;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
|
|
@ -170,7 +170,7 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
GuiControl* constructEditControl() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -184,7 +184,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeGuiProfile);
|
||||
static void consoleInit();
|
||||
|
||||
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
|
||||
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -198,7 +198,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeActionMap);
|
||||
static void consoleInit();
|
||||
|
||||
virtual void _populateMenu(GuiPopUpMenuCtrlEx * menu);
|
||||
void _populateMenu(GuiPopUpMenuCtrlEx * menu) override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -215,9 +215,9 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual void setValue( StringTableEntry newValue );
|
||||
virtual const char* getValue();
|
||||
GuiControl* constructEditControl() override;
|
||||
void setValue( StringTableEntry newValue ) override;
|
||||
const char* getValue() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -237,8 +237,8 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual void setValue( StringTableEntry data );
|
||||
GuiControl* constructEditControl() override;
|
||||
void setValue( StringTableEntry data ) override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -258,10 +258,10 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
|
||||
virtual bool updateRects();
|
||||
virtual void updateValue();
|
||||
GuiControl* constructEditControl() override;
|
||||
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
|
||||
bool updateRects() override;
|
||||
void updateValue() override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -276,7 +276,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeImageFileName);
|
||||
static void consoleInit();
|
||||
|
||||
virtual GuiControl* constructEditControl();
|
||||
GuiControl* constructEditControl() override;
|
||||
bool renderTooltip( const Point2I &hoverPos, const Point2I &cursorPos, const char *tipText = NULL );
|
||||
};
|
||||
|
||||
|
|
@ -298,8 +298,8 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual bool updateRects();
|
||||
GuiControl* constructEditControl() override;
|
||||
bool updateRects() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -328,9 +328,9 @@ class GuiInspectorTypeEaseF : public GuiInspectorField
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
|
||||
virtual bool updateRects();
|
||||
GuiControl* constructEditControl() override;
|
||||
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
|
||||
bool updateRects() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -344,7 +344,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypePrefabFilename);
|
||||
static void consoleInit();
|
||||
|
||||
virtual GuiControl* constructEditControl();
|
||||
GuiControl* constructEditControl() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -360,8 +360,8 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeShapeFilename);
|
||||
static void consoleInit();
|
||||
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual bool updateRects();
|
||||
GuiControl* constructEditControl() override;
|
||||
bool updateRects() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -394,9 +394,9 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
|
||||
virtual bool updateRects();
|
||||
GuiControl* constructEditControl() override;
|
||||
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
|
||||
bool updateRects() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -408,7 +408,7 @@ class GuiInspectorTypeColorI : public GuiInspectorTypeColor
|
|||
|
||||
protected:
|
||||
|
||||
virtual const char* _getColorConversionFunction() const { return "ColorFloatToInt"; }
|
||||
const char* _getColorConversionFunction() const override { return "ColorFloatToInt"; }
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -417,7 +417,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeColorI);
|
||||
|
||||
static void consoleInit();
|
||||
void setValue( StringTableEntry newValue );
|
||||
void setValue( StringTableEntry newValue ) override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -434,7 +434,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeColorF);
|
||||
|
||||
static void consoleInit();
|
||||
void setValue( StringTableEntry newValue );
|
||||
void setValue( StringTableEntry newValue ) override;
|
||||
};
|
||||
|
||||
/* NOTE: Evidently this isn't used anywhere (or implemented) so i commented it out
|
||||
|
|
@ -469,8 +469,8 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeS32);
|
||||
static void consoleInit();
|
||||
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual void setValue( StringTableEntry newValue );
|
||||
GuiControl* constructEditControl() override;
|
||||
void setValue( StringTableEntry newValue ) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -492,16 +492,16 @@ public:
|
|||
DECLARE_CONOBJECT( GuiInspectorTypeBitMask32 );
|
||||
|
||||
// ConsoleObject
|
||||
bool onAdd();
|
||||
bool onAdd() override;
|
||||
static void consoleInit();
|
||||
|
||||
// GuiInspectorField
|
||||
virtual void childResized( GuiControl *child );
|
||||
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
|
||||
virtual bool updateRects();
|
||||
virtual void updateData();
|
||||
virtual StringTableEntry getValue();
|
||||
virtual void setValue( StringTableEntry value );
|
||||
void childResized( GuiControl *child ) override;
|
||||
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
|
||||
bool updateRects() override;
|
||||
void updateData() override;
|
||||
StringTableEntry getValue() override;
|
||||
void setValue( StringTableEntry value ) override;
|
||||
|
||||
protected:
|
||||
|
||||
|
|
@ -529,10 +529,10 @@ public:
|
|||
//-----------------------------------------------------------------------------
|
||||
// Override able methods for custom edit fields
|
||||
//-----------------------------------------------------------------------------
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
|
||||
virtual bool updateRects();
|
||||
virtual void setValue( StringTableEntry value );
|
||||
GuiControl* constructEditControl() override;
|
||||
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
|
||||
bool updateRects() override;
|
||||
void setValue( StringTableEntry value ) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -547,7 +547,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeName);
|
||||
static void consoleInit();
|
||||
|
||||
virtual bool verifyData( StringTableEntry data );
|
||||
bool verifyData( StringTableEntry data ) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -562,7 +562,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeSFXParameterName);
|
||||
static void consoleInit();
|
||||
|
||||
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
|
||||
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -577,7 +577,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeSFXStateName);
|
||||
static void consoleInit();
|
||||
|
||||
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
|
||||
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -592,7 +592,7 @@ public:
|
|||
DECLARE_CONOBJECT(GuiInspectorTypeSFXSourceName);
|
||||
static void consoleInit();
|
||||
|
||||
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
|
||||
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -620,9 +620,9 @@ public:
|
|||
GuiButtonCtrl* mPasteButton;
|
||||
|
||||
virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width);
|
||||
virtual void updateValue();
|
||||
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
|
||||
virtual bool updateRects();
|
||||
void updateValue() override;
|
||||
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
|
||||
bool updateRects() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -641,10 +641,10 @@ protected:
|
|||
public:
|
||||
GuiTextCtrl* mDimensionLabelZ;
|
||||
|
||||
virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width);
|
||||
virtual void updateValue();
|
||||
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
|
||||
virtual bool updateRects();
|
||||
void constructEditControlChildren(GuiControl* retCtrl, S32 width) override;
|
||||
void updateValue() override;
|
||||
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
|
||||
bool updateRects() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -661,10 +661,10 @@ protected:
|
|||
public:
|
||||
GuiTextCtrl* mDimensionLabelW;
|
||||
|
||||
virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width);
|
||||
virtual void updateValue();
|
||||
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
|
||||
virtual bool updateRects();
|
||||
void constructEditControlChildren(GuiControl* retCtrl, S32 width) override;
|
||||
void updateValue() override;
|
||||
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
|
||||
bool updateRects() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -678,7 +678,7 @@ private:
|
|||
public:
|
||||
DECLARE_CONOBJECT(GuiInspectorTypePoint2F);
|
||||
static void consoleInit();
|
||||
virtual GuiControl* constructEditControl();
|
||||
GuiControl* constructEditControl() override;
|
||||
};
|
||||
|
||||
class GuiInspectorTypePoint2I : public GuiInspectorTypePoint2F
|
||||
|
|
@ -688,7 +688,7 @@ private:
|
|||
public:
|
||||
DECLARE_CONOBJECT(GuiInspectorTypePoint2I);
|
||||
static void consoleInit();
|
||||
virtual GuiControl* constructEditControl();
|
||||
GuiControl* constructEditControl() override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -704,7 +704,7 @@ private:
|
|||
public:
|
||||
DECLARE_CONOBJECT(GuiInspectorTypePoint3F);
|
||||
static void consoleInit();
|
||||
virtual GuiControl* constructEditControl();
|
||||
GuiControl* constructEditControl() override;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -721,16 +721,16 @@ public:
|
|||
EulerF eulAng;
|
||||
DECLARE_CONOBJECT(GuiInspectorTypeMatrixRotation);
|
||||
static void consoleInit();
|
||||
virtual GuiControl* constructEditControl();
|
||||
virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width);
|
||||
virtual void updateValue();
|
||||
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
|
||||
virtual bool updateRects();
|
||||
GuiControl* constructEditControl() override;
|
||||
void constructEditControlChildren(GuiControl* retCtrl, S32 width) override;
|
||||
void updateValue() override;
|
||||
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
|
||||
bool updateRects() override;
|
||||
|
||||
void updateAng(AngAxisF newAngAx);
|
||||
void updateEul(EulerF newEul);
|
||||
|
||||
virtual void updateData();
|
||||
virtual StringTableEntry getValue();
|
||||
void updateData() override;
|
||||
StringTableEntry getValue() override;
|
||||
};
|
||||
#endif // _GUI_INSPECTOR_TYPES_H_
|
||||
|
|
|
|||
|
|
@ -202,12 +202,12 @@ class GuiInspectorField : public GuiControl
|
|||
GuiInspector* getInspector() const { return mInspector; }
|
||||
|
||||
// GuiControl.
|
||||
virtual bool onAdd();
|
||||
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
|
||||
virtual void onRender(Point2I offset, const RectI &updateRect);
|
||||
virtual void setFirstResponder( GuiControl *firstResponder );
|
||||
virtual void onMouseDown( const GuiEvent &event );
|
||||
virtual void onRightMouseUp( const GuiEvent &event );
|
||||
bool onAdd() override;
|
||||
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
void setFirstResponder( GuiControl *firstResponder ) override;
|
||||
void onMouseDown( const GuiEvent &event ) override;
|
||||
void onRightMouseUp( const GuiEvent &event ) override;
|
||||
|
||||
void setTargetObject(SimObject* obj) { mTargetObject = obj; }
|
||||
SimObject* getTargetObject() { return mTargetObject; }
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ public:
|
|||
const String& getGroupName() const { return mCaption; };
|
||||
SimObjectPtr<GuiInspector> getInspector() { return mParent; };
|
||||
|
||||
bool onAdd();
|
||||
bool onAdd() override;
|
||||
virtual bool inspectGroup();
|
||||
|
||||
virtual void animateToContents();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue