From 3137544f13b90abec0997ed7c80d51b83532c3ef Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 30 May 2019 17:02:19 +0000 Subject: [PATCH] QAbstractSliderPrivate cleanup Signed-off-by: Ivailo Monev --- src/gui/widgets/qabstractslider.cpp | 42 ++++++++++++++++++------------------- src/gui/widgets/qabstractslider_p.h | 12 +++++------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp index 3c340d996..16fb7160a 100644 --- a/src/gui/widgets/qabstractslider.cpp +++ b/src/gui/widgets/qabstractslider.cpp @@ -605,27 +605,27 @@ void QAbstractSlider::triggerAction(SliderAction action) Q_D(QAbstractSlider); d->blocktracking = true; switch (action) { - case SliderSingleStepAdd: - setSliderPosition(d->overflowSafeAdd(d->effectiveSingleStep())); - break; - case SliderSingleStepSub: - setSliderPosition(d->overflowSafeAdd(-d->effectiveSingleStep())); - break; - case SliderPageStepAdd: - setSliderPosition(d->overflowSafeAdd(d->pageStep)); - break; - case SliderPageStepSub: - setSliderPosition(d->overflowSafeAdd(-d->pageStep)); - break; - case SliderToMinimum: - setSliderPosition(d->minimum); - break; - case SliderToMaximum: - setSliderPosition(d->maximum); - break; - case SliderMove: - case SliderNoAction: - break; + case SliderSingleStepAdd: + setSliderPosition(d->overflowSafeAdd(d->effectiveSingleStep())); + break; + case SliderSingleStepSub: + setSliderPosition(d->overflowSafeAdd(-d->effectiveSingleStep())); + break; + case SliderPageStepAdd: + setSliderPosition(d->overflowSafeAdd(d->pageStep)); + break; + case SliderPageStepSub: + setSliderPosition(d->overflowSafeAdd(-d->pageStep)); + break; + case SliderToMinimum: + setSliderPosition(d->minimum); + break; + case SliderToMaximum: + setSliderPosition(d->maximum); + break; + case SliderMove: + case SliderNoAction: + break; }; emit actionTriggered(action); d->blocktracking = false; diff --git a/src/gui/widgets/qabstractslider_p.h b/src/gui/widgets/qabstractslider_p.h index aa8cb15d1..8b7388c6f 100644 --- a/src/gui/widgets/qabstractslider_p.h +++ b/src/gui/widgets/qabstractslider_p.h @@ -77,17 +77,17 @@ public: int singleStep; float offset_accumulated; - uint tracking : 1; - uint blocktracking :1; - uint pressed : 1; - uint invertedAppearance : 1; - uint invertedControls : 1; + bool tracking; + bool blocktracking; + bool pressed; + bool invertedAppearance; + bool invertedControls; Qt::Orientation orientation; QBasicTimer repeatActionTimer; int repeatActionTime; QAbstractSlider::SliderAction repeatAction; - + #ifdef QT_KEYPAD_NAVIGATION int origValue; -- 2.11.0