Support compile-in-namespace for the declarative module.

13 files changed, 42 insertions, 31 deletions

diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index 110c43e..12212df 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -134,8 +134,6 @@ private Q_SLOTS:
     void timelineComplete();
 };
 
-QML_DECLARE_TYPE(QmlAbstractAnimation)
-
 class QmlPauseAnimationPrivate;
 class QmlPauseAnimation : public QmlAbstractAnimation
 {
@@ -158,7 +156,6 @@ protected:
     virtual QAbstractAnimation *qtAnimation();
     virtual void prepare(QmlMetaProperty &);
 };
-QML_DECLARE_TYPE(QmlPauseAnimation)
 
 class QmlRunScriptActionPrivate;
 class QmlRunScriptAction : public QmlAbstractAnimation
@@ -186,7 +183,6 @@ Q_SIGNALS:
 protected:
     virtual QAbstractAnimation *qtAnimation();
 };
-QML_DECLARE_TYPE(QmlRunScriptAction)
 
 class QmlSetPropertyActionPrivate;
 class QmlSetPropertyAction : public QmlAbstractAnimation
@@ -223,7 +219,6 @@ protected:
     virtual QAbstractAnimation *qtAnimation();
     virtual void prepare(QmlMetaProperty &);
 };
-QML_DECLARE_TYPE(QmlSetPropertyAction)
 
 class QmlParentChangeActionPrivate;
 class QmlParentChangeAction : public QmlAbstractAnimation
@@ -244,7 +239,6 @@ protected:
     virtual QAbstractAnimation *qtAnimation();
     virtual void prepare(QmlMetaProperty &);
 };
-QML_DECLARE_TYPE(QmlParentChangeAction)
 
 class QmlPropertyAnimationPrivate;
 class QmlPropertyAnimation : public QmlAbstractAnimation
@@ -296,7 +290,6 @@ Q_SIGNALS:
     void easingChanged(const QString &);
     void propertiesChanged(const QString &);
 };
-QML_DECLARE_TYPE(QmlPropertyAnimation)
 
 class QmlColorAnimation : public QmlPropertyAnimation
 {
@@ -315,7 +308,6 @@ public:
     QColor to() const;
     void setTo(const QColor &);
 };
-QML_DECLARE_TYPE(QmlColorAnimation)
 
 class QmlNumberAnimation : public QmlPropertyAnimation
 {
@@ -335,7 +327,6 @@ public:
     qreal to() const;
     void setTo(qreal);
 };
-QML_DECLARE_TYPE(QmlNumberAnimation)
 
 class QmlAnimationGroupPrivate;
 class QmlAnimationGroup : public QmlAbstractAnimation
@@ -369,7 +360,6 @@ protected:
     virtual QAbstractAnimation *qtAnimation();
     virtual void prepare(QmlMetaProperty &);
 };
-QML_DECLARE_TYPE(QmlSequentialAnimation)
 
 class QmlParallelAnimation : public QmlAnimationGroup
 {
@@ -387,10 +377,20 @@ protected:
     virtual QAbstractAnimation *qtAnimation();
     virtual void prepare(QmlMetaProperty &);
 };
-QML_DECLARE_TYPE(QmlParallelAnimation)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlAbstractAnimation)
+QML_DECLARE_TYPE(QmlPauseAnimation)
+QML_DECLARE_TYPE(QmlRunScriptAction)
+QML_DECLARE_TYPE(QmlSetPropertyAction)
+QML_DECLARE_TYPE(QmlParentChangeAction)
+QML_DECLARE_TYPE(QmlPropertyAnimation)
+QML_DECLARE_TYPE(QmlColorAnimation)
+QML_DECLARE_TYPE(QmlNumberAnimation)
+QML_DECLARE_TYPE(QmlSequentialAnimation)
+QML_DECLARE_TYPE(QmlParallelAnimation)
+
 QT_END_HEADER
 
 #endif // QMLANIMATION_H
diff --git a/src/declarative/util/qmlbind.h b/src/declarative/util/qmlbind.h
index b7b77f2..731cdf8 100644
--- a/src/declarative/util/qmlbind.h
+++ b/src/declarative/util/qmlbind.h
@@ -82,10 +82,11 @@ public:
 private:
     void eval();
 };
-QML_DECLARE_TYPE(QmlBind)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlBind)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/util/qmlconnection.h b/src/declarative/util/qmlconnection.h
index d61659f..dcaac34 100644
--- a/src/declarative/util/qmlconnection.h
+++ b/src/declarative/util/qmlconnection.h
@@ -81,10 +81,11 @@ private:
     void connectIfValid();
     void componentComplete();
 };
-QML_DECLARE_TYPE(QmlConnection)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlConnection)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h
index 72d6df5..0953f2c 100644
--- a/src/declarative/util/qmlfollow.h
+++ b/src/declarative/util/qmlfollow.h
@@ -92,10 +92,10 @@ Q_SIGNALS:
     void valueChanged(qreal);
 };
 
-QML_DECLARE_TYPE(QmlFollow)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlFollow)
+
 QT_END_HEADER
 
 #endif // QFXFOLLOW_H
diff --git a/src/declarative/util/qmlfont.h b/src/declarative/util/qmlfont.h
index c4c86e2..e85b8d3 100644
--- a/src/declarative/util/qmlfont.h
+++ b/src/declarative/util/qmlfont.h
@@ -83,10 +83,11 @@ public:
 Q_SIGNALS:
     void updated();
 };
-QML_DECLARE_TYPE(QmlFont)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlFont)
+
 QT_END_HEADER
 
 #endif // QMLFONT_H
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 1884e8b..c202a9f 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -49,6 +49,8 @@
 #include <qmlbindablevalue.h>
 #include "qmllistmodel.h"
 
+Q_DECLARE_METATYPE(QListModelInterface *)
+
 QT_BEGIN_NAMESPACE
 
 #define DATA_ROLE_ID 1
@@ -67,8 +69,6 @@ struct ListModelData
     ListInstruction *instructions() const { return (ListInstruction *)((char *)this + sizeof(ListModelData)); }
 };
 
-Q_DECLARE_METATYPE(QListModelInterface *)
-
 /*!
     \qmlclass ListModel 
     \brief The ListModel element defines a free-form list data source.
@@ -243,7 +243,6 @@ struct ModelNode
     ListModel *modelCache;
     ModelObject *objectCache;
 };
-Q_DECLARE_METATYPE(ModelNode *)
 
 ModelObject::ModelObject(ModelNode *node)
 : _node(node), _haveProperties(false), _mo(new QmlOpenMetaObject(this))
@@ -519,7 +518,6 @@ void ListModelParser::setCustomData(QObject *obj, const QByteArray &d)
     }
 }
 
-QML_DECLARE_TYPE(ListModel)
 QML_DEFINE_CUSTOM_TYPE(ListModel, ListModel, ListModelParser)
 
 // ### FIXME
@@ -527,7 +525,6 @@ class ListElement : public QObject
 {
 Q_OBJECT
 };
-QML_DECLARE_TYPE(ListElement)
 QML_DEFINE_TYPE(ListElement,ListElement)
 
 static void dump(ModelNode *node, int ind)
@@ -568,4 +565,8 @@ ModelNode::~ModelNode()
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(ModelNode *)
+QML_DECLARE_TYPE(ListModel)
+QML_DECLARE_TYPE(ListElement)
+
 #include "qmllistmodel.moc"
diff --git a/src/declarative/util/qmlpackage.h b/src/declarative/util/qmlpackage.h
index 9f1d94f..9f7a623 100644
--- a/src/declarative/util/qmlpackage.h
+++ b/src/declarative/util/qmlpackage.h
@@ -77,10 +77,11 @@ public:
 
     static QmlPackageAttached *qmlAttachedProperties(QObject *);
 };
-QML_DECLARE_TYPE(QmlPackage)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlPackage)
+
 QT_END_HEADER
 
 #endif // QMLPACKAGE_H
diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h
index 5b62da5..4ba4f6b 100644
--- a/src/declarative/util/qmlscript.h
+++ b/src/declarative/util/qmlscript.h
@@ -74,10 +74,11 @@ public:
 private Q_SLOTS:
     void replyFinished();
 };
-QML_DECLARE_TYPE(QmlScript)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlScript)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/util/qmlsetproperties.h b/src/declarative/util/qmlsetproperties.h
index 717d0ee..3632816 100644
--- a/src/declarative/util/qmlsetproperties.h
+++ b/src/declarative/util/qmlsetproperties.h
@@ -74,10 +74,11 @@ public:
 
     virtual ActionList actions();
 };
-QML_DECLARE_TYPE(QmlSetProperties)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlSetProperties)
+
 QT_END_HEADER
 
 #endif // QMLSETPROPERTIES_H
diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h
index b219b99..987c7ad 100644
--- a/src/declarative/util/qmlstate.h
+++ b/src/declarative/util/qmlstate.h
@@ -99,7 +99,6 @@ public:
 protected:
     QmlStateOperation(QObjectPrivate &dd, QObject *parent = 0);
 };
-QML_DECLARE_TYPE(QmlStateOperation)
 
 typedef QmlStateOperation::ActionList QmlStateActions;
 
@@ -149,10 +148,12 @@ private:
     Q_DISABLE_COPY(QmlState)
     friend class QmlTransitionPrivate;
 };
-QML_DECLARE_TYPE(QmlState)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlStateOperation)
+QML_DECLARE_TYPE(QmlState)
+
 QT_END_HEADER
 
 #endif // QMLSTATE_H
diff --git a/src/declarative/util/qmlstategroup.h b/src/declarative/util/qmlstategroup.h
index 237b60e..a817bd0 100644
--- a/src/declarative/util/qmlstategroup.h
+++ b/src/declarative/util/qmlstategroup.h
@@ -85,10 +85,11 @@ private:
     friend class QmlState;
     void updateAutoState();
 };
-QML_DECLARE_TYPE(QmlStateGroup)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlStateGroup)
+
 QT_END_HEADER
 
 #endif // QMLSTATEGROUP_H
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h
index c7a6d42..6e5de48 100644
--- a/src/declarative/util/qmlstateoperations.h
+++ b/src/declarative/util/qmlstateoperations.h
@@ -70,7 +70,6 @@ public:
 
     virtual ActionList actions();
 };
-QML_DECLARE_TYPE(QmlParentChange)
 
 class QmlRunScriptPrivate;
 class Q_DECLARATIVE_EXPORT QmlRunScript : public QmlStateOperation, public ActionEvent
@@ -95,7 +94,6 @@ public:
 
     virtual void execute();
 };
-QML_DECLARE_TYPE(QmlRunScript)
 
 class QmlSetPropertyPrivate;
 class Q_DECLARATIVE_EXPORT QmlSetProperty : public QmlStateOperation
@@ -123,10 +121,13 @@ public:
 
     virtual ActionList actions();
 };
-QML_DECLARE_TYPE(QmlSetProperty)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlParentChange)
+QML_DECLARE_TYPE(QmlRunScript)
+QML_DECLARE_TYPE(QmlSetProperty)
+
 QT_END_HEADER
 
 #endif // QMLSTATEOPERATIONS_H
diff --git a/src/declarative/util/qmltransition.h b/src/declarative/util/qmltransition.h
index 4462b4c..d6cd513 100644
--- a/src/declarative/util/qmltransition.h
+++ b/src/declarative/util/qmltransition.h
@@ -88,10 +88,11 @@ public:
     void setReversed(bool r);
     void stop();
 };
-QML_DECLARE_TYPE(QmlTransition)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QmlTransition)
+
 QT_END_HEADER
 
 #endif // QMLTRANSITION_H