From aea55d29d2555c5649c13d3bc11bde4799c6bac5 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 3 May 2018 11:23:56 +0200
Subject: 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>
---
 src/quicktemplates2/qquickdial.cpp | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

(limited to 'src/quicktemplates2/qquickdial.cpp')

diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 03aee27e..a4124678 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -96,21 +96,6 @@ class QQuickDialPrivate : public QQuickControlPrivate
     Q_DECLARE_PUBLIC(QQuickDial)
 
 public:
-    QQuickDialPrivate()
-        : from(0),
-          to(1),
-          value(0),
-          position(0),
-          angle(startAngle),
-          stepSize(0),
-          pressed(false),
-          snapMode(QQuickDial::NoSnap),
-          wrap(false),
-          live(true),
-          handle(nullptr)
-    {
-    }
-
     qreal valueAt(qreal position) const;
     qreal snapPosition(qreal position) const;
     qreal positionAt(const QPointF &point) const;
@@ -126,17 +111,17 @@ public:
     void cancelHandle();
     void executeHandle(bool complete = false);
 
-    qreal from;
-    qreal to;
-    qreal value;
-    qreal position;
-    qreal angle;
-    qreal stepSize;
-    bool pressed;
+    qreal from = 0;
+    qreal to = 1;
+    qreal value = 0;
+    qreal position = 0;
+    qreal angle = startAngle;
+    qreal stepSize = 0;
+    bool pressed = false;
     QPointF pressPoint;
-    QQuickDial::SnapMode snapMode;
-    bool wrap;
-    bool live;
+    QQuickDial::SnapMode snapMode = QQuickDial::NoSnap;
+    bool wrap = false;
+    bool live = true;
     QQuickDeferredPointer<QQuickItem> handle;
 };
 
-- 
cgit v1.2.3