diff options
| author |  Chris Xiong <chirs241097@gmail.com>
| 2019-05-25 22:40:15 +0800 |
|---|---|---|
| committer | Chris Xiong <chirs241097@gmail.com>
| 2019-05-25 22:40:15 +0800 |
| commit | 3f72121ac41741d53e4916f1275cbd4f93259c4d (patch) | |
| tree | 15bba079c86de0e241812cd657ad190eb0c2c41a /qmidiplayer-desktop/qdialskulpturestyle.cpp | |
| parent | eba45fdf11a98113b439db0510b55f14845db8fb (diff) | |
| download | QMidiPlayer-3f72121ac41741d53e4916f1275cbd4f93259c4d.tar.xz | |
Massive code refactor en cours!
Less complain from compilers:
- use nullptr instead of NULL
- use types for event fields
- explicit type casting added
Stop saving parameters of meta events in p1/p2 fields of SEvent.
callback_t now uses std::function, deprecating ICallback.
Not recommended for daily usage, or even testing: the code refactor
is still a work in progress.
Diffstat (limited to 'qmidiplayer-desktop/qdialskulpturestyle.cpp')
| -rw-r--r-- | qmidiplayer-desktop/qdialskulpturestyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmidiplayer-desktop/qdialskulpturestyle.cpp b/qmidiplayer-desktop/qdialskulpturestyle.cpp index ba9e03f..33c80de 100644 --- a/qmidiplayer-desktop/qdialskulpturestyle.cpp +++ b/qmidiplayer-desktop/qdialskulpturestyle.cpp @@ -386,12 +386,12 @@ QDialSkulptureStyle::drawComplexControl( ComplexControl cc, } const QStyleOptionSlider *option = qstyleoption_cast<const QStyleOptionSlider *>(optc); - if (option == NULL) + if (option == nullptr) return; int d = qMin(option->rect.width() & ~1, option->rect.height() & ~1); QStyleOptionSlider opt = *option; - const QAbstractSlider *slider = NULL; + const QAbstractSlider *slider = nullptr; // always highlight knob if pressed (even if mouse is not over knob) if ((option->state & QStyle::State_HasFocus) && (slider = qobject_cast<const QAbstractSlider *>(widget))) { if (slider->isSliderDown()) { |