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:
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -64,8 +64,8 @@ public:
|
|||
GuiArrayCtrl();
|
||||
DECLARE_CONOBJECT(GuiArrayCtrl);
|
||||
|
||||
bool onWake();
|
||||
void onSleep();
|
||||
bool onWake() override;
|
||||
void onSleep() override;
|
||||
|
||||
/// @name Array attribute methods
|
||||
/// @{
|
||||
|
|
@ -89,19 +89,19 @@ public:
|
|||
virtual void onRenderColumnHeaders(Point2I offset, Point2I parentOffset, Point2I headerDim);
|
||||
virtual void onRenderRowHeader(Point2I offset, Point2I parentOffset, Point2I headerDim, Point2I cell);
|
||||
virtual void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
|
||||
void onRender(Point2I offset, const RectI &updateRect);
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
/// @}
|
||||
|
||||
/// @name Mouse input methods
|
||||
/// @{
|
||||
void onMouseDown( const GuiEvent &event );
|
||||
void onMouseUp( const GuiEvent &event );
|
||||
void onMouseMove( const GuiEvent &event );
|
||||
void onMouseDragged( const GuiEvent &event );
|
||||
void onMouseEnter( const GuiEvent &event );
|
||||
void onMouseLeave( const GuiEvent &event );
|
||||
bool onKeyDown( const GuiEvent &event );
|
||||
void onRightMouseDown( const GuiEvent &event );
|
||||
void onMouseDown( const GuiEvent &event ) override;
|
||||
void onMouseUp( const GuiEvent &event ) override;
|
||||
void onMouseMove( const GuiEvent &event ) override;
|
||||
void onMouseDragged( const GuiEvent &event ) override;
|
||||
void onMouseEnter( const GuiEvent &event ) override;
|
||||
void onMouseLeave( const GuiEvent &event ) override;
|
||||
bool onKeyDown( const GuiEvent &event ) override;
|
||||
void onRightMouseDown( const GuiEvent &event ) override;
|
||||
/// @}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -220,8 +220,8 @@ public:
|
|||
GuiCanvas();
|
||||
virtual ~GuiCanvas();
|
||||
|
||||
virtual bool onAdd();
|
||||
virtual void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
#ifdef TORQUE_TOOLS
|
||||
void setMenuBar(SimObject *obj);
|
||||
SimObject* getMenuBar() { return mMenuBarCtrl; }
|
||||
|
|
@ -373,7 +373,7 @@ public:
|
|||
/// Processes an input event
|
||||
/// @see InputEvent
|
||||
/// @param event Input event to process
|
||||
virtual bool processInputEvent(InputEventInfo &inputEvent);
|
||||
bool processInputEvent(InputEventInfo &inputEvent) override;
|
||||
/// @}
|
||||
|
||||
/// @name Mouse Methods
|
||||
|
|
@ -450,7 +450,7 @@ public:
|
|||
|
||||
/// Sets the first responder.
|
||||
/// @param firstResponder Control to designate as first responder
|
||||
virtual void setFirstResponder(GuiControl *firstResponder);
|
||||
void setFirstResponder(GuiControl *firstResponder) override;
|
||||
|
||||
/// This is used to toggle processing of native OS accelerators, not
|
||||
/// to be confused with the Torque accelerator key system, to keep them
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ class GuiControl : public SimGroup
|
|||
void setSizing(S32 horz, S32 vert);
|
||||
|
||||
/// Overrides Parent Serialization to allow specific controls to not be saved (Dynamic Controls, etc)
|
||||
void write(Stream &stream, U32 tabStop, U32 flags);
|
||||
void write(Stream &stream, U32 tabStop, U32 flags) override;
|
||||
|
||||
/// Returns boolean as to whether any parent of this control has the 'no serialization' flag set.
|
||||
bool getCanSaveParent();
|
||||
|
|
@ -343,7 +343,7 @@ class GuiControl : public SimGroup
|
|||
|
||||
GuiControl();
|
||||
virtual ~GuiControl();
|
||||
virtual bool processArguments(S32 argc, ConsoleValue *argv);
|
||||
bool processArguments(S32 argc, ConsoleValue *argv) override;
|
||||
|
||||
static void initPersistFields();
|
||||
static void consoleInit();
|
||||
|
|
@ -382,8 +382,8 @@ class GuiControl : public SimGroup
|
|||
/// @param value True if object should be visible
|
||||
virtual void setVisible(bool value);
|
||||
inline bool isVisible() const { return mVisible; } ///< Returns true if the object is visible
|
||||
virtual bool isHidden() const { return !isVisible(); }
|
||||
virtual void setHidden( bool state ) { setVisible( !state ); }
|
||||
bool isHidden() const override { return !isVisible(); }
|
||||
void setHidden( bool state ) override { setVisible( !state ); }
|
||||
|
||||
void setCanHit( bool value ) { mCanHit = value; }
|
||||
|
||||
|
|
@ -413,18 +413,18 @@ class GuiControl : public SimGroup
|
|||
|
||||
/// Adds an object as a child of this object.
|
||||
/// @param obj New child object of this control
|
||||
void addObject(SimObject *obj);
|
||||
void addObject(SimObject *obj) override;
|
||||
|
||||
/// Removes a child object from this control.
|
||||
/// @param obj Object to remove from this control
|
||||
void removeObject(SimObject *obj);
|
||||
void removeObject(SimObject *obj) override;
|
||||
|
||||
GuiControl *getParent(); ///< Returns the control which owns this one.
|
||||
GuiCanvas *getRoot(); ///< Returns the root canvas of this control.
|
||||
|
||||
virtual bool acceptsAsChild( SimObject* object ) const;
|
||||
bool acceptsAsChild( SimObject* object ) const override;
|
||||
|
||||
virtual void onGroupRemove();
|
||||
void onGroupRemove() override;
|
||||
|
||||
/// @}
|
||||
|
||||
|
|
@ -535,16 +535,16 @@ class GuiControl : public SimGroup
|
|||
virtual void onPreRender();
|
||||
|
||||
/// Called when this object is removed
|
||||
virtual void onRemove();
|
||||
void onRemove() override;
|
||||
|
||||
/// Called when one of this objects children is removed
|
||||
virtual void onChildRemoved( GuiControl *child );
|
||||
|
||||
/// Called when this object is added to the scene
|
||||
virtual bool onAdd();
|
||||
bool onAdd() override;
|
||||
|
||||
/// Called when the mProfile or mToolTipProfile is deleted
|
||||
virtual void onDeleteNotify(SimObject *object);
|
||||
void onDeleteNotify(SimObject *object) override;
|
||||
|
||||
/// Called when this object has a new child
|
||||
virtual void onChildAdded( GuiControl *child );
|
||||
|
|
@ -828,8 +828,8 @@ class GuiControl : public SimGroup
|
|||
/// of the final clipped text in pixels.
|
||||
U32 clipText( String &inOutText, U32 width ) const;
|
||||
|
||||
void inspectPostApply();
|
||||
void inspectPreApply();
|
||||
void inspectPostApply() override;
|
||||
void inspectPreApply() override;
|
||||
protected:
|
||||
F32 fade_amt;
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -19,18 +19,18 @@ public:
|
|||
GuiOffscreenCanvas();
|
||||
~GuiOffscreenCanvas();
|
||||
|
||||
bool onAdd();
|
||||
void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
void renderFrame(bool preRenderOnly, bool bufferSwap);
|
||||
void renderFrame(bool preRenderOnly, bool bufferSwap) override;
|
||||
virtual void onFrameRendered();
|
||||
|
||||
Point2I getWindowSize();
|
||||
Point2I getWindowSize() override;
|
||||
|
||||
Point2I getCursorPos();
|
||||
void setCursorPos(const Point2I &pt);
|
||||
void showCursor(bool state);
|
||||
bool isCursorShown();
|
||||
Point2I getCursorPos() override;
|
||||
void setCursorPos(const Point2I &pt) override;
|
||||
void showCursor(bool state) override;
|
||||
bool isCursorShown() override;
|
||||
|
||||
void _onTextureEvent( GFXTexCallbackCode code );
|
||||
|
||||
|
|
|
|||
|
|
@ -364,8 +364,8 @@ public:
|
|||
~GuiCursor(void);
|
||||
static void initPersistFields();
|
||||
|
||||
bool onAdd(void);
|
||||
void onRemove();
|
||||
bool onAdd(void) override;
|
||||
void onRemove() override;
|
||||
void render(const Point2I &pos);
|
||||
|
||||
void onImageChanged() {}
|
||||
|
|
@ -601,12 +601,12 @@ public:
|
|||
~GuiControlProfile();
|
||||
static void initPersistFields();
|
||||
|
||||
bool onAdd();
|
||||
bool onAdd() override;
|
||||
|
||||
void onStaticModified(const char* slotName, const char* newValue = NULL );
|
||||
void onStaticModified(const char* slotName, const char* newValue = NULL ) override;
|
||||
|
||||
/// Called when mProfileForChildren is deleted
|
||||
virtual void onDeleteNotify(SimObject *object);
|
||||
void onDeleteNotify(SimObject *object) override;
|
||||
|
||||
/// This method creates an array of bitmaps from one single bitmap with
|
||||
/// separator color. The separator color is whatever color is in pixel 0,0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue