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/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp
index 54a5ca3..588a397 100644
--- a/src/declarative/qml/qmlcontextscriptclass.cpp
+++ b/src/declarative/qml/qmlcontextscriptclass.cpp
@@ -44,14 +44,15 @@
 #include "qmlengine_p.h"
 #include "qmlcontext_p.h"
 #include "qmltypenamescriptclass_p.h"
+#include "qmlguard_p.h"
 
 QT_BEGIN_NAMESPACE
 
 struct ContextData : public QScriptDeclarativeClass::Object {
     ContextData() : isSharedContext(true) {}
     ContextData(QmlContext *c, QObject *o) : context(c), scopeObject(o), isSharedContext(false) {}
-    QGuard<QmlContext> context;
-    QGuard<QObject> scopeObject;
+    QmlGuard<QmlContext> context;
+    QmlGuard<QObject> scopeObject;
     bool isSharedContext;
 
     QmlContext *getContext(QmlEngine *engine) {