diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-23 04:17:55 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-23 04:17:55 (GMT) |
commit | 4fe8f2ab89ace6e617a81c5e8568c3830135da20 (patch) | |
tree | 900e99845dee1d8717d2a816133971ed3c5653c8 /src/declarative/util/qmlstateoperations.cpp | |
parent | b95cf9eccc4a84036c7b5d1443e598d3db2f2d70 (diff) | |
download | Qt-4fe8f2ab89ace6e617a81c5e8568c3830135da20.zip Qt-4fe8f2ab89ace6e617a81c5e8568c3830135da20.tar.gz Qt-4fe8f2ab89ace6e617a81c5e8568c3830135da20.tar.bz2 |
Stop using QGuard
This should allow QGuard to be removed from Qt and QObjectPrivate::ExtraData.
Having QmlGuard inside QmlDeclarativeData reduces the number of new's, and
creating QmlDeclarativeData is faster than QObjectPrivate::ExtraData anyway.
Diffstat (limited to 'src/declarative/util/qmlstateoperations.cpp')
-rw-r--r-- | src/declarative/util/qmlstateoperations.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index ebbb5ee..df25e5b 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -47,6 +47,7 @@ #include <qmlinfo.h> #include <qmlgraphicsanchors_p_p.h> #include <qmlgraphicsitem_p.h> +#include <qmlguard_p.h> #include <QtCore/qdebug.h> #include <QtGui/qgraphicsitem.h> @@ -65,8 +66,8 @@ public: QmlGraphicsItem *target; QmlGraphicsItem *parent; - QGuard<QmlGraphicsItem> origParent; - QGuard<QmlGraphicsItem> origStackBefore; + QmlGuard<QmlGraphicsItem> origParent; + QmlGuard<QmlGraphicsItem> origStackBefore; QmlGraphicsItem *rewindParent; QmlGraphicsItem *rewindStackBefore; |