Skip to content

Commit e0e1162

Browse files
committed
1 parent e3459c0 commit e0e1162

16 files changed

Lines changed: 33 additions & 33 deletions

src/gamecontroller/gamecontrollertrigger.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ class GameControllerTrigger : public JoyAxis
3333
public:
3434
explicit GameControllerTrigger(int index, int originset, SetJoystick *parentSet, QObject *parent = nullptr);
3535

36-
virtual QString getXmlName(); // GameControllerTriggerXml class
37-
virtual QString getPartialName(bool forceFullFormat, bool displayNames);
36+
QString getXmlName() override; // GameControllerTriggerXml class
37+
QString getPartialName(bool forceFullFormat, bool displayNames) override;
3838

39-
virtual int getDefaultDeadZone();
40-
virtual int getDefaultMaxZone();
41-
virtual ThrottleTypes getDefaultThrottle();
39+
int getDefaultDeadZone() override;
40+
int getDefaultMaxZone() override;
41+
ThrottleTypes getDefaultThrottle() override;
4242

4343
static const ThrottleTypes DEFAULTTHROTTLE;
4444

45-
virtual bool hasHapticTrigger() const override;
46-
virtual HapticTriggerPs5 *getHapticTrigger() const override;
47-
virtual void setHapticTriggerMode(HapticTriggerModePs5 mode) override;
45+
bool hasHapticTrigger() const override;
46+
HapticTriggerPs5 *getHapticTrigger() const override;
47+
void setHapticTriggerMode(HapticTriggerModePs5 mode) override;
4848

4949
public slots:
50-
virtual void reset();
51-
virtual void reset(int index);
50+
void reset() override;
51+
void reset(int index) override;
5252

5353
protected:
5454
void correctJoystickThrottle();

src/gamecontrollerexample.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class GameControllerExample : public QWidget
4747
static const int MAXBUTTONINDEX = 20;
4848

4949
protected:
50-
virtual void paintEvent(QPaintEvent *event);
50+
void paintEvent(QPaintEvent *event) override;
5151

5252
signals:
5353
void indexUpdated(int index);

src/gui/aboutdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class AboutDialog : public QDialog
4040

4141
protected:
4242
void fillInfoTextBrowser();
43-
virtual void changeEvent(QEvent *event);
43+
void changeEvent(QEvent *event) override;
4444
void retranslateUi();
4545
};
4646

src/gui/addeditautoprofiledialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class AddEditAutoProfileDialog : public QDialog
5959
QList<QString> const &getReservedUniques();
6060

6161
protected:
62-
virtual void accept();
62+
void accept() override;
6363

6464
signals:
6565
void captureFinished();

src/gui/axisvaluebox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class AxisValueBox : public QWidget
3939
int getMaxAxValue();
4040

4141
protected:
42-
virtual void resizeEvent(QResizeEvent *event);
43-
virtual void paintEvent(QPaintEvent *event);
42+
void resizeEvent(QResizeEvent *event) override;
43+
void paintEvent(QPaintEvent *event) override;
4444

4545
public slots:
4646
void setThrottle(int throttle);

src/gui/buttoneditdialog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ class ButtonEditDialog : public QDialog
5656
Qt::ConnectionType connTypeForAll);
5757

5858
protected:
59-
virtual void keyReleaseEvent(QKeyEvent *event);
60-
virtual void keyPressEvent(QKeyEvent *event);
59+
void keyReleaseEvent(QKeyEvent *event) override;
60+
void keyPressEvent(QKeyEvent *event) override;
6161

6262
private:
6363
void setupVirtualKeyboardMouseTabWidget();

src/gui/editalldefaultautoprofiledialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class EditAllDefaultAutoProfileDialog : public QDialog
4141
AntiMicroSettings *getSettings() const;
4242

4343
protected:
44-
virtual void accept();
44+
void accept() override;
4545

4646
private:
4747
Ui::EditAllDefaultAutoProfileDialog *ui;

src/gui/flashbuttonwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class FlashButtonWidget : public QPushButton
3838
bool isDisplayingNames();
3939

4040
protected:
41-
virtual void paintEvent(QPaintEvent *event);
41+
void paintEvent(QPaintEvent *event) override;
4242
virtual QString generateLabel() = 0;
4343
virtual void retranslateUi();
4444
bool ifDisplayNames();

src/gui/joytabwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class JoyTabWidget : public QWidget
7676
InputDevice *getJoystick();
7777

7878
protected:
79-
virtual void changeEvent(QEvent *event);
79+
void changeEvent(QEvent *event) override;
8080
void removeCurrentButtons();
8181
void retranslateUi();
8282
void disconnectMainComboBoxEvents();

src/gui/mainwindow.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ class MainWindow : public QMainWindow
7272
bool isKeypadUnlocked();
7373

7474
protected:
75-
virtual void showEvent(QShowEvent *event);
76-
virtual void changeEvent(QEvent *event);
77-
virtual void closeEvent(QCloseEvent *event);
75+
void showEvent(QShowEvent *event) override;
76+
void changeEvent(QEvent *event) override;
77+
void closeEvent(QCloseEvent *event) override;
7878

7979
bool eventFilter(QObject *obj, QEvent *event) override;
8080

0 commit comments

Comments
 (0)