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.

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;