summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-12-03 22:59:02 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-12-03 22:59:02 (GMT)
commit5ec35c0756464ec512de0961c2ae41bec39ac2f7 (patch)
tree64b9b84eb003301ac728f174078124a2f99709e1 /src/declarative/util
parent83162e22f9b4d59f7bcf9c2625a627aa7b8a0d03 (diff)
downloadQt-5ec35c0756464ec512de0961c2ae41bec39ac2f7.zip
Qt-5ec35c0756464ec512de0961c2ae41bec39ac2f7.tar.gz
Qt-5ec35c0756464ec512de0961c2ae41bec39ac2f7.tar.bz2
Minor optimizations.
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlanimation_p_p.h16
-rw-r--r--src/declarative/util/qmltransition.cpp7
2 files changed, 12 insertions, 11 deletions
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()