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>

1 files changed, 18 insertions, 19 deletions

diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index 7d040ded..f90bb094 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -72,7 +72,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemP
 
 public:
     QQuickControlPrivate();
-    virtual ~QQuickControlPrivate();
+    ~QQuickControlPrivate();
 
     static QQuickControlPrivate *get(QQuickControl *control)
     {
@@ -147,34 +147,33 @@ public:
     virtual void executeBackground(bool complete = false);
 
     struct ExtraData {
-        ExtraData();
         QFont requestedFont;
         QPalette requestedPalette;
     };
     QLazilyAllocated<ExtraData> extra;
 
-    bool hasTopPadding;
-    bool hasLeftPadding;
-    bool hasRightPadding;
-    bool hasBottomPadding;
-    bool hasLocale;
-    bool wheelEnabled;
+    bool hasTopPadding = false;
+    bool hasLeftPadding = false;
+    bool hasRightPadding = false;
+    bool hasBottomPadding = false;
+    bool hasLocale = false;
+    bool wheelEnabled = false;
 #if QT_CONFIG(quicktemplates2_hover)
-    bool hovered;
-    bool explicitHoverEnabled;
+    bool hovered = false;
+    bool explicitHoverEnabled = false;
 #endif
-    int touchId;
-    qreal padding;
-    qreal topPadding;
-    qreal leftPadding;
-    qreal rightPadding;
-    qreal bottomPadding;
-    qreal spacing;
+    int touchId = -1;
+    qreal padding = 0;
+    qreal topPadding = 0;
+    qreal leftPadding = 0;
+    qreal rightPadding = 0;
+    qreal bottomPadding = 0;
+    qreal spacing = 0;
     QLocale locale;
     QFont resolvedFont;
     QPalette resolvedPalette;
-    Qt::FocusPolicy focusPolicy;
-    Qt::FocusReason focusReason;
+    Qt::FocusPolicy focusPolicy = Qt::NoFocus;
+    Qt::FocusReason focusReason = Qt::OtherFocusReason;
     QQuickDeferredPointer<QQuickItem> background;
     QQuickDeferredPointer<QQuickItem> contentItem;
 };