diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-05-03 11:23:56 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-04 12:53:00 +0000 |
commit | aea55d29d2555c5649c13d3bc11bde4799c6bac5 (patch) | |
tree | 52434edff3041005f98b6899566fce119855efae /src/quicktemplates2/qquickscrollindicator.cpp | |
parent | a5d2731b1ec56580a79784759307d3b3c21ab87f (diff) |
Templates: use C++11 default member initialization
The code is more readable and less error-prone (this patch caught a few
uninitialized members) when the members are initialized in the same
place where they are declared. In many cases, empty default destructors
can be entirely removed, and we get faster implicitly declared inline
default constructors defined by the compiler.
Change-Id: I14c5448afc901f9b2ac5965f28c1c26c0b646c08
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickscrollindicator.cpp')
-rw-r--r-- | src/quicktemplates2/qquickscrollindicator.cpp | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/src/quicktemplates2/qquickscrollindicator.cpp b/src/quicktemplates2/qquickscrollindicator.cpp index 511a8311..1e411bce 100644 --- a/src/quicktemplates2/qquickscrollindicator.cpp +++ b/src/quicktemplates2/qquickscrollindicator.cpp @@ -135,32 +135,23 @@ class QQuickScrollIndicatorPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickScrollIndicator) public: - QQuickScrollIndicatorPrivate() - : size(0), - minimumSize(0), - position(0), - active(false), - orientation(Qt::Vertical) - { - } - struct VisualArea { VisualArea(qreal pos, qreal sz) : position(pos), size(sz) { } - qreal position; - qreal size; + qreal position = 0; + qreal size = 0; }; VisualArea visualArea() const; void visualAreaChange(const VisualArea &newVisualArea, const VisualArea &oldVisualArea); void resizeContent() override; - qreal size; - qreal minimumSize; - qreal position; - bool active; - Qt::Orientation orientation; + qreal size = 0; + qreal minimumSize = 0; + qreal position = 0; + bool active = false; + Qt::Orientation orientation = Qt::Vertical; }; QQuickScrollIndicatorPrivate::VisualArea QQuickScrollIndicatorPrivate::visualArea() const @@ -427,13 +418,6 @@ qreal QQuickScrollIndicator::visualPosition() const class QQuickScrollIndicatorAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: - QQuickScrollIndicatorAttachedPrivate() - : flickable(nullptr), - horizontal(nullptr), - vertical(nullptr) - { - } - void activateHorizontal(); void activateVertical(); @@ -445,9 +429,9 @@ public: void itemImplicitHeightChanged(QQuickItem *item) override; void itemDestroyed(QQuickItem *item) override; - QQuickFlickable *flickable; - QQuickScrollIndicator *horizontal; - QQuickScrollIndicator *vertical; + QQuickFlickable *flickable = nullptr; + QQuickScrollIndicator *horizontal = nullptr; + QQuickScrollIndicator *vertical = nullptr; }; void QQuickScrollIndicatorAttachedPrivate::activateHorizontal() |