summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-12 00:59:01 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-12 00:59:01 (GMT)
commitd3f42ead5e9de12dd1f733461ccb1a1298f6966f (patch)
treedb9e8e0b8e1bbcfa0937a1bda04aa3b479845e19 /src
parente0d86a3b3da044c565a34f3a66335e3e977e1d63 (diff)
downloadQt-d3f42ead5e9de12dd1f733461ccb1a1298f6966f.zip
Qt-d3f42ead5e9de12dd1f733461ccb1a1298f6966f.tar.gz
Qt-d3f42ead5e9de12dd1f733461ccb1a1298f6966f.tar.bz2
Fixup headers.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qmlbind.h2
-rw-r--r--src/declarative/util/qmlconnection.h6
-rw-r--r--src/declarative/util/qmldatetimeformatter.h3
-rw-r--r--src/declarative/util/qmlfollow.h8
-rw-r--r--src/declarative/util/qmlfont.h4
-rw-r--r--src/declarative/util/qmllistaccessor.h4
-rw-r--r--src/declarative/util/qmlopenmetaobject.h3
-rw-r--r--src/declarative/util/qmlpackage.h7
-rw-r--r--src/declarative/util/qmlstategroup.h7
9 files changed, 21 insertions, 23 deletions
diff --git a/src/declarative/util/qmlbind.h b/src/declarative/util/qmlbind.h
index 706e202..b7b77f2 100644
--- a/src/declarative/util/qmlbind.h
+++ b/src/declarative/util/qmlbind.h
@@ -51,6 +51,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+
class QmlBindPrivate;
class Q_DECLARATIVE_EXPORT QmlBind : public QObject
{
@@ -86,4 +87,5 @@ QML_DECLARE_TYPE(QmlBind)
QT_END_NAMESPACE
QT_END_HEADER
+
#endif
diff --git a/src/declarative/util/qmlconnection.h b/src/declarative/util/qmlconnection.h
index 57a406b..4350123 100644
--- a/src/declarative/util/qmlconnection.h
+++ b/src/declarative/util/qmlconnection.h
@@ -51,6 +51,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+
class QmlBoundSignal;
class QmlContext;
class QmlConnectionPrivate;
@@ -83,9 +84,8 @@ private:
};
QML_DECLARE_TYPE(QmlConnection)
-#endif
-
-
QT_END_NAMESPACE
QT_END_HEADER
+
+#endif
diff --git a/src/declarative/util/qmldatetimeformatter.h b/src/declarative/util/qmldatetimeformatter.h
index 5d11dab..84b27e3 100644
--- a/src/declarative/util/qmldatetimeformatter.h
+++ b/src/declarative/util/qmldatetimeformatter.h
@@ -45,7 +45,6 @@
#include <QtCore/qdatetime.h>
#include <QtDeclarative/qml.h>
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -109,8 +108,8 @@ private:
QML_DECLARE_TYPE(QmlDateTimeFormatter)
-
QT_END_NAMESPACE
QT_END_HEADER
+
#endif
diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h
index d210592..72d6df5 100644
--- a/src/declarative/util/qmlfollow.h
+++ b/src/declarative/util/qmlfollow.h
@@ -45,12 +45,12 @@
#include <QtDeclarative/qmlpropertyvaluesource.h>
#include <QtDeclarative/qml.h>
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+
class QmlFollowPrivate;
class Q_DECLARATIVE_EXPORT QmlFollow : public QmlPropertyValueSource,
public QmlParserStatus
@@ -94,10 +94,8 @@ Q_SIGNALS:
QML_DECLARE_TYPE(QmlFollow)
-
-#endif // QFXFOLLOW_H
-
-
QT_END_NAMESPACE
QT_END_HEADER
+
+#endif // QFXFOLLOW_H
diff --git a/src/declarative/util/qmlfont.h b/src/declarative/util/qmlfont.h
index 1fee6cb..c4c86e2 100644
--- a/src/declarative/util/qmlfont.h
+++ b/src/declarative/util/qmlfont.h
@@ -45,12 +45,12 @@
#include <QtCore/qobject.h>
#include <QtDeclarative/qml.h>
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+
class QmlFontPrivate;
class Q_DECLARATIVE_EXPORT QmlFont : public QObject
{
@@ -85,8 +85,8 @@ Q_SIGNALS:
};
QML_DECLARE_TYPE(QmlFont)
-
QT_END_NAMESPACE
QT_END_HEADER
+
#endif // QMLFONT_H
diff --git a/src/declarative/util/qmllistaccessor.h b/src/declarative/util/qmllistaccessor.h
index dd766b2..27a77a0 100644
--- a/src/declarative/util/qmllistaccessor.h
+++ b/src/declarative/util/qmllistaccessor.h
@@ -75,8 +75,8 @@ private:
QVariant d;
};
-#endif // QMLLISTACCESSOR_H
-
QT_END_NAMESPACE
QT_END_HEADER
+
+#endif // QMLLISTACCESSOR_H
diff --git a/src/declarative/util/qmlopenmetaobject.h b/src/declarative/util/qmlopenmetaobject.h
index 239276d..f65660d 100644
--- a/src/declarative/util/qmlopenmetaobject.h
+++ b/src/declarative/util/qmlopenmetaobject.h
@@ -51,6 +51,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+
class QmlOpenMetaObjectPrivate;
class QMetaPropertyBuilder;
class Q_DECLARATIVE_EXPORT QmlOpenMetaObject : public QAbstractDynamicMetaObject
@@ -82,8 +83,8 @@ private:
QmlOpenMetaObjectPrivate *d;
};
-
QT_END_NAMESPACE
QT_END_HEADER
+
#endif // QMLOPENMETAOBJECT_H
diff --git a/src/declarative/util/qmlpackage.h b/src/declarative/util/qmlpackage.h
index cc77b6c..9f1d94f 100644
--- a/src/declarative/util/qmlpackage.h
+++ b/src/declarative/util/qmlpackage.h
@@ -44,12 +44,12 @@
#include <QtDeclarative/qml.h>
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+
/*****************************************************************************
*****************************************************************************
XXX Experimental
@@ -79,9 +79,8 @@ public:
};
QML_DECLARE_TYPE(QmlPackage)
-#endif // QMLPACKAGE_H
-
-
QT_END_NAMESPACE
QT_END_HEADER
+
+#endif // QMLPACKAGE_H
diff --git a/src/declarative/util/qmlstategroup.h b/src/declarative/util/qmlstategroup.h
index ac1d917..3953e58 100644
--- a/src/declarative/util/qmlstategroup.h
+++ b/src/declarative/util/qmlstategroup.h
@@ -44,12 +44,12 @@
#include <QtDeclarative/qmlstate.h>
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+
class QmlStateGroupPrivate;
class QmlStateGroup : public QObject, public QmlParserStatus
{
@@ -87,9 +87,8 @@ private:
};
QML_DECLARE_TYPE(QmlStateGroup)
-#endif // QMLSTATEGROUP_H
-
-
QT_END_NAMESPACE
QT_END_HEADER
+
+#endif // QMLSTATEGROUP_H