Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/gamecontroller/gamecontrollertrigger.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/gamecontrollerexample.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/aboutdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class AboutDialog : public QDialog

protected:
void fillInfoTextBrowser();
virtual void changeEvent(QEvent *event);
void changeEvent(QEvent *event) override;
void retranslateUi();
};

Expand Down
2 changes: 1 addition & 1 deletion src/gui/addeditautoprofiledialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class AddEditAutoProfileDialog : public QDialog
QList<QString> const &getReservedUniques();

protected:
virtual void accept();
void accept() override;

signals:
void captureFinished();
Expand Down
4 changes: 2 additions & 2 deletions src/gui/axisvaluebox.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/buttoneditdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/gui/editalldefaultautoprofiledialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class EditAllDefaultAutoProfileDialog : public QDialog
AntiMicroSettings *getSettings() const;

protected:
virtual void accept();
void accept() override;

private:
Ui::EditAllDefaultAutoProfileDialog *ui;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/flashbuttonwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/gui/joytabwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/gui/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/gui/qkeydisplaydialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/gui/simplekeygrabberbutton.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/slotitemlistwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class SlotItemListWidget : public QListWidget
void insertItems(int row, QList<QListWidgetItem *> items);

protected:
virtual void keyPressEvent(QKeyEvent *event);
void keyPressEvent(QKeyEvent *event) override;
};

#endif // SLOTITEMLISTWIDGET_H
6 changes: 3 additions & 3 deletions src/joycontrolstickstatusbox.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/keyboard/virtualkeyboardmousewidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/sensors/joygyroscopesensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Loading