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, 4 insertions, 5 deletions

diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index 57a3ce2..3f87b2f 100644
--- a/src/declarative/qml/qmlexpression_p.h
+++ b/src/declarative/qml/qmlexpression_p.h
@@ -57,11 +57,10 @@
 
 #include "qmlbasicscript_p.h"
 #include "qmlengine_p.h"
+#include "qmlguard_p.h"
 
 #include <QtScript/qscriptvalue.h>
 
-#include <private/qguard_p.h>
-
 QT_BEGIN_NAMESPACE
 
 class QmlAbstractExpression
@@ -109,15 +108,15 @@ public:
     QString url; // This is a QString for a reason.  QUrls are slooooooow...
     int line;
 
-    struct SignalGuard : public QGuard<QObject> {
+    struct SignalGuard : public QmlGuard<QObject> {
         SignalGuard() : isDuplicate(false), notifyIndex(-1) {}
 
         SignalGuard &operator=(QObject *obj) {
-            QGuard<QObject>::operator=(obj);
+            QmlGuard<QObject>::operator=(obj);
             return *this;
         }
         SignalGuard &operator=(const SignalGuard &o) {
-            QGuard<QObject>::operator=(o);
+            QmlGuard<QObject>::operator=(o);
             isDuplicate = o.isDuplicate;
             notifyIndex = o.notifyIndex;
             return *this;