From 1d6bf48a37288ceccc1c58abb6616929baf6ea22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kotiuk?= Date: Mon, 29 Jun 2026 21:29:59 +0200 Subject: [PATCH] chore: Cleanup in virtual functions See https://stackoverflow.com/questions/39932391/should-i-use-virtual-override-or-both-keywords --- src/gamecontroller/gamecontrollertrigger.h | 20 ++++++++++---------- src/gamecontrollerexample.h | 2 +- src/gui/aboutdialog.h | 2 +- src/gui/addeditautoprofiledialog.h | 2 +- src/gui/axisvaluebox.h | 4 ++-- src/gui/buttoneditdialog.h | 4 ++-- src/gui/editalldefaultautoprofiledialog.h | 2 +- src/gui/flashbuttonwidget.h | 2 +- src/gui/joytabwidget.h | 2 +- src/gui/mainwindow.h | 6 +++--- src/gui/qkeydisplaydialog.h | 4 ++-- src/gui/simplekeygrabberbutton.h | 4 ++-- src/gui/slotitemlistwidget.h | 2 +- src/joycontrolstickstatusbox.h | 6 +++--- src/keyboard/virtualkeyboardmousewidget.h | 2 +- src/sensors/joygyroscopesensor.h | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/gamecontroller/gamecontrollertrigger.h b/src/gamecontroller/gamecontrollertrigger.h index 954493f22..2a1fe06c9 100644 --- a/src/gamecontroller/gamecontrollertrigger.h +++ b/src/gamecontroller/gamecontrollertrigger.h @@ -33,22 +33,22 @@ class GameControllerTrigger : public JoyAxis public: explicit GameControllerTrigger(int index, int originset, SetJoystick *parentSet, QObject *parent = nullptr); - virtual QString getXmlName(); // GameControllerTriggerXml class - virtual QString getPartialName(bool forceFullFormat, bool displayNames); + QString getXmlName() override; // GameControllerTriggerXml class + QString getPartialName(bool forceFullFormat, bool displayNames) override; - virtual int getDefaultDeadZone(); - virtual int getDefaultMaxZone(); - virtual ThrottleTypes getDefaultThrottle(); + int getDefaultDeadZone() override; + int getDefaultMaxZone() override; + ThrottleTypes getDefaultThrottle() override; static const ThrottleTypes DEFAULTTHROTTLE; - virtual bool hasHapticTrigger() const override; - virtual HapticTriggerPs5 *getHapticTrigger() const override; - virtual void setHapticTriggerMode(HapticTriggerModePs5 mode) override; + bool hasHapticTrigger() const override; + HapticTriggerPs5 *getHapticTrigger() const override; + void setHapticTriggerMode(HapticTriggerModePs5 mode) override; public slots: - virtual void reset(); - virtual void reset(int index); + void reset() override; + void reset(int index) override; protected: void correctJoystickThrottle(); diff --git a/src/gamecontrollerexample.h b/src/gamecontrollerexample.h index 9aa791282..b7faa3ef4 100644 --- a/src/gamecontrollerexample.h +++ b/src/gamecontrollerexample.h @@ -47,7 +47,7 @@ class GameControllerExample : public QWidget static const int MAXBUTTONINDEX = 20; protected: - virtual void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; signals: void indexUpdated(int index); diff --git a/src/gui/aboutdialog.h b/src/gui/aboutdialog.h index e25b9529c..1b367a414 100644 --- a/src/gui/aboutdialog.h +++ b/src/gui/aboutdialog.h @@ -40,7 +40,7 @@ class AboutDialog : public QDialog protected: void fillInfoTextBrowser(); - virtual void changeEvent(QEvent *event); + void changeEvent(QEvent *event) override; void retranslateUi(); }; diff --git a/src/gui/addeditautoprofiledialog.h b/src/gui/addeditautoprofiledialog.h index 6d9f2dd1b..a160bf7b3 100644 --- a/src/gui/addeditautoprofiledialog.h +++ b/src/gui/addeditautoprofiledialog.h @@ -59,7 +59,7 @@ class AddEditAutoProfileDialog : public QDialog QList const &getReservedUniques(); protected: - virtual void accept(); + void accept() override; signals: void captureFinished(); diff --git a/src/gui/axisvaluebox.h b/src/gui/axisvaluebox.h index 9c9357626..f004d72ee 100644 --- a/src/gui/axisvaluebox.h +++ b/src/gui/axisvaluebox.h @@ -39,8 +39,8 @@ class AxisValueBox : public QWidget int getMaxAxValue(); protected: - virtual void resizeEvent(QResizeEvent *event); - virtual void paintEvent(QPaintEvent *event); + void resizeEvent(QResizeEvent *event) override; + void paintEvent(QPaintEvent *event) override; public slots: void setThrottle(int throttle); diff --git a/src/gui/buttoneditdialog.h b/src/gui/buttoneditdialog.h index 21bd0d438..3b3cb658f 100644 --- a/src/gui/buttoneditdialog.h +++ b/src/gui/buttoneditdialog.h @@ -56,8 +56,8 @@ class ButtonEditDialog : public QDialog Qt::ConnectionType connTypeForAll); protected: - virtual void keyReleaseEvent(QKeyEvent *event); - virtual void keyPressEvent(QKeyEvent *event); + void keyReleaseEvent(QKeyEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; private: void setupVirtualKeyboardMouseTabWidget(); diff --git a/src/gui/editalldefaultautoprofiledialog.h b/src/gui/editalldefaultautoprofiledialog.h index f1b56d2cc..27c892155 100644 --- a/src/gui/editalldefaultautoprofiledialog.h +++ b/src/gui/editalldefaultautoprofiledialog.h @@ -41,7 +41,7 @@ class EditAllDefaultAutoProfileDialog : public QDialog AntiMicroSettings *getSettings() const; protected: - virtual void accept(); + void accept() override; private: Ui::EditAllDefaultAutoProfileDialog *ui; diff --git a/src/gui/flashbuttonwidget.h b/src/gui/flashbuttonwidget.h index 0d90e814d..dd96f1e7d 100644 --- a/src/gui/flashbuttonwidget.h +++ b/src/gui/flashbuttonwidget.h @@ -38,7 +38,7 @@ class FlashButtonWidget : public QPushButton bool isDisplayingNames(); protected: - virtual void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; virtual QString generateLabel() = 0; virtual void retranslateUi(); bool ifDisplayNames(); diff --git a/src/gui/joytabwidget.h b/src/gui/joytabwidget.h index a188540bd..38587965a 100644 --- a/src/gui/joytabwidget.h +++ b/src/gui/joytabwidget.h @@ -76,7 +76,7 @@ class JoyTabWidget : public QWidget InputDevice *getJoystick(); protected: - virtual void changeEvent(QEvent *event); + void changeEvent(QEvent *event) override; void removeCurrentButtons(); void retranslateUi(); void disconnectMainComboBoxEvents(); diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 4d6fb179e..669956597 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -72,9 +72,9 @@ class MainWindow : public QMainWindow bool isKeypadUnlocked(); protected: - virtual void showEvent(QShowEvent *event); - virtual void changeEvent(QEvent *event); - virtual void closeEvent(QCloseEvent *event); + void showEvent(QShowEvent *event) override; + void changeEvent(QEvent *event) override; + void closeEvent(QCloseEvent *event) override; bool eventFilter(QObject *obj, QEvent *event) override; diff --git a/src/gui/qkeydisplaydialog.h b/src/gui/qkeydisplaydialog.h index 122b3f1f5..e0b6c9ea9 100644 --- a/src/gui/qkeydisplaydialog.h +++ b/src/gui/qkeydisplaydialog.h @@ -37,8 +37,8 @@ class QKeyDisplayDialog : public QDialog ~QKeyDisplayDialog(); protected: - virtual void keyPressEvent(QKeyEvent *event); - virtual void keyReleaseEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; private: Ui::QKeyDisplayDialog *ui; diff --git a/src/gui/simplekeygrabberbutton.h b/src/gui/simplekeygrabberbutton.h index a7ad5c8ef..877dd08b6 100644 --- a/src/gui/simplekeygrabberbutton.h +++ b/src/gui/simplekeygrabberbutton.h @@ -50,8 +50,8 @@ class SimpleKeyGrabberButton : public QPushButton bool isGrabbing(); protected: - virtual void keyPressEvent(QKeyEvent *event); - virtual bool eventFilter(QObject *obj, QEvent *event); + void keyPressEvent(QKeyEvent *event) override; + bool eventFilter(QObject *obj, QEvent *event) override; signals: void buttonCodeChanged(int value); diff --git a/src/gui/slotitemlistwidget.h b/src/gui/slotitemlistwidget.h index 8860d5e8a..60201a1fb 100644 --- a/src/gui/slotitemlistwidget.h +++ b/src/gui/slotitemlistwidget.h @@ -33,7 +33,7 @@ class SlotItemListWidget : public QListWidget void insertItems(int row, QList items); protected: - virtual void keyPressEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) override; }; #endif // SLOTITEMLISTWIDGET_H diff --git a/src/joycontrolstickstatusbox.h b/src/joycontrolstickstatusbox.h index 77050d489..74f121742 100644 --- a/src/joycontrolstickstatusbox.h +++ b/src/joycontrolstickstatusbox.h @@ -37,11 +37,11 @@ class JoyControlStickStatusBox : public QWidget JoyControlStick *getStick() const; - virtual int heightForWidth(int width) const; - QSize sizeHint() const; + int heightForWidth(int width) const override; + QSize sizeHint() const override; protected: - virtual void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; void drawEightWayBox(); void drawFourWayCardinalBox(); void drawFourWayDiagonalBox(); diff --git a/src/keyboard/virtualkeyboardmousewidget.h b/src/keyboard/virtualkeyboardmousewidget.h index 018361d2d..236d800fe 100644 --- a/src/keyboard/virtualkeyboardmousewidget.h +++ b/src/keyboard/virtualkeyboardmousewidget.h @@ -74,7 +74,7 @@ class VirtualKeyboardMouseWidget : public QTabWidget void addFButtonToOthers(int qt_keycode, QString keycode_text); QPushButton *createOtherKeysMenu(); - virtual void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) override; signals: void selectionFinished(); diff --git a/src/sensors/joygyroscopesensor.h b/src/sensors/joygyroscopesensor.h index 965e88489..c960281c3 100644 --- a/src/sensors/joygyroscopesensor.h +++ b/src/sensors/joygyroscopesensor.h @@ -42,7 +42,7 @@ class JoyGyroscopeSensor : public JoySensor virtual void reset() override; protected: - virtual void populateButtons(); + void populateButtons() override; virtual JoySensorDirection calculateSensorDirection() override; virtual void applyCalibration() override; };