From 5ec35c0756464ec512de0961c2ae41bec39ac2f7 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 4 Dec 2009 08:59:02 +1000
Subject: Minor optimizations.

---
 src/declarative/graphicsitems/qmlgraphicsitem.cpp |  3 ++-
 src/declarative/util/qmlanimation_p_p.h           | 16 ++++++++--------
 src/declarative/util/qmltransition.cpp            |  7 ++++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 1bf1089..a858d87 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -1491,6 +1491,7 @@ QmlGraphicsItem::~QmlGraphicsItem()
     d->dependantAnchors.clear();
     delete d->_anchorLines; d->_anchorLines = 0;
     delete d->_anchors; d->_anchors = 0;
+    delete d->_stateGroup; d->_stateGroup = 0;
 }
 
 /*!
@@ -2620,7 +2621,7 @@ QmlStateGroup *QmlGraphicsItemPrivate::states()
 {
     Q_Q(QmlGraphicsItem);
     if (!_stateGroup) {
-        _stateGroup = new QmlStateGroup(q);
+        _stateGroup = new QmlStateGroup;
         if (!_componentComplete)
             _stateGroup->classBegin();
         QObject::connect(_stateGroup, SIGNAL(stateChanged(QString)),
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
index 326e1c6..e7163c4 100644
--- a/src/declarative/util/qmlanimation_p_p.h
+++ b/src/declarative/util/qmlanimation_p_p.h
@@ -201,14 +201,14 @@ public:
       connectedTimeLine(false), componentComplete(true), startOnCompletion(false),
       target(0), group(0) {}
 
-    bool running;
-    bool paused;
-    bool alwaysRunToEnd;
-    bool repeat;
-    bool connectedTimeLine;
-
-    bool componentComplete;
-    bool startOnCompletion;
+    bool running:1;
+    bool paused:1;
+    bool alwaysRunToEnd:1;
+    bool repeat:1;
+    bool connectedTimeLine:1;
+
+    bool componentComplete:1;
+    bool startOnCompletion:1;
 
     void commence();
 
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index ad79890..9a8b70f4 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -71,7 +71,7 @@ class ParallelAnimationWrapper : public QParallelAnimationGroup
 {
     Q_OBJECT
 public:
-    ParallelAnimationWrapper(QObject *parent) : QParallelAnimationGroup(parent) {}
+    ParallelAnimationWrapper(QObject *parent = 0) : QParallelAnimationGroup(parent) {}
     QmlTransitionPrivate *trans;
 protected:
     virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
@@ -96,8 +96,7 @@ public:
 
     void init()
     {
-        Q_Q(QmlTransition);
-        group = new ParallelAnimationWrapper(q);
+        group = new ParallelAnimationWrapper;
         group->trans = this;
     }
 
@@ -146,6 +145,8 @@ QmlTransition::QmlTransition(QObject *parent)
 
 QmlTransition::~QmlTransition()
 {
+    Q_D(QmlTransition);
+    delete d->group;
 }
 
 void QmlTransition::stop()
-- 
cgit v0.12