More cleanup

20 files changed, 33 insertions, 23 deletions

diff --git a/src/declarative/extra/qbindablemap.h b/src/declarative/extra/qbindablemap.h
index c76928d..aa1908e 100644
--- a/src/declarative/extra/qbindablemap.h
+++ b/src/declarative/extra/qbindablemap.h
@@ -48,7 +48,6 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -80,8 +79,8 @@ private:
     friend class QBindableMapMetaObject;
 };
 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/extra/qfxanimatedimageitem.h b/src/declarative/extra/qfxanimatedimageitem.h
index 5d115d7..e59a8c7 100644
--- a/src/declarative/extra/qfxanimatedimageitem.h
+++ b/src/declarative/extra/qfxanimatedimageitem.h
@@ -44,12 +44,12 @@
 
 #include <QtDeclarative/qfximage.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QMovie;
 class QFxAnimatedImageItemPrivate;
 
@@ -90,11 +90,10 @@ private:
     Q_DISABLE_COPY(QFxAnimatedImageItem)
     Q_DECLARE_PRIVATE(QFxAnimatedImageItem)
 };
-
 QML_DECLARE_TYPE(QFxAnimatedImageItem)
 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/extra/qfxblendedimage.h b/src/declarative/extra/qfxblendedimage.h
index 248cc9d..f16d543 100644
--- a/src/declarative/extra/qfxblendedimage.h
+++ b/src/declarative/extra/qfxblendedimage.h
@@ -103,8 +103,8 @@ private:
 };
 QML_DECLARE_TYPE(QFxBlendedImage)
 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
 #endif // QFXBLENDEDIMAGE_H
diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index 77cd6df..e3b79f5 100644
--- a/src/declarative/extra/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
@@ -376,6 +376,6 @@ void QFxFlowView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
 QML_DEFINE_TYPE(QFxFlowView,FlowView);
 
-#include "qfxflowview.moc"
-
 QT_END_NAMESPACE
+
+#include "qfxflowview.moc"
diff --git a/src/declarative/extra/qfxflowview.h b/src/declarative/extra/qfxflowview.h
index 0e7c2d3..0693d6e 100644
--- a/src/declarative/extra/qfxflowview.h
+++ b/src/declarative/extra/qfxflowview.h
@@ -50,6 +50,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxVisualItemModel;
 class QFxFlowViewValue;
 class QFxFlowViewAttached;
diff --git a/src/declarative/extra/qfxintegermodel.cpp b/src/declarative/extra/qfxintegermodel.cpp
index 53814cd..437073e 100644
--- a/src/declarative/extra/qfxintegermodel.cpp
+++ b/src/declarative/extra/qfxintegermodel.cpp
@@ -41,8 +41,8 @@
 
 #include "qfxintegermodel.h"
 
-
 QT_BEGIN_NAMESPACE
+
 QML_DEFINE_TYPE(QFxIntegerModel, IntegerModel)
 
 class QFxIntegerModelPrivate
diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qfxintegermodel.h
index 43504d8..7c522f8 100644
--- a/src/declarative/extra/qfxintegermodel.h
+++ b/src/declarative/extra/qfxintegermodel.h
@@ -46,12 +46,12 @@
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qlistmodelinterface.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QFxIntegerModelPrivate;
 class Q_DECLARATIVE_EXPORT QFxIntegerModel : public QListModelInterface
 {
@@ -79,8 +79,8 @@ private:
 
 QML_DECLARE_TYPE(QFxIntegerModel)
 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/extra/qmlbehaviour.cpp b/src/declarative/extra/qmlbehaviour.cpp
index 4beca5e..4165d56 100644
--- a/src/declarative/extra/qmlbehaviour.cpp
+++ b/src/declarative/extra/qmlbehaviour.cpp
@@ -254,6 +254,6 @@ void QmlBehaviour::classComplete()
     d->context->deactivate();
 }
 
-#include "qmlbehaviour.moc"
-
 QT_END_NAMESPACE
+
+#include "qmlbehaviour.moc"
diff --git a/src/declarative/extra/qmlbehaviour.h b/src/declarative/extra/qmlbehaviour.h
index 7cc83b2..967d3aa 100644
--- a/src/declarative/extra/qmlbehaviour.h
+++ b/src/declarative/extra/qmlbehaviour.h
@@ -51,6 +51,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QmlAbstractAnimation;
 class QmlBehaviourPrivate;
 class Q_DECLARATIVE_EXPORT QmlBehaviour : public QmlPropertyValueSource, 
diff --git a/src/declarative/extra/qmldatetimeformatter.cpp b/src/declarative/extra/qmldatetimeformatter.cpp
index ad0e473..158431a 100644
--- a/src/declarative/extra/qmldatetimeformatter.cpp
+++ b/src/declarative/extra/qmldatetimeformatter.cpp
@@ -44,6 +44,7 @@
 #include <QtCore/qlocale.h>
 
 QT_BEGIN_NAMESPACE
+
 //TODO: may need optimisation as the QDateTime member may not be needed?
 //      be able to set a locale?
 
@@ -365,4 +366,5 @@ void QmlDateTimeFormatter::classComplete()
 }
 
 QML_DEFINE_TYPE(QmlDateTimeFormatter, DateTimeFormatter)
+
 QT_END_NAMESPACE
diff --git a/src/declarative/extra/qmldatetimeformatter.h b/src/declarative/extra/qmldatetimeformatter.h
index 84b27e3..c4f1362 100644
--- a/src/declarative/extra/qmldatetimeformatter.h
+++ b/src/declarative/extra/qmldatetimeformatter.h
@@ -50,6 +50,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QmlDateTimeFormatterPrivate;
 class Q_DECLARATIVE_EXPORT QmlDateTimeFormatter : public QObject, public QmlParserStatus
 {
@@ -105,7 +106,6 @@ private:
     Q_DISABLE_COPY(QmlDateTimeFormatter)
     Q_DECLARE_PRIVATE(QmlDateTimeFormatter)
 };
-
 QML_DECLARE_TYPE(QmlDateTimeFormatter)
 
 QT_END_NAMESPACE
diff --git a/src/declarative/extra/qmlnumberformatter.cpp b/src/declarative/extra/qmlnumberformatter.cpp
index 1549525..b24f2d8 100644
--- a/src/declarative/extra/qmlnumberformatter.cpp
+++ b/src/declarative/extra/qmlnumberformatter.cpp
@@ -42,8 +42,8 @@
 #include "qmlnumberformatter.h"
 #include "private/qobject_p.h"
 
-
 QT_BEGIN_NAMESPACE
+
 //TODO: set locale
 //      docs
 //      this is a wrapper around qnumberformat (test integration)
@@ -210,6 +210,6 @@ void QmlNumberFormatter::classComplete()
     d->classComplete = true;
     d->updateText();
 }
-
 QML_DEFINE_TYPE(QmlNumberFormatter, NumberFormatter);
+
 QT_END_NAMESPACE
diff --git a/src/declarative/extra/qmlnumberformatter.h b/src/declarative/extra/qmlnumberformatter.h
index e4efc03..24af8c0 100644
--- a/src/declarative/extra/qmlnumberformatter.h
+++ b/src/declarative/extra/qmlnumberformatter.h
@@ -45,12 +45,12 @@
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qnumberformat.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QmlNumberFormatterPrivate;
 class Q_DECLARATIVE_EXPORT QmlNumberFormatter : public QObject, public QmlParserStatus
 {
@@ -85,8 +85,8 @@ private:
 
 QML_DECLARE_TYPE(QmlNumberFormatter)
 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/extra/qmlsqlconnection.h b/src/declarative/extra/qmlsqlconnection.h
index ede8bcb..0fcb183 100644
--- a/src/declarative/extra/qmlsqlconnection.h
+++ b/src/declarative/extra/qmlsqlconnection.h
@@ -50,6 +50,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
+
 class QSqlDatabase;
 class QmlSqlConnectionPrivate;
 class Q_DECLARATIVE_EXPORT QmlSqlConnection : public QObject, public QmlParserStatus
@@ -112,5 +113,6 @@ QML_DECLARE_TYPE(QmlSqlConnection)
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
 #endif // QMLXMLLISTMODEL_H
 
diff --git a/src/declarative/extra/qmlsqlquery.cpp b/src/declarative/extra/qmlsqlquery.cpp
index 2b11774..d9d9760 100644
--- a/src/declarative/extra/qmlsqlquery.cpp
+++ b/src/declarative/extra/qmlsqlquery.cpp
@@ -55,6 +55,7 @@
 #include <QTimerEvent>
 
 QT_BEGIN_NAMESPACE
+
 QML_DEFINE_TYPE(QmlSqlBind, SqlBind)
 QML_DEFINE_TYPE(QmlSqlQuery, SqlQuery)
 
@@ -790,4 +791,5 @@ void QmlSqlQueryPrivate::grabRoles() const
         roles.append(i);
     }
 }
+
 QT_END_NAMESPACE
diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h
index 06ade08..72e6560f 100644
--- a/src/declarative/extra/qmlsqlquery.h
+++ b/src/declarative/extra/qmlsqlquery.h
@@ -140,5 +140,6 @@ QML_DECLARE_TYPE(QmlSqlQuery)
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
 #endif
 
diff --git a/src/declarative/extra/qmltimer.h b/src/declarative/extra/qmltimer.h
index 8171385..2a73e65 100644
--- a/src/declarative/extra/qmltimer.h
+++ b/src/declarative/extra/qmltimer.h
@@ -48,6 +48,7 @@
 #include <QtDeclarative/qml.h>
 
 QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -95,5 +96,7 @@ private Q_SLOTS:
 QML_DECLARE_TYPE(QmlTimer)
 
 QT_END_NAMESPACE
+
 QT_END_HEADER
+
 #endif
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index 082c9c2..48949b3 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -61,7 +61,6 @@ QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(XmlListModelRole, XmlRole)
 QML_DEFINE_TYPE(QmlXmlListModel, XmlListModel)
 
-
 class QmlXmlListModelPrivate;
 struct QmlXmlRoleList : public QmlConcreteList<XmlListModelRole *>
 {
@@ -643,6 +642,6 @@ void QmlXmlListModel::queryCompleted(int id, int size)
     }
 }
 
-#include "qmlxmllistmodel.moc"
-
 QT_END_NAMESPACE
+
+#include "qmlxmllistmodel.moc"
diff --git a/src/declarative/extra/qnumberformat.cpp b/src/declarative/extra/qnumberformat.cpp
index 424c125..d317c27 100644
--- a/src/declarative/extra/qnumberformat.cpp
+++ b/src/declarative/extra/qnumberformat.cpp
@@ -41,8 +41,8 @@
 
 #include "qnumberformat.h"
 
-
 QT_BEGIN_NAMESPACE
+
 QML_DEFINE_TYPE(QNumberFormat,NumberFormat)
 
 QNumberFormat::QNumberFormat(QObject *parent) : QObject(parent), _number(0), _type(Decimal),
@@ -221,4 +221,5 @@ QString QNumberFormat::formatDecimal(const QString &formatDec, const QString &de
     }
     return outputDecimal;
 }
+
 QT_END_NAMESPACE
diff --git a/src/declarative/extra/qnumberformat.h b/src/declarative/extra/qnumberformat.h
index fba9872..92f89da 100644
--- a/src/declarative/extra/qnumberformat.h
+++ b/src/declarative/extra/qnumberformat.h
@@ -165,8 +165,8 @@ private:
 };
 QML_DECLARE_TYPE(QNumberFormat)
 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
+
 #endif