diff --git a/UI/comboBox-ignorewheel.cpp b/UI/comboBox-ignorewheel.cpp index 2e8103c17..704907a98 100644 --- a/UI/comboBox-ignorewheel.cpp +++ b/UI/comboBox-ignorewheel.cpp @@ -5,7 +5,7 @@ ComboBoxIgnoreScroll::ComboBoxIgnoreScroll(QWidget *parent) : QComboBox(parent) setFocusPolicy(Qt::StrongFocus); } -void ComboBoxIgnoreScroll::wheelEvent(QWheelEvent * event) +void ComboBoxIgnoreScroll::wheelEvent(QWheelEvent *event) { if (!hasFocus()) event->ignore(); diff --git a/UI/comboBox-ignorewheel.hpp b/UI/comboBox-ignorewheel.hpp index 0d9155a3b..479e1bb85 100644 --- a/UI/comboBox-ignorewheel.hpp +++ b/UI/comboBox-ignorewheel.hpp @@ -4,7 +4,6 @@ #include #include - class ComboBoxIgnoreScroll : public QComboBox { Q_OBJECT @@ -12,8 +11,5 @@ public: ComboBoxIgnoreScroll(QWidget *parent = nullptr); protected: - virtual void wheelEvent(QWheelEvent *event) override; }; - - diff --git a/UI/slider-ignorewheel.cpp b/UI/slider-ignorewheel.cpp index 325f88244..f2708e97e 100644 --- a/UI/slider-ignorewheel.cpp +++ b/UI/slider-ignorewheel.cpp @@ -13,7 +13,7 @@ SliderIgnoreScroll::SliderIgnoreScroll(Qt::Orientation orientation, setOrientation(orientation); } -void SliderIgnoreScroll::wheelEvent(QWheelEvent * event) +void SliderIgnoreScroll::wheelEvent(QWheelEvent *event) { if (!hasFocus()) event->ignore(); diff --git a/UI/slider-ignorewheel.hpp b/UI/slider-ignorewheel.hpp index d0217eb11..7778c90fd 100644 --- a/UI/slider-ignorewheel.hpp +++ b/UI/slider-ignorewheel.hpp @@ -4,9 +4,6 @@ #include #include - - - class SliderIgnoreScroll : public QSlider { Q_OBJECT @@ -15,8 +12,5 @@ public: SliderIgnoreScroll(Qt::Orientation orientation, QWidget *parent = nullptr); protected: - virtual void wheelEvent(QWheelEvent *event) override; }; - - diff --git a/UI/spinBox-ignorewheel.cpp b/UI/spinBox-ignorewheel.cpp index 549236d64..4fd126faa 100644 --- a/UI/spinBox-ignorewheel.cpp +++ b/UI/spinBox-ignorewheel.cpp @@ -5,7 +5,7 @@ SpinBoxIgnoreScroll::SpinBoxIgnoreScroll(QWidget *parent) : QSpinBox(parent) setFocusPolicy(Qt::StrongFocus); } -void SpinBoxIgnoreScroll::wheelEvent(QWheelEvent * event) +void SpinBoxIgnoreScroll::wheelEvent(QWheelEvent *event) { if (!hasFocus()) event->ignore(); diff --git a/UI/spinBox-ignorewheel.hpp b/UI/spinBox-ignorewheel.hpp index eee7ac974..535197ebf 100644 --- a/UI/spinBox-ignorewheel.hpp +++ b/UI/spinBox-ignorewheel.hpp @@ -4,7 +4,6 @@ #include #include - class SpinBoxIgnoreScroll : public QSpinBox { Q_OBJECT @@ -12,8 +11,5 @@ public: SpinBoxIgnoreScroll(QWidget *parent = nullptr); protected: - virtual void wheelEvent(QWheelEvent *event) override; }; - - diff --git a/UI/volume-control.cpp b/UI/volume-control.cpp index 6ed8d841f..684a3e954 100644 --- a/UI/volume-control.cpp +++ b/UI/volume-control.cpp @@ -504,12 +504,12 @@ void VolumeMeter::setPeakMeterType(enum obs_peak_meter_type peakMeterType) } } -void VolumeMeter::mousePressEvent(QMouseEvent * event) +void VolumeMeter::mousePressEvent(QMouseEvent *event) { setFocus(Qt::MouseFocusReason); } -void VolumeMeter::wheelEvent(QWheelEvent * event) +void VolumeMeter::wheelEvent(QWheelEvent *event) { QApplication::sendEvent(focusProxy(), event); }