From d97256d956ce649df271cb5c7f24029649a061f3 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 23 Sep 2009 11:01:43 +0200
Subject: Make QmlCompositeTypeData a class instead of a struct

This fixes a warning of msvc that apparently doesn't like a struct
(QmlCompositeTypeData) extending a class (QmlRefCount):

"warning C4099: 'QmlCompositeTypeData' : type name first seen
using 'class' now seen using 'struct'"
---
 src/declarative/qml/qmlcomponent.h              | 2 +-
 src/declarative/qml/qmlcompositetypedata_p.h    | 3 ++-
 src/declarative/qml/qmlcompositetypemanager_p.h | 2 +-
 3 files changed, 4 insertions(+), 3 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..3d246cc 100644
--- a/src/declarative/qml/qmlcompositetypedata_p.h
+++ b/src/declarative/qml/qmlcompositetypedata_p.h
@@ -58,8 +58,9 @@
 
 QT_BEGIN_NAMESPACE
 
-struct QmlCompositeTypeData : public QmlRefCount
+class QmlCompositeTypeData : public QmlRefCount
 {
+public
     QmlCompositeTypeData();
     virtual ~QmlCompositeTypeData();
 
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
 {
-- 
cgit v0.12