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, 3 deletions

diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index 25f5600..bc8c357 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -65,7 +65,7 @@
 #include <QtCore/qset.h>
 
 #include <private/qobject_p.h>
-#include <private/qguard_p.h>
+#include "qmlguard_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -112,13 +112,13 @@ public:
 
     QmlDeclarativeData *contextObjects;
 
-    struct ContextGuard : public QGuard<QObject>
+    struct ContextGuard : public QmlGuard<QObject>
     {
         ContextGuard() : priv(0), bindings(0) {}
         QmlContextPrivate *priv;
         QmlBinding_Id *bindings;
         ContextGuard &operator=(QObject *obj) {
-            (QGuard<QObject>&)*this = obj; return *this;
+            (QmlGuard<QObject>&)*this = obj; return *this;
         }
         void objectDestroyed(QObject *) { priv->destroyed(this); }
     };