Support compile-in-namespace for the declarative module.

39 files changed, 132 insertions, 102 deletions

diff --git a/src/declarative/fx/qfxanchors.h b/src/declarative/fx/qfxanchors.h
index 94c22a6..dcd5d79 100644
--- a/src/declarative/fx/qfxanchors.h
+++ b/src/declarative/fx/qfxanchors.h
@@ -77,8 +77,6 @@ public:
     AnchorLine anchorLine;
 };
 
-Q_DECLARE_METATYPE(QFxAnchorLine)
-
 class QFxAnchorsPrivate;
 class Q_DECLARATIVE_EXPORT QFxAnchors : public QObject
 {
@@ -186,10 +184,12 @@ private:
     Q_DISABLE_COPY(QFxAnchors)
     Q_DECLARE_PRIVATE(QFxAnchors)
 };
-QML_DECLARE_TYPE(QFxAnchors)
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QFxAnchorLine)
+QML_DECLARE_TYPE(QFxAnchors)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/fx/qfxblurfilter.h b/src/declarative/fx/qfxblurfilter.h
index 90285de..830663f 100644
--- a/src/declarative/fx/qfxblurfilter.h
+++ b/src/declarative/fx/qfxblurfilter.h
@@ -45,12 +45,12 @@
 #include <QtDeclarative/qsimplecanvasfilter.h>
 #include <QtDeclarative/qml.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxBlurFilterPrivate;
 class Q_DECLARATIVE_EXPORT QFxBlurFilter : public QSimpleCanvasFilter
 {
@@ -73,10 +73,11 @@ protected:
 private:
     QFxBlurFilterPrivate *d;
 };
-QML_DECLARE_TYPE(QFxBlurFilter)
-
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxBlurFilter)
+
 QT_END_HEADER
+
 #endif // QFXBLURFILTER_H
diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h
index e749272..f3bf6b3 100644
--- a/src/declarative/fx/qfxcomponentinstance.h
+++ b/src/declarative/fx/qfxcomponentinstance.h
@@ -44,12 +44,12 @@
 
 #include <QtDeclarative/qfxitem.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxComponentInstancePrivate;
 class Q_DECLARATIVE_EXPORT QFxComponentInstance : public QFxItem
 {
@@ -80,10 +80,11 @@ protected:
 private:
     Q_DECLARE_PRIVATE(QFxComponentInstance)
 };
-QML_DECLARE_TYPE(QFxComponentInstance)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxComponentInstance)
+
 QT_END_HEADER
 
 #endif // QFXCOMPONENTINSTANCE_H
diff --git a/src/declarative/fx/qfxcontentwrapper.h b/src/declarative/fx/qfxcontentwrapper.h
index d8fe0b8..9a9a89c 100644
--- a/src/declarative/fx/qfxcontentwrapper.h
+++ b/src/declarative/fx/qfxcontentwrapper.h
@@ -44,12 +44,12 @@
 
 #include <QtDeclarative/qfxitem.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxContentWrapperPrivate;
 class Q_DECLARATIVE_EXPORT QFxContentWrapper : public QFxItem
 {
@@ -73,7 +73,6 @@ protected:
 private:
     Q_DECLARE_PRIVATE(QFxContentWrapper)
 };
-QML_DECLARE_TYPE(QFxContentWrapper)
 
 class Q_DECLARATIVE_EXPORT QFxContent : public QFxItem
 {
@@ -81,10 +80,12 @@ class Q_DECLARATIVE_EXPORT QFxContent : public QFxItem
 public:
     QFxContent(QFxItem *parent=0) : QFxItem(parent) {}
 };
-QML_DECLARE_TYPE(QFxContent)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxContentWrapper)
+QML_DECLARE_TYPE(QFxContent)
+
 QT_END_HEADER
 
 #endif // QFXCONTENTWRAPPER_H
diff --git a/src/declarative/fx/qfxevents_p.h b/src/declarative/fx/qfxevents_p.h
index 60494e6..fbf0c5f 100644
--- a/src/declarative/fx/qfxevents_p.h
+++ b/src/declarative/fx/qfxevents_p.h
@@ -89,8 +89,6 @@ private:
     QKeyEvent event;
 };
 
-QML_DECLARE_TYPE(QFxKeyEvent)
-
 class QFxMouseEvent : public QObject
 {
     Q_OBJECT
@@ -131,8 +129,9 @@ private:
     bool _accepted;
 };
 
-QML_DECLARE_TYPE(QFxMouseEvent)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxKeyEvent)
+QML_DECLARE_TYPE(QFxMouseEvent)
+
 #endif // QFXEVENTS_P_H
diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h
index 2c858bc..da38df8 100644
--- a/src/declarative/fx/qfxflickable.h
+++ b/src/declarative/fx/qfxflickable.h
@@ -44,12 +44,12 @@
 
 #include <QtDeclarative/qfxitem.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxFlickablePrivate;
 class Q_DECLARATIVE_EXPORT QFxFlickable : public QFxItem
 {
@@ -186,10 +186,11 @@ private:
     Q_DISABLE_COPY(QFxFlickable)
     Q_DECLARE_PRIVATE(QFxFlickable)
 };
-QML_DECLARE_TYPE(QFxFlickable)
-
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxFlickable)
+
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp
index 9595724..7672858 100644
--- a/src/declarative/fx/qfxflipable.cpp
+++ b/src/declarative/fx/qfxflipable.cpp
@@ -44,6 +44,8 @@
 #include "qfxtransform.h"
 #include <QtDeclarative/qmlinfo.h>
 
+QT_BEGIN_NAMESPACE
+
 QML_DEFINE_TYPE(QFxFlipable,Flipable)
 
 class QFxFlipablePrivate : public QFxItemPrivate
diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h
index 6630633..06f8b93 100644
--- a/src/declarative/fx/qfxflipable.h
+++ b/src/declarative/fx/qfxflipable.h
@@ -97,10 +97,11 @@ private:
     Q_DISABLE_COPY(QFxFlipable)
     Q_DECLARE_PRIVATE(QFxFlipable)
 };
-QML_DECLARE_TYPE(QFxFlipable)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxFlipable)
+
 QT_END_HEADER
 
 #endif // QFXFLIPABLE_H
diff --git a/src/declarative/fx/qfxfocuspanel.h b/src/declarative/fx/qfxfocuspanel.h
index 60f9118..623c9fb 100644
--- a/src/declarative/fx/qfxfocuspanel.h
+++ b/src/declarative/fx/qfxfocuspanel.h
@@ -44,12 +44,12 @@
 
 #include <QtDeclarative/qfxitem.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class Q_DECLARATIVE_EXPORT QFxFocusPanel : public QFxItem
 {
     Q_OBJECT
@@ -72,10 +72,10 @@ private:
     Q_DISABLE_COPY(QFxFocusPanel)
 };
 
-QML_DECLARE_TYPE(QFxFocusPanel)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxFocusPanel)
+
 QT_END_HEADER
 
 #endif // QFXFOCUSPANEL_H
diff --git a/src/declarative/fx/qfxfocusrealm.h b/src/declarative/fx/qfxfocusrealm.h
index d2aadce..20fc5ad 100644
--- a/src/declarative/fx/qfxfocusrealm.h
+++ b/src/declarative/fx/qfxfocusrealm.h
@@ -44,12 +44,12 @@
 
 #include <QtDeclarative/qfxitem.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class Q_DECLARATIVE_EXPORT QFxFocusRealm : public QFxItem
 {
     Q_OBJECT
@@ -58,10 +58,10 @@ public:
     virtual ~QFxFocusRealm();
 };
 
-QML_DECLARE_TYPE(QFxFocusRealm)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxFocusRealm)
+
 QT_END_HEADER
 
 #endif // QFXFOCUSREALM_H
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h
index 19c21c4..b6d585e 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qfxgridview.h
@@ -139,10 +139,10 @@ private:
     void refill();
 };
 
-QML_DECLARE_TYPE(QFxGridView)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxGridView)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/fx/qfxhighlightfilter.h b/src/declarative/fx/qfxhighlightfilter.h
index 33f0963..56509a3 100644
--- a/src/declarative/fx/qfxhighlightfilter.h
+++ b/src/declarative/fx/qfxhighlightfilter.h
@@ -45,12 +45,12 @@
 #include <QtDeclarative/qsimplecanvasfilter.h>
 #include <QtDeclarative/qml.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxHighlightFilterPrivate;
 class Q_DECLARATIVE_EXPORT QFxHighlightFilter : public QSimpleCanvasFilter
 {
@@ -89,10 +89,11 @@ protected:
 private:
     QFxHighlightFilterPrivate *d;
 };
-QML_DECLARE_TYPE(QFxHighlightFilter)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxHighlightFilter)
+
 QT_END_HEADER
 
 #endif // QFXHIGHLIGHTFILTER_H
diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h
index 35b921a..3071a9e 100644
--- a/src/declarative/fx/qfximage.h
+++ b/src/declarative/fx/qfximage.h
@@ -120,10 +120,11 @@ private:
     Q_DECLARE_PRIVATE(QFxImage)
     void setGridScaledImage(const QFxGridScaledImage& sci);
 };
-QML_DECLARE_TYPE(QFxImage)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxImage)
+
 QT_END_HEADER
 
 #endif // QFXIMAGE_H
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 1c35290..7ccad5f 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -133,7 +133,9 @@ QFxContents::QFxContents() : m_height(0), m_width(0)
 
     The contents properties allow an item access to the size of its
     children. This property is useful if you have an item that needs to be
-    sized to fit its children.
+    sized to fit its children.    
+*/
+
 /*!
     \property QFxContents::height
     \brief The height of the contents.
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index 67a4553..2b45f73 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -86,7 +86,6 @@ private:
     qreal m_height;
     qreal m_width;
 };
-QML_DECLARE_TYPE(QFxContents)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QFxAnchors::UsedAnchors)
 
 class QmlState;
@@ -266,12 +265,13 @@ private:
     Q_DISABLE_COPY(QFxItem)
     Q_DECLARE_PRIVATE(QFxItem)
 };
-QML_DECLARE_TYPE(QFxItem)
-
-QML_DECLARE_TYPE(QSimpleCanvasFilter)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxContents)
+QML_DECLARE_TYPE(QFxItem)
+QML_DECLARE_TYPE(QSimpleCanvasFilter)
+
 QT_END_HEADER
 
 #endif // QFXITEM_H
diff --git a/src/declarative/fx/qfxkeyactions.h b/src/declarative/fx/qfxkeyactions.h
index cea992a..91c2806 100644
--- a/src/declarative/fx/qfxkeyactions.h
+++ b/src/declarative/fx/qfxkeyactions.h
@@ -47,12 +47,12 @@
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qfxitem.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxKeyActionsPrivate;
 class Q_DECLARATIVE_EXPORT QFxKeyActions : public QFxItem
 {
@@ -310,10 +310,10 @@ private:
     QFxKeyActionsPrivate *d;
 };
 
-QML_DECLARE_TYPE(QFxKeyActions)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxKeyActions)
+
 QT_END_HEADER
 
 #endif // QFXKEYACTIONS_H
diff --git a/src/declarative/fx/qfxkeyproxy.h b/src/declarative/fx/qfxkeyproxy.h
index 38cff7a..d075295 100644
--- a/src/declarative/fx/qfxkeyproxy.h
+++ b/src/declarative/fx/qfxkeyproxy.h
@@ -49,6 +49,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxKeyProxyPrivate;
 class Q_DECLARATIVE_EXPORT QFxKeyProxy : public QFxItem
 {
@@ -69,10 +70,10 @@ private:
     QFxKeyProxyPrivate *d;
 };
 
-QML_DECLARE_TYPE(QFxKeyProxy)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxKeyProxy)
+
 QT_END_HEADER
 
 #endif // QFXKEYPROXY_H
diff --git a/src/declarative/fx/qfxlayouts.h b/src/declarative/fx/qfxlayouts.h
index b119d6f..112fe85 100644
--- a/src/declarative/fx/qfxlayouts.h
+++ b/src/declarative/fx/qfxlayouts.h
@@ -128,7 +128,6 @@ protected Q_SLOTS:
 private:
     Q_DISABLE_COPY(QFxVerticalLayout)
 };
-QML_DECLARE_TYPE(QFxVerticalLayout)
 
 class Q_DECLARATIVE_EXPORT QFxHorizontalLayout: public QFxBaseLayout
 {
@@ -140,7 +139,6 @@ protected Q_SLOTS:
 private:
     Q_DISABLE_COPY(QFxHorizontalLayout)
 };
-QML_DECLARE_TYPE(QFxHorizontalLayout)
 
 class Q_DECLARATIVE_EXPORT QFxGridLayout : public QFxBaseLayout
 {
@@ -163,9 +161,13 @@ private:
     int _columns;
     Q_DISABLE_COPY(QFxGridLayout)
 };
-QML_DECLARE_TYPE(QFxGridLayout)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxVerticalLayout)
+QML_DECLARE_TYPE(QFxHorizontalLayout)
+QML_DECLARE_TYPE(QFxGridLayout)
+
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h
index 5dfb0e4..6e9451e 100644
--- a/src/declarative/fx/qfxlistview.h
+++ b/src/declarative/fx/qfxlistview.h
@@ -44,12 +44,12 @@
 
 #include <QtDeclarative/qfxflickable.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxVisualItemModel;
 class QFxListViewPrivate;
 class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable
@@ -145,10 +145,10 @@ private Q_SLOTS:
     void destroyingItem(QFxItem *item);
 };
 
-QML_DECLARE_TYPE(QFxListView)
-
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxListView)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qfxmouseregion.h
index d7db1dc..429ad00 100644
--- a/src/declarative/fx/qfxmouseregion.h
+++ b/src/declarative/fx/qfxmouseregion.h
@@ -86,7 +86,6 @@ private:
     int _ymax;
     Q_DISABLE_COPY(QFxDrag)
 };
-QML_DECLARE_TYPE(QFxDrag)
 
 class QFxMouseEvent;
 class QFxMouseRegionPrivate;
@@ -154,10 +153,12 @@ private:
     Q_DISABLE_COPY(QFxMouseRegion)
     Q_DECLARE_PRIVATE(QFxMouseRegion)
 };
-QML_DECLARE_TYPE(QFxMouseRegion)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxDrag)
+QML_DECLARE_TYPE(QFxMouseRegion)
+
 QT_END_HEADER
 
 #endif // QFXMOUSEREGION_H
diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h
index 6cb8fe7..7a0a9a9 100644
--- a/src/declarative/fx/qfxpainteditem.h
+++ b/src/declarative/fx/qfxpainteditem.h
@@ -101,10 +101,11 @@ private:
     Q_DISABLE_COPY(QFxPaintedItem)
     Q_DECLARE_PRIVATE(QFxPaintedItem)
 };
-QML_DECLARE_TYPE(QFxPaintedItem)
-
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxPaintedItem)
+
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h
index b3a569b..cfaffa7 100644
--- a/src/declarative/fx/qfxparticles.h
+++ b/src/declarative/fx/qfxparticles.h
@@ -66,7 +66,6 @@ public:
     virtual void created(QFxParticle &);
     virtual void destroy(QFxParticle &);
 };
-QML_DECLARE_TYPE(QFxParticleMotion)
 
 class Q_DECLARATIVE_EXPORT QFxParticleMotionLinear : public QFxParticleMotion
 {
@@ -77,7 +76,6 @@ public:
 
     virtual void advance(QFxParticle &, int interval);
 };
-QML_DECLARE_TYPE(QFxParticleMotionLinear)
 
 class Q_DECLARATIVE_EXPORT QFxParticleMotionGravity : public QFxParticleMotion
 {
@@ -106,7 +104,6 @@ private:
     int _yAttr;
     qreal _accel;
 };
-QML_DECLARE_TYPE(QFxParticleMotionGravity)
 
 class Q_DECLARATIVE_EXPORT QFxParticleMotionWander : public QFxParticleMotion
 {
@@ -146,7 +143,6 @@ private:
     qreal _yvariance;
     qreal _pace;
 };
-QML_DECLARE_TYPE(QFxParticleMotionWander)
 
 class QFxParticlesPrivate;
 class Q_DECLARATIVE_EXPORT QFxParticles : public QFxItem
@@ -231,10 +227,15 @@ private:
     Q_DISABLE_COPY(QFxParticles)
     Q_DECLARE_PRIVATE(QFxParticles)
 };
-QML_DECLARE_TYPE(QFxParticles)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxParticleMotion)
+QML_DECLARE_TYPE(QFxParticleMotionLinear)
+QML_DECLARE_TYPE(QFxParticleMotionGravity)
+QML_DECLARE_TYPE(QFxParticleMotionWander)
+QML_DECLARE_TYPE(QFxParticles)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/declarative/fx/qfxpath.h b/src/declarative/fx/qfxpath.h
index 39b9d01..04d24c6 100644
--- a/src/declarative/fx/qfxpath.h
+++ b/src/declarative/fx/qfxpath.h
@@ -61,7 +61,6 @@ public:
 Q_SIGNALS:
     void changed();
 };
-QML_DECLARE_TYPE(QFxPathElement)
 
 class Q_DECLARATIVE_EXPORT QFxPathAttribute : public QFxPathElement
 {
@@ -83,7 +82,6 @@ private:
     QString _name;
     qreal _value;
 };
-QML_DECLARE_TYPE(QFxPathAttribute)
 
 class Q_DECLARATIVE_EXPORT QFxCurve : public QFxPathElement
 {
@@ -106,7 +104,6 @@ private:
     qreal _x;
     qreal _y;
 };
-QML_DECLARE_TYPE(QFxCurve)
 
 class Q_DECLARATIVE_EXPORT QFxPathLine : public QFxCurve
 {
@@ -116,7 +113,6 @@ public:
 
     void addToPath(QPainterPath &path);
 };
-QML_DECLARE_TYPE(QFxPathLine)
 
 class Q_DECLARATIVE_EXPORT QFxPathQuad : public QFxCurve
 {
@@ -139,7 +135,6 @@ private:
     qreal _controlX;
     qreal _controlY;
 };
-QML_DECLARE_TYPE(QFxPathQuad)
 
 class Q_DECLARATIVE_EXPORT QFxPathCubic : public QFxCurve
 {
@@ -172,7 +167,6 @@ private:
     int _control2X;
     int _control2Y;
 };
-QML_DECLARE_TYPE(QFxPathCubic)
 
 class Q_DECLARATIVE_EXPORT QFxPathPercent : public QFxPathElement
 {
@@ -187,7 +181,6 @@ public:
 private:
     qreal _value;
 };
-QML_DECLARE_TYPE(QFxPathPercent)
 
 class QFxPathPrivate;
 class Q_DECLARATIVE_EXPORT QFxPath : public QObject, public QmlParserStatus
@@ -249,9 +242,18 @@ private:
     Q_DISABLE_COPY(QFxPath)
     Q_DECLARE_PRIVATE(QFxPath)
 };
-QML_DECLARE_TYPE(QFxPath)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxPathElement)
+QML_DECLARE_TYPE(QFxPathAttribute)
+QML_DECLARE_TYPE(QFxCurve)
+QML_DECLARE_TYPE(QFxPathLine)
+QML_DECLARE_TYPE(QFxPathQuad)
+QML_DECLARE_TYPE(QFxPathCubic)
+QML_DECLARE_TYPE(QFxPathPercent)
+QML_DECLARE_TYPE(QFxPath)
+
 QT_END_HEADER
+
 #endif // QFXPATH_H
diff --git a/src/declarative/fx/qfxpathview.h b/src/declarative/fx/qfxpathview.h
index cbdafa8..159c865 100644
--- a/src/declarative/fx/qfxpathview.h
+++ b/src/declarative/fx/qfxpathview.h
@@ -127,10 +127,11 @@ private:
     Q_DISABLE_COPY(QFxPathView)
     Q_DECLARE_PRIVATE(QFxPathView)
 };
-QML_DECLARE_TYPE(QFxPathView)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxPathView)
+
 QT_END_HEADER
 
 #endif // QFXPATHVIEW_H
diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h
index df490b0..2b35d8d 100644
--- a/src/declarative/fx/qfxrect.h
+++ b/src/declarative/fx/qfxrect.h
@@ -77,7 +77,6 @@ private:
     QColor _color;
     bool _valid;
 };
-QML_DECLARE_TYPE(QFxPen)
 
 class Q_DECLARATIVE_EXPORT QFxGradientStop : public QObject
 {
@@ -102,7 +101,6 @@ private:
     qreal m_position;
     QColor m_color;
 };
-QML_DECLARE_TYPE(QFxGradientStop)
 
 class Q_DECLARATIVE_EXPORT QFxGradient : public QObject
 {
@@ -130,7 +128,6 @@ private:
     mutable QGradient *m_gradient;
     friend class QFxGradientStop;
 };
-QML_DECLARE_TYPE(QFxGradient)
 
 class QFxRectPrivate;
 class Q_DECLARATIVE_EXPORT QFxRect : public QFxItem
@@ -184,10 +181,14 @@ private:
     Q_DISABLE_COPY(QFxRect)
     Q_DECLARE_PRIVATE(QFxRect)
 };
-QML_DECLARE_TYPE(QFxRect)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxPen)
+QML_DECLARE_TYPE(QFxGradientStop)
+QML_DECLARE_TYPE(QFxGradient)
+QML_DECLARE_TYPE(QFxRect)
+
 QT_END_HEADER
 
 #endif // QFXRECT_H
diff --git a/src/declarative/fx/qfxreflectionfilter.h b/src/declarative/fx/qfxreflectionfilter.h
index 6e56b5e..d862040 100644
--- a/src/declarative/fx/qfxreflectionfilter.h
+++ b/src/declarative/fx/qfxreflectionfilter.h
@@ -87,10 +87,11 @@ private:
     Q_DISABLE_COPY(QFxReflectionFilter)
     QFxReflectionFilterPrivate *d;
 };
-QML_DECLARE_TYPE(QFxReflectionFilter)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxReflectionFilter)
+
 QT_END_HEADER
 
 #endif // QFXREFLECTIONFILTER_H
diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qfxrepeater.h
index c1b194a..b82b9b0 100644
--- a/src/declarative/fx/qfxrepeater.h
+++ b/src/declarative/fx/qfxrepeater.h
@@ -44,12 +44,12 @@
 
 #include <QtDeclarative/qfxitem.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxRepeaterPrivate;
 class Q_DECLARATIVE_EXPORT QFxRepeater : public QFxItem
 {
@@ -80,10 +80,11 @@ private:
     Q_DISABLE_COPY(QFxRepeater)
     Q_DECLARE_PRIVATE(QFxRepeater)
 };
-QML_DECLARE_TYPE(QFxRepeater)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxRepeater)
+
 QT_END_HEADER
 
-#endif // _QFXREPEATER_H_
+#endif // QFXREPEATER_H
diff --git a/src/declarative/fx/qfxscalegrid.h b/src/declarative/fx/qfxscalegrid.h
index c59cb32..03b2dd3 100644
--- a/src/declarative/fx/qfxscalegrid.h
+++ b/src/declarative/fx/qfxscalegrid.h
@@ -110,10 +110,11 @@ private:
     int _b;
     QString _pix;
 };
-QML_DECLARE_TYPE(QFxScaleGrid)
-
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxScaleGrid)
+
 QT_END_HEADER
+
 #endif // QFXSCALEGRID_H
diff --git a/src/declarative/fx/qfxshadowfilter.cpp b/src/declarative/fx/qfxshadowfilter.cpp
index 10c332c..d37d565 100644
--- a/src/declarative/fx/qfxshadowfilter.cpp
+++ b/src/declarative/fx/qfxshadowfilter.cpp
@@ -47,9 +47,9 @@
 #include <glbasicshaders.h>
 #endif
 
-class QFxShadowFilterPrivate
-
 QT_BEGIN_NAMESPACE
+
+class QFxShadowFilterPrivate
 {
 public:
     QFxShadowFilterPrivate()
diff --git a/src/declarative/fx/qfxshadowfilter.h b/src/declarative/fx/qfxshadowfilter.h
index 67d165a..1cbe54f 100644
--- a/src/declarative/fx/qfxshadowfilter.h
+++ b/src/declarative/fx/qfxshadowfilter.h
@@ -77,10 +77,11 @@ protected:
 private:
     QFxShadowFilterPrivate *d;
 };
-QML_DECLARE_TYPE(QFxShadowFilter)
-
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxShadowFilter)
+
 QT_END_HEADER
-#endif // _QFXSHADOWFILTER_H_
+
+#endif // QFXSHADOWFILTER_H
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index b929a6f..1f5a7b8 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -143,10 +143,11 @@ private:
     Q_DISABLE_COPY(QFxText)
     Q_DECLARE_PRIVATE(QFxText)
 };
-QML_DECLARE_TYPE(QFxText)
-
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxText)
+
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index b761a1b..24ba3fe 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -202,10 +202,11 @@ private:
     Q_DISABLE_COPY(QFxTextEdit)
     Q_DECLARE_PRIVATE(QFxTextEdit)
 };
-QML_DECLARE_TYPE(QFxTextEdit)
-
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxTextEdit)
+
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp
index a4c5d22..2c4f842 100644
--- a/src/declarative/fx/qfxtransform.cpp
+++ b/src/declarative/fx/qfxtransform.cpp
@@ -46,11 +46,11 @@
 
 #include <math.h>
 #ifndef M_PI
-
-QT_BEGIN_NAMESPACE
 #define M_PI 3.14159265358979323846
 #endif
 
+QT_BEGIN_NAMESPACE
+
 QML_DEFINE_NOCREATE_TYPE(QFxTransform);
 
 /*!
diff --git a/src/declarative/fx/qfxtransform.h b/src/declarative/fx/qfxtransform.h
index 7be8adc..8693e7b 100644
--- a/src/declarative/fx/qfxtransform.h
+++ b/src/declarative/fx/qfxtransform.h
@@ -67,7 +67,6 @@ public:
     virtual bool isIdentity() const;
     virtual QSimpleCanvas::Matrix transform() const;
 };
-QML_DECLARE_TYPE(QFxTransform)
 
 class Q_DECLARATIVE_EXPORT QFxAxis : public QObject
 {
@@ -107,7 +106,6 @@ private:
     qreal _endY;
     qreal _endZ;
 };
-QML_DECLARE_TYPE(QFxAxis)
 
 class Q_DECLARATIVE_EXPORT QFxRotation : public QFxTransform
 {
@@ -145,7 +143,6 @@ private:
     mutable bool _dirty;
     mutable QSimpleCanvas::Matrix _transform;
 };
-QML_DECLARE_TYPE(QFxRotation)
 
 class Q_DECLARATIVE_EXPORT QFxRotation3D : public QFxTransform
 {
@@ -174,7 +171,6 @@ private:
     mutable bool _dirty;
     mutable QSimpleCanvas::Matrix _transform;
 };
-QML_DECLARE_TYPE(QFxRotation3D)
 
 class Q_DECLARATIVE_EXPORT QFxTranslation3D : public QFxTransform
 {
@@ -203,7 +199,6 @@ private:
     mutable bool _dirty;
     mutable QSimpleCanvas::Matrix _transform;
 };
-QML_DECLARE_TYPE(QFxTranslation3D)
 
 class Q_DECLARATIVE_EXPORT QFxPerspective : public QFxTransform
 {
@@ -244,7 +239,6 @@ private:
     qreal _angle;
     qreal _aspect;
 };
-QML_DECLARE_TYPE(QFxPerspective)
 
 class Q_DECLARATIVE_EXPORT QFxSquish : public QFxTransform
 {
@@ -310,10 +304,17 @@ private:
     QSizeF s;
     QPointF p1, p2, p3, p4;
 };
-QML_DECLARE_TYPE(QFxSquish)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxTransform)
+QML_DECLARE_TYPE(QFxAxis)
+QML_DECLARE_TYPE(QFxRotation)
+QML_DECLARE_TYPE(QFxRotation3D)
+QML_DECLARE_TYPE(QFxTranslation3D)
+QML_DECLARE_TYPE(QFxPerspective)
+QML_DECLARE_TYPE(QFxSquish)
+
 QT_END_HEADER
 
 #endif // QFXTRANSFORM_H
diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp
index c60a379..d3ab4cc 100644
--- a/src/declarative/fx/qfxvisualitemmodel.cpp
+++ b/src/declarative/fx/qfxvisualitemmodel.cpp
@@ -52,9 +52,9 @@
 #include "qmllistaccessor.h"
 #include "qfxvisualitemmodel.h"
 
+QML_DECLARE_TYPE(QListModelInterface)
 
 QT_BEGIN_NAMESPACE
-QML_DECLARE_TYPE(QListModelInterface)
 
 class QFxVisualItemModelParts;
 class QFxVisualItemModelData;
diff --git a/src/declarative/fx/qfxvisualitemmodel.h b/src/declarative/fx/qfxvisualitemmodel.h
index 968cc2e..9cacde4 100644
--- a/src/declarative/fx/qfxvisualitemmodel.h
+++ b/src/declarative/fx/qfxvisualitemmodel.h
@@ -123,10 +123,11 @@ private Q_SLOTS:
 private:
     Q_DISABLE_COPY(QFxVisualItemModel)
 };
-QML_DECLARE_TYPE(QFxVisualItemModel)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxVisualItemModel)
+
 QT_END_HEADER
 
 #endif // QFXVISUALITEMMODEL_H
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index f4a06ce..3ab64bc 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -1010,6 +1010,6 @@ QObject *QFxWebPage::createPlugin(const QString &, const QUrl &url, const QStrin
     return new QWidget_Dummy_Plugin(comp,view(),paramNames,paramValues);
 }
 
-#include "qfxwebview.moc"
-
 QT_END_NAMESPACE
+
+#include "qfxwebview.moc"
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index 0ac1895..f5fd721 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -49,14 +49,14 @@
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtWebKit/QWebPage>
 
-
 QT_BEGIN_HEADER
 
+class QWebHistory;
+class QWebSettings;
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
-class QWebHistory;
-class QWebSettings;
 class QFxWebViewPrivate;
 class QNetworkRequest;
 class QFxWebView;
@@ -206,10 +206,11 @@ private:
     Q_DISABLE_COPY(QFxWebView)
     Q_DECLARE_PRIVATE(QFxWebView)
 };
-QML_DECLARE_TYPE(QFxWebView)
-
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxWebView)
+
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/fx/qfxwidgetcontainer.h b/src/declarative/fx/qfxwidgetcontainer.h
index cc36010..862a280 100644
--- a/src/declarative/fx/qfxwidgetcontainer.h
+++ b/src/declarative/fx/qfxwidgetcontainer.h
@@ -72,10 +72,11 @@ protected:
 private:
     QGraphicsWidget         *_graphicsWidget;
 };
-QML_DECLARE_TYPE(QFxWidgetContainer)
 
 QT_END_NAMESPACE
 
+QML_DECLARE_TYPE(QFxWidgetContainer)
+
 QT_END_HEADER
 
 #endif // QFXGRAPHICSWIDGET_H