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:
marauder2k7 2024-03-18 18:40:22 +00:00
parent efbe5e90f5
commit 2b295fb7f0
454 changed files with 4162 additions and 4156 deletions

View file

@ -34,21 +34,21 @@ class afxEventCatchAll : public GuiControl
public:
/* C */ afxEventCatchAll() { }
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
virtual void onMouseUp(const GuiEvent&);
virtual void onMouseDown(const GuiEvent&);
virtual void onMouseMove(const GuiEvent&);
virtual void onMouseDragged(const GuiEvent&);
virtual void onMouseEnter(const GuiEvent&);
virtual void onMouseLeave(const GuiEvent&);
void onMouseUp(const GuiEvent&) override;
void onMouseDown(const GuiEvent&) override;
void onMouseMove(const GuiEvent&) override;
void onMouseDragged(const GuiEvent&) override;
void onMouseEnter(const GuiEvent&) override;
void onMouseLeave(const GuiEvent&) override;
virtual bool onMouseWheelUp(const GuiEvent&);
virtual bool onMouseWheelDown(const GuiEvent&);
bool onMouseWheelUp(const GuiEvent&) override;
bool onMouseWheelDown(const GuiEvent&) override;
virtual void onRightMouseDown(const GuiEvent&);
virtual void onRightMouseUp(const GuiEvent&);
virtual void onRightMouseDragged(const GuiEvent&);
void onRightMouseDown(const GuiEvent&) override;
void onRightMouseUp(const GuiEvent&) override;
void onRightMouseDragged(const GuiEvent&) override;
DECLARE_CONOBJECT(afxEventCatchAll);
DECLARE_CATEGORY("AFX");

View file

@ -43,21 +43,21 @@ public:
DECLARE_CONOBJECT(afxGuiSubstitutionField);
DECLARE_CATEGORY("AFX");
virtual void setData( const char* data, bool callbacks = true );
virtual const char* getData( U32 inspectObjectIndex = 0 );
virtual void updateValue();
void setData( const char* data, bool callbacks = true ) override;
const char* getData( U32 inspectObjectIndex = 0 ) override;
void updateValue() override;
virtual void setToolTip( StringTableEntry data );
virtual bool onAdd();
bool onAdd() override;
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
virtual void setValue( const char* newValue );
void setValue( const char* newValue ) override;
protected:
virtual void _executeSelectedCallback();
void _executeSelectedCallback() override;
protected:

View file

@ -72,7 +72,7 @@ public:
afxGuiTextHud();
// GuiControl
virtual void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields();
static void addTextItem(const Point3F& pos, const char* text, LinearColorF& color, SceneObject* obj=0);

View file

@ -82,15 +82,15 @@ public:
afxMagicSpellData* getSpellDataBlock() const;
afxRPGMagicSpellData* getSpellRPGDataBlock() const;
virtual bool onAdd();
virtual bool onWake();
virtual void onSleep();
virtual void inspectPostApply();
virtual void onMouseEnter(const GuiEvent &event);
virtual void onMouseLeave(const GuiEvent &event);
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onAdd() override;
bool onWake() override;
void onSleep() override;
void inspectPostApply() override;
void onMouseEnter(const GuiEvent &event) override;
void onMouseLeave(const GuiEvent &event) override;
void onRender(Point2I offset, const RectI &updateRect) override;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
static void initPersistFields();

View file

@ -50,13 +50,13 @@ class afxSpellCastBar : public GuiControl, public afxProgressBase
public:
/*C*/ afxSpellCastBar();
virtual void onRender(Point2I, const RectI&);
void onRender(Point2I, const RectI&) override;
void setFraction(F32 frac);
F32 getFraction() const { return fraction; }
virtual void setProgress(F32 value) { setFraction(value); }
virtual void onStaticModified(const char* slotName, const char* newValue = NULL);
void setProgress(F32 value) override { setFraction(value); }
void onStaticModified(const char* slotName, const char* newValue = NULL) override;
static void initPersistFields();

View file

@ -49,20 +49,20 @@ class afxStatusBar : public GuiControl, public afxProgressBase
public:
/*C*/ afxStatusBar();
virtual void onRender(Point2I, const RectI&);
void onRender(Point2I, const RectI&) override;
void setFraction(F32 frac);
F32 getFraction() const { return fraction; }
virtual void setProgress(F32 value) { setFraction(value); }
void setProgress(F32 value) override { setFraction(value); }
void setShape(ShapeBase* s);
void clearShape() { setShape(NULL); }
virtual bool onWake();
virtual void onSleep();
virtual void onMouseDown(const GuiEvent &event);
virtual void onDeleteNotify(SimObject*);
bool onWake() override;
void onSleep() override;
void onMouseDown(const GuiEvent &event) override;
void onDeleteNotify(SimObject*) override;
static void initPersistFields();

View file

@ -38,8 +38,8 @@ private:
public:
/*C*/ afxStatusBox();
virtual void onMouseDown(const GuiEvent &event);
virtual void onSleep();
void onMouseDown(const GuiEvent &event) override;
void onSleep() override;
DECLARE_CONOBJECT(afxStatusBox);
DECLARE_CATEGORY("AFX");

View file

@ -38,7 +38,7 @@ private:
public:
/*C*/ afxStatusLabel();
virtual void onMouseDown(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
DECLARE_CONOBJECT(afxStatusLabel);
DECLARE_CATEGORY("AFX");

View file

@ -55,22 +55,22 @@ private:
public:
/*C*/ afxTSCtrl();
virtual bool processCameraQuery(CameraQuery *query);
virtual void renderWorld(const RectI &updateRect);
virtual void onRender(Point2I offset, const RectI &updateRect);
bool processCameraQuery(CameraQuery *query) override;
void renderWorld(const RectI &updateRect) override;
void onRender(Point2I offset, const RectI &updateRect) override;
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
virtual void onMouseDown(const GuiEvent&);
virtual void onMouseMove(const GuiEvent&);
virtual void onMouseDragged(const GuiEvent&);
virtual void onMouseEnter(const GuiEvent&);
virtual void onMouseLeave(const GuiEvent&);
void onMouseDown(const GuiEvent&) override;
void onMouseMove(const GuiEvent&) override;
void onMouseDragged(const GuiEvent&) override;
void onMouseEnter(const GuiEvent&) override;
void onMouseLeave(const GuiEvent&) override;
virtual bool onMouseWheelUp(const GuiEvent&);
virtual bool onMouseWheelDown(const GuiEvent&);
bool onMouseWheelUp(const GuiEvent&) override;
bool onMouseWheelDown(const GuiEvent&) override;
virtual void onRightMouseDown(const GuiEvent&);
void onRightMouseDown(const GuiEvent&) override;
Point3F getMouse3DVec() {return mMouse3DVec;};
Point3F getMouse3DPos() {return mMouse3DPos;};
@ -83,9 +83,9 @@ public:
U8 getTargetingCheckMethod();
void performTargeting(const Point2I& mousePoint, U8 mode);
virtual void interpolateTick( F32 delta ) {};
virtual void processTick() {};
virtual void advanceTime( F32 timeDelta );
void interpolateTick( F32 delta ) override {};
void processTick() override {};
void advanceTime( F32 timeDelta ) override;
DECLARE_CONOBJECT(afxTSCtrl);
DECLARE_CATEGORY("AFX");