From 9cdc5c42f5f036368cb1db6825e67c024fe276fc Mon Sep 17 00:00:00 2001
From: laserpants <johannes@isomorphic.co>
Date: Tue, 21 Jun 2016 16:21:44 +0300
Subject: [PATCH] move object construction to initialization list

---
 lib/checkable.cpp | 21 ++++++++++-----------
 lib/checkable_p.h | 32 ++++++++++++++++----------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/lib/checkable.cpp b/lib/checkable.cpp
index b4e10bb..53af131 100644
--- a/lib/checkable.cpp
+++ b/lib/checkable.cpp
@@ -5,7 +5,6 @@
 #include <QStateMachine>
 #include <QSignalTransition>
 #include <QEventTransition>
-#include <QPropertyAnimation>
 #include <QApplication>
 #include <QDebug>
 #include "lib/rippleoverlay.h"
@@ -14,8 +13,16 @@
 
 CheckablePrivate::CheckablePrivate(Checkable *q)
     : q_ptr(q),
+      ripple(new RippleOverlay),
       checkedIcon(new CheckableIcon(QIcon("../qt-material-widgets/ic_check_box_black_24px.svg"))),
       uncheckedIcon(new CheckableIcon(QIcon("../qt-material-widgets/ic_check_box_outline_blank_black_24px.svg"))),
+      machine(new QStateMachine),
+      uncheckedState(new QState),
+      checkedState(new QState),
+      disabledUncheckedState(new QState),
+      disabledCheckedState(new QState),
+      uncheckedTransition(new QSignalTransition(q, SIGNAL(toggled(bool)))),
+      checkedTransition(new QSignalTransition(q, SIGNAL(toggled(bool)))),
       useThemeColors(true)
 {
 }
@@ -33,20 +40,14 @@ void CheckablePrivate::init()
     uncheckedIcon->setParent(q);
     checkedIcon->setParent(q);
 
-    ripple = new RippleOverlay(q->parentWidget());
-
     QFont f(q->font());
     f.setPointSizeF(11);
     q->setFont(f);
 
     //
 
-    machine = new QStateMachine(q);
-
-    uncheckedState = new QState;
-    checkedState = new QState;
-    disabledUncheckedState = new QState;
-    disabledCheckedState = new QState;
+    ripple->setParent(q->parentWidget());
+    machine->setParent(q);
 
     machine->addState(uncheckedState);
     machine->addState(checkedState);
@@ -57,13 +58,11 @@ void CheckablePrivate::init()
 
     // Transition to checked
 
-    uncheckedTransition = new QSignalTransition(q, SIGNAL(toggled(bool)));
     uncheckedTransition->setTargetState(checkedState);
     uncheckedState->addTransition(uncheckedTransition);
 
     // Transition to unchecked
 
-    checkedTransition = new QSignalTransition(q, SIGNAL(toggled(bool)));
     checkedTransition->setTargetState(uncheckedState);
     checkedState->addTransition(checkedTransition);
 
diff --git a/lib/checkable_p.h b/lib/checkable_p.h
index 3db4527..33a30a6 100644
--- a/lib/checkable_p.h
+++ b/lib/checkable_p.h
@@ -21,22 +21,22 @@ public:
 
     void init();
 
-    Checkable     *const q_ptr;
-    RippleOverlay *ripple;
-    CheckableIcon *checkedIcon;
-    CheckableIcon *uncheckedIcon;
-    QStateMachine *machine;
-    QState        *uncheckedState;
-    QState        *checkedState;
-    QState        *disabledUncheckedState;
-    QState        *disabledCheckedState;
-    QSignalTransition *uncheckedTransition;
-    QSignalTransition *checkedTransition;
-    QColor         checkedColor;
-    QColor         uncheckedColor;
-    QColor         textColor;
-    QColor         disabledColor;
-    bool           useThemeColors;
+    Checkable         *const q_ptr;
+    RippleOverlay     *const ripple;
+    CheckableIcon     *const checkedIcon;
+    CheckableIcon     *const uncheckedIcon;
+    QStateMachine     *const machine;
+    QState            *const uncheckedState;
+    QState            *const checkedState;
+    QState            *const disabledUncheckedState;
+    QState            *const disabledCheckedState;
+    QSignalTransition *const uncheckedTransition;
+    QSignalTransition *const checkedTransition;
+    QColor                   checkedColor;
+    QColor                   uncheckedColor;
+    QColor                   textColor;
+    QColor                   disabledColor;
+    bool                     useThemeColors;
 };
 
 #endif // CHECKABLE_P_H