From 7ffad288197b2519c260fca238211ae5d6af1f85 Mon Sep 17 00:00:00 2001
From: laserpants <johannes@isomorphic.co>
Date: Tue, 21 Jun 2016 15:26:59 +0300
Subject: [PATCH] make sure all animations have a parent

---
 components/snackbar.cpp          |  1 +
 components/snackbar_internal.cpp | 10 +++++-----
 components/snackbar_internal.h   |  2 +-
 components/snackbar_p.h          | 12 ++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/components/snackbar.cpp b/components/snackbar.cpp
index 5b1251f..82e12b5 100644
--- a/components/snackbar.cpp
+++ b/components/snackbar.cpp
@@ -7,6 +7,7 @@
 
 SnackbarPrivate::SnackbarPrivate(Snackbar *q)
     : q_ptr(q),
+      machine(0),
       duration(3000),
       boxWidth(300)
 {
diff --git a/components/snackbar_internal.cpp b/components/snackbar_internal.cpp
index b301154..f8e492f 100644
--- a/components/snackbar_internal.cpp
+++ b/components/snackbar_internal.cpp
@@ -9,7 +9,7 @@ SnackbarStateMachine::SnackbarStateMachine(Snackbar *parent)
       snackbar(parent),
       _offset(0)
 {
-    timer.setSingleShot(true);
+    _timer.setSingleShot(true);
 
     QState *hiddenState = new QState;
     QState *visibleState = new QState;
@@ -50,7 +50,7 @@ SnackbarStateMachine::SnackbarStateMachine(Snackbar *parent)
 
     QPropertyAnimation *animation;
 
-    animation = new QPropertyAnimation(this, "offset");
+    animation = new QPropertyAnimation(this, "offset", this);
     animation->setEasingCurve(QEasingCurve::OutCubic);
     animation->setDuration(400);
     addDefaultAnimation(animation);
@@ -59,8 +59,8 @@ SnackbarStateMachine::SnackbarStateMachine(Snackbar *parent)
     visibleState->assignProperty(this, "offset", 0);
     finalState->assignProperty(this, "offset", 1);
 
-    connect(&timer, SIGNAL(timeout()), this, SIGNAL(hideSnackbar()));
-    connect(this, SIGNAL(hideSnackbar()), &timer, SLOT(stop()));
+    connect(&_timer, SIGNAL(timeout()), this, SIGNAL(hideSnackbar()));
+    connect(this, SIGNAL(hideSnackbar()), &_timer, SLOT(stop()));
 }
 
 SnackbarStateMachine::~SnackbarStateMachine()
@@ -85,5 +85,5 @@ void SnackbarStateMachine::snackbarHidden()
 
 void SnackbarStateMachine::snackbarShown()
 {
-    timer.start(snackbar->autoHideDuration());
+    _timer.start(snackbar->autoHideDuration());
 }
diff --git a/components/snackbar_internal.h b/components/snackbar_internal.h
index f2e24b0..35e0a05 100644
--- a/components/snackbar_internal.h
+++ b/components/snackbar_internal.h
@@ -33,7 +33,7 @@ private:
     Q_DISABLE_COPY(SnackbarStateMachine)
 
     Snackbar *const snackbar;
-    QTimer           timer;
+    QTimer          _timer;
     qreal           _offset;
 };
 
diff --git a/components/snackbar_p.h b/components/snackbar_p.h
index 4f80ac1..2f11b9c 100644
--- a/components/snackbar_p.h
+++ b/components/snackbar_p.h
@@ -18,13 +18,13 @@ public:
 
     void init();
 
-    Snackbar *const q_ptr;
+    Snackbar             *const q_ptr;
     SnackbarStateMachine *machine;
-    QColor backgroundColor;
-    QColor textColor;
-    QList<QString> messages;
-    int duration;
-    int boxWidth;
+    QColor                backgroundColor;
+    QColor                textColor;
+    QList<QString>        messages;
+    int                   duration;
+    int                   boxWidth;
 };
 
 #endif // SNACKBAR_P_H