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

diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index 4488ba1..7f95b8f 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -47,16 +47,15 @@
 #include "qmltypenamescriptclass_p.h"
 #include "qmllistscriptclass_p.h"
 #include "qmlbinding.h"
+#include "qmlguard_p.h"
 
 #include <QtCore/qtimer.h>
 
-#include <private/qguard_p.h>
-
 QT_BEGIN_NAMESPACE
 
 struct ObjectData : public QScriptDeclarativeClass::Object {
     ObjectData(QObject *o, int t) : object(o), type(t) {}
-    QGuard<QObject> object;
+    QmlGuard<QObject> object;
     int type;
 };