Styles: use C++11 default member initialization

Change-Id: Ifd7521b8a7bfd7da91808dd00ebdcb59f2ba46dc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

8 files changed, 49 insertions, 74 deletions

diff --git a/src/imports/controls/material/qquickmaterialbusyindicator.cpp b/src/imports/controls/material/qquickmaterialbusyindicator.cpp
index 0a4191be..c18a4005 100644
--- a/src/imports/controls/material/qquickmaterialbusyindicator.cpp
+++ b/src/imports/controls/material/qquickmaterialbusyindicator.cpp
@@ -77,21 +77,16 @@ protected:
     void updateCurrentTime(int time) override;
 
 private:
-    int m_lastStartAngle;
-    int m_lastEndAngle;
-    qreal m_width;
-    qreal m_height;
-    qreal m_devicePixelRatio;
+    int m_lastStartAngle = 0;
+    int m_lastEndAngle = 0;
+    qreal m_width = 0;
+    qreal m_height = 0;
+    qreal m_devicePixelRatio = 1;
     QColor m_color;
 };
 
 QQuickMaterialBusyIndicatorNode::QQuickMaterialBusyIndicatorNode(QQuickMaterialBusyIndicator *item)
-    : QQuickAnimatedNode(item),
-      m_lastStartAngle(0),
-      m_lastEndAngle(0),
-      m_width(0),
-      m_height(0),
-      m_devicePixelRatio(1)
+    : QQuickAnimatedNode(item)
 {
     setLoopCount(Infinite);
     setCurrentTime(item->elapsed());
@@ -179,7 +174,7 @@ void QQuickMaterialBusyIndicatorNode::sync(QQuickItem *item)
 }
 
 QQuickMaterialBusyIndicator::QQuickMaterialBusyIndicator(QQuickItem *parent) :
-    QQuickItem(parent), m_elapsed(0), m_color(Qt::black)
+    QQuickItem(parent)
 {
     setFlag(ItemHasContents);
 }
diff --git a/src/imports/controls/material/qquickmaterialbusyindicator_p.h b/src/imports/controls/material/qquickmaterialbusyindicator_p.h
index 6c6d2445..d29427c1 100644
--- a/src/imports/controls/material/qquickmaterialbusyindicator_p.h
+++ b/src/imports/controls/material/qquickmaterialbusyindicator_p.h
@@ -75,8 +75,8 @@ protected:
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
 
 private:
-    int m_elapsed;
-    QColor m_color;
+    int m_elapsed = 0;
+    QColor m_color = Qt::black;
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/controls/material/qquickmaterialprogressbar.cpp b/src/imports/controls/material/qquickmaterialprogressbar.cpp
index c1d36d3b..4635c57b 100644
--- a/src/imports/controls/material/qquickmaterialprogressbar.cpp
+++ b/src/imports/controls/material/qquickmaterialprogressbar.cpp
@@ -62,14 +62,12 @@ public:
 private:
     void moveNode(QSGTransformNode *node, const QRectF &geometry, qreal progress);
 
-    bool m_indeterminate;
-    QEasingCurve m_easing;
+    bool m_indeterminate = false;
+    QEasingCurve m_easing = QEasingCurve::OutCubic;
 };
 
 QQuickMaterialProgressBarNode::QQuickMaterialProgressBarNode(QQuickMaterialProgressBar *item)
-    : QQuickAnimatedNode(item),
-      m_indeterminate(false),
-      m_easing(QEasingCurve::OutCubic)
+    : QQuickAnimatedNode(item)
 {
     setLoopCount(Infinite);
     setDuration(TotalDuration);
@@ -176,7 +174,7 @@ void QQuickMaterialProgressBarNode::moveNode(QSGTransformNode *transformNode, co
 }
 
 QQuickMaterialProgressBar::QQuickMaterialProgressBar(QQuickItem *parent)
-    : QQuickItem(parent), m_color(Qt::black), m_progress(0.0), m_indeterminate(false)
+    : QQuickItem(parent)
 {
     setFlag(ItemHasContents);
 }
diff --git a/src/imports/controls/material/qquickmaterialprogressbar_p.h b/src/imports/controls/material/qquickmaterialprogressbar_p.h
index 981d9bfb..680f36a4 100644
--- a/src/imports/controls/material/qquickmaterialprogressbar_p.h
+++ b/src/imports/controls/material/qquickmaterialprogressbar_p.h
@@ -77,9 +77,9 @@ protected:
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
 
 private:
-    QColor m_color;
-    qreal m_progress;
-    bool m_indeterminate;
+    QColor m_color = Qt::black;
+    qreal m_progress = 0.0;
+    bool m_indeterminate = false;
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/controls/material/qquickmaterialripple.cpp b/src/imports/controls/material/qquickmaterialripple.cpp
index 1c3b3f12..e6287ff9 100644
--- a/src/imports/controls/material/qquickmaterialripple.cpp
+++ b/src/imports/controls/material/qquickmaterialripple.cpp
@@ -64,20 +64,16 @@ public:
     void sync(QQuickItem *item) override;
 
 private:
-    qreal m_from;
-    qreal m_to;
-    qreal m_value;
-    WavePhase m_phase;
+    qreal m_from = 0;
+    qreal m_to = 0;
+    qreal m_value = 0;
+    WavePhase m_phase = WaveEnter;
     QPointF m_anchor;
     QRectF m_bounds;
 };
 
 QQuickMaterialRippleWaveNode::QQuickMaterialRippleWaveNode(QQuickMaterialRipple *ripple)
-    : QQuickAnimatedNode(ripple),
-      m_from(0),
-      m_to(0),
-      m_value(0),
-      m_phase(WaveEnter)
+    : QQuickAnimatedNode(ripple)
 {
     start(qRound(1000.0 * qSqrt(ripple->diameter() / 2.0 / WAVE_TOUCH_DOWN_ACCELERATION)));
 
@@ -156,12 +152,11 @@ public:
     void sync(QQuickItem *item) override;
 
 private:
-    bool m_active;
+    bool m_active = false;
 };
 
 QQuickMaterialRippleBackgroundNode::QQuickMaterialRippleBackgroundNode(QQuickMaterialRipple *ripple)
-    : QQuickAnimatedNode(ripple),
-      m_active(false)
+    : QQuickAnimatedNode(ripple)
 {
     setDuration(OPACITY_ENTER_DURATION_FAST);
 
@@ -221,14 +216,7 @@ void QQuickMaterialRippleBackgroundNode::sync(QQuickItem *item)
 }
 
 QQuickMaterialRipple::QQuickMaterialRipple(QQuickItem *parent)
-    : QQuickItem(parent),
-      m_active(false),
-      m_pressed(false),
-      m_waves(0),
-      m_enterDelay(0),
-      m_trigger(Press),
-      m_clipRadius(0.0),
-      m_anchor(nullptr)
+    : QQuickItem(parent)
 {
     setFlag(ItemHasContents);
 }
diff --git a/src/imports/controls/material/qquickmaterialripple_p.h b/src/imports/controls/material/qquickmaterialripple_p.h
index 712697da..8a80113b 100644
--- a/src/imports/controls/material/qquickmaterialripple_p.h
+++ b/src/imports/controls/material/qquickmaterialripple_p.h
@@ -101,14 +101,14 @@ protected:
     void exitWave();
 
 private:
-    bool m_active;
-    bool m_pressed;
-    int m_waves;
-    int m_enterDelay;
-    Trigger m_trigger;
-    qreal m_clipRadius;
+    bool m_active = false;
+    bool m_pressed = false;
+    int m_waves = 0;
+    int m_enterDelay = 0;
+    Trigger m_trigger = Press;
+    qreal m_clipRadius = 0.0;
     QColor m_color;
-    QQuickItem *m_anchor;
+    QQuickItem *m_anchor = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 08d88ec7..4dd4e128 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -427,11 +427,6 @@ static QQuickMaterialStyle::Theme effectiveTheme(QQuickMaterialStyle::Theme them
 }
 
 QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedObject(parent),
-    m_explicitTheme(false),
-    m_explicitPrimary(false),
-    m_explicitAccent(false),
-    m_explicitForeground(false),
-    m_explicitBackground(false),
     m_customPrimary(globalPrimaryCustom),
     m_customAccent(globalAccentCustom),
     m_customForeground(globalForegroundCustom),
@@ -442,8 +437,7 @@ QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedObject
     m_primary(globalPrimary),
     m_accent(globalAccent),
     m_foreground(globalForeground),
-    m_background(globalBackground),
-    m_elevation(0)
+    m_background(globalBackground)
 {
     init();
 }
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 2374eefb..6008b1e0 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -249,31 +249,31 @@ private:
 
     // These reflect whether a color value was explicitly set on the specific
     // item that this attached style object represents.
-    bool m_explicitTheme;
-    bool m_explicitPrimary;
-    bool m_explicitAccent;
-    bool m_explicitForeground;
-    bool m_explicitBackground;
+    bool m_explicitTheme = false;
+    bool m_explicitPrimary = false;
+    bool m_explicitAccent = false;
+    bool m_explicitForeground = false;
+    bool m_explicitBackground = false;
     // These reflect whether the color value that was either inherited or
     // explicitly set is in the form that QColor expects, rather than one of
     // our pre-defined color enum values.
-    bool m_customPrimary;
-    bool m_customAccent;
-    bool m_customForeground;
-    bool m_customBackground;
+    bool m_customPrimary = false;
+    bool m_customAccent = false;
+    bool m_customForeground = false;
+    bool m_customBackground = false;
     // These will be true when this item has an explicit or inherited foreground/background
     // color, or these colors were declared globally via settings (e.g. conf or env vars).
     // Some color properties of the style will return different values depending on whether
     // or not these are set.
-    bool m_hasForeground;
-    bool m_hasBackground;
+    bool m_hasForeground = false;
+    bool m_hasBackground = false;
     // The actual values for this item, whether explicit, inherited or globally set.
-    Theme m_theme;
-    uint m_primary;
-    uint m_accent;
-    uint m_foreground;
-    uint m_background;
-    int m_elevation;
+    Theme m_theme = Light;
+    uint m_primary = 0;
+    uint m_accent = 0;
+    uint m_foreground = 0;
+    uint m_background = 0;
+    int m_elevation = 0;
 };
 
 QT_END_NAMESPACE