Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 8 insertions, 7 deletions

diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index af250e5..c6924e3 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -106,7 +106,7 @@ private:
     QmlComponent(QmlEngine *, QmlCompiledData *, int, int, QObject *parent);
 
     friend class QmlVME;
-    friend struct QmlCompositeTypeData;
+    friend class QmlCompositeTypeData;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h
index 044b4ca..48c6c2b 100644
--- a/src/declarative/qml/qmlcompositetypedata_p.h
+++ b/src/declarative/qml/qmlcompositetypedata_p.h
@@ -58,12 +58,13 @@
 
 QT_BEGIN_NAMESPACE
 
-struct QmlCompositeTypeData : public QmlRefCount
+class QmlCompositeTypeData : public QmlRefCount
 {
+public:
     QmlCompositeTypeData();
     virtual ~QmlCompositeTypeData();
 
-    enum Status { 
+    enum Status {
         Invalid,
         Complete,
         Error,
@@ -83,8 +84,8 @@ struct QmlCompositeTypeData : public QmlRefCount
 
     QList<QmlCompositeTypeData *> dependants;
 
-    // Return a QmlComponent if the QmlCompositeTypeData is not in the Waiting 
-    // state.  The QmlComponent is owned by the QmlCompositeTypeData, so a 
+    // Return a QmlComponent if the QmlCompositeTypeData is not in the Waiting
+    // state.  The QmlComponent is owned by the QmlCompositeTypeData, so a
     // reference should be kept to keep the QmlComponent alive.
     QmlComponent *toComponent(QmlEngine *);
     // Return a QmlCompiledData if possible, or 0 if an error
@@ -101,7 +102,7 @@ struct QmlCompositeTypeData : public QmlRefCount
 
     QList<TypeReference> types;
 
-    // Add or remove p as a waiter.  When the QmlCompositeTypeData becomes 
+    // Add or remove p as a waiter.  When the QmlCompositeTypeData becomes
     // ready, the QmlComponentPrivate::typeDataReady() method will be invoked on
     // p.  The waiter is automatically removed when the typeDataReady() method
     // is invoked, so there is no need to call remWaiter() in this case.
diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h
index 41cbe80..8f16998 100644
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ b/src/declarative/qml/qmlcompositetypemanager_p.h
@@ -66,7 +66,7 @@ class QmlComponentPrivate;
 class QmlComponent;
 class QmlDomDocument;
 
-struct QmlCompositeTypeData;
+class QmlCompositeTypeData;
 
 class QmlCompositeTypeManager : public QObject
 {