Simplify QmlDeclarativeData to a single class

1 files changed, 1 insertions, 2 deletions

diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index 60655ae..0424a85 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -106,7 +106,6 @@ public:
 
     QmlExpressionPrivate *expressions;
 
-    QmlSimpleDeclarativeData contextData;
     QObjectList contextObjects;
 
     struct ContextGuard : public QGuard<QObject>
@@ -115,7 +114,7 @@ public:
         ContextGuard &operator=(QObject *obj) {
             (QGuard<QObject>&)*this = obj; return *this;
         }
-        void objectDestroyed(QObject *o) { priv->destroyed(this); }
+        void objectDestroyed(QObject *) { priv->destroyed(this); }
     };
     ContextGuard *idValues;
     int idValueCount;