diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-27 09:26:19 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 21:35:27 +0100 |
commit | ae764c678c78c1e3530a6d0dc2de2a17c5d4815a (patch) | |
tree | 77cd2d5182af6f6104f83b78ce210ac4cb2bd10f /src/declarative/qml | |
parent | 7571a153372abe11f47cb0f37ce7a1029d7b2662 (diff) |
Remove QT_{BEGIN,END}_HEADER macro usage
The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Ic5b55b26967d65b3f11cac6fc3963f33ec6051a4
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'src/declarative/qml')
30 files changed, 0 insertions, 118 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index a6e3e539..dd08105e 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -52,8 +52,6 @@ #include <QtCore/qurl.h> #include <QtCore/qmetaobject.h> -QT_BEGIN_HEADER - #define QML_DECLARE_TYPE(TYPE) \ Q_DECLARE_METATYPE(TYPE *) \ Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>) @@ -424,6 +422,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QObject) Q_DECLARE_METATYPE(QVariant) -QT_END_HEADER - #endif // QDECLARATIVE_H diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h index 23249a79..1419742a 100644 --- a/src/declarative/qml/qdeclarativecompiledbindings_p.h +++ b/src/declarative/qml/qdeclarativecompiledbindings_p.h @@ -56,8 +56,6 @@ #include "private/qdeclarativeexpression_p.h" #include "private/qdeclarativebinding_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct QDeclarativeBindingCompilerPrivate; @@ -110,7 +108,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEBINDINGOPTIMIZATIONS_P_H diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h index 9687cd8e..b75da2a1 100644 --- a/src/declarative/qml/qdeclarativecomponent.h +++ b/src/declarative/qml/qdeclarativecomponent.h @@ -49,8 +49,6 @@ #include <QtCore/qstring.h> #include <QtScript/qscriptvalue.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -127,6 +125,4 @@ Q_DECLARE_METATYPE(QDeclarativeComponent::Status) QML_DECLARE_TYPE(QDeclarativeComponent) QML_DECLARE_TYPEINFO(QDeclarativeComponent, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QDECLARATIVECOMPONENT_H diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index 3b3cb577..9ed71456 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -49,8 +49,6 @@ #include <QtCore/qmetatype.h> #include <QtCore/qvariant.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -110,6 +108,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QList<QObject*>) -QT_END_HEADER - #endif // QDECLARATIVECONTEXT_H diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index 85f6cc48..415f7889 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -61,8 +61,6 @@ #include <QtCore/qbytearray.h> #include <QtCore/qxmlstream.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -162,6 +160,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDeclarativeCustomParserProperty) Q_DECLARE_METATYPE(QDeclarativeCustomParserNode) -QT_END_HEADER - #endif diff --git a/src/declarative/qml/qdeclarativedom_p.h b/src/declarative/qml/qdeclarativedom_p.h index 5ad35dc7..df1cfdc2 100644 --- a/src/declarative/qml/qdeclarativedom_p.h +++ b/src/declarative/qml/qdeclarativedom_p.h @@ -60,8 +60,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -357,6 +355,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDOM_P_H diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h index 8302ce5d..e0ec33ec 100644 --- a/src/declarative/qml/qdeclarativeengine.h +++ b/src/declarative/qml/qdeclarativeengine.h @@ -49,8 +49,6 @@ #include <QtDeclarative/qdeclarativeerror.h> #include <QtDeclarative/qdeclarativedebug.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -125,6 +123,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEENGINE_H diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h index ac4fba24..3967f503 100644 --- a/src/declarative/qml/qdeclarativeerror.h +++ b/src/declarative/qml/qdeclarativeerror.h @@ -46,8 +46,6 @@ #include <QtCore/qurl.h> #include <QtCore/qstring.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -82,6 +80,4 @@ QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, const QDeclarativeError &er QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEERROR_H diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index 68b67315..728a4ac2 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -47,8 +47,6 @@ #include <QtCore/qobject.h> #include <QtCore/qvariant.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -113,7 +111,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEEXPRESSION_H diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h index 0e705f92..8e7f3f0f 100644 --- a/src/declarative/qml/qdeclarativeextensioninterface.h +++ b/src/declarative/qml/qdeclarativeextensioninterface.h @@ -45,8 +45,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -66,6 +64,4 @@ Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, QDeclarativeExtensionInterfa QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEEXTENSIONINTERFACE_H diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h index 745b2cd4..7ff9c787 100644 --- a/src/declarative/qml/qdeclarativeextensionplugin.h +++ b/src/declarative/qml/qdeclarativeextensionplugin.h @@ -46,8 +46,6 @@ #include <QtDeclarative/qdeclarativeextensioninterface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -71,6 +69,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEEXTENSIONPLUGIN_H diff --git a/src/declarative/qml/qdeclarativefastproperties_p.h b/src/declarative/qml/qdeclarativefastproperties_p.h index 268dd474..9d3ead0a 100644 --- a/src/declarative/qml/qdeclarativefastproperties_p.h +++ b/src/declarative/qml/qdeclarativefastproperties_p.h @@ -45,8 +45,6 @@ #include <QtCore/qvector.h> #include <QtCore/qhash.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QObject; @@ -71,6 +69,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEFASTPROPERTIES_P_H diff --git a/src/declarative/qml/qdeclarativeglobal_p.h b/src/declarative/qml/qdeclarativeglobal_p.h index 52b14ffe..11ebd3fd 100644 --- a/src/declarative/qml/qdeclarativeglobal_p.h +++ b/src/declarative/qml/qdeclarativeglobal_p.h @@ -45,8 +45,6 @@ #include <QtCore/qglobal.h> #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -105,6 +103,4 @@ inline void QDeclarative_setParent_noEvent(QObject *object, QObject *parent) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEGLOBAL_H diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h index eb5b032e..1b6cc333 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.h +++ b/src/declarative/qml/qdeclarativeimageprovider.h @@ -46,8 +46,6 @@ #include <QtGui/qimage.h> #include <QtGui/qpixmap.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -76,6 +74,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEIMAGEPROVIDER diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h index 8b9622d8..7b23a341 100644 --- a/src/declarative/qml/qdeclarativeinfo.h +++ b/src/declarative/qml/qdeclarativeinfo.h @@ -46,8 +46,6 @@ #include <QtCore/qurl.h> #include <QtDeclarative/qdeclarativeerror.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -99,6 +97,4 @@ Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDe QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEINFO_H diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index 9722cefb..9b367dd1 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -46,8 +46,6 @@ #include <QtCore/qlist.h> #include <QtCore/qvariant.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -147,6 +145,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDeclarativeListReference) -QT_END_HEADER - #endif // QDECLARATIVELIST_H diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h index 22824b23..e791825c 100644 --- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h +++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h @@ -45,8 +45,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -62,6 +60,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVENETWORKACCESSMANAGERFACTORY_H diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h index 42c45210..7a968f1c 100644 --- a/src/declarative/qml/qdeclarativeparser_p.h +++ b/src/declarative/qml/qdeclarativeparser_p.h @@ -65,8 +65,6 @@ #include <private/qdeclarativerefcount_p.h> #include <private/qdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -376,6 +374,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDeclarativeParser::Variant) -QT_END_HEADER - #endif // QDECLARATIVEPARSER_P_H diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h index d2c809db..68a526fb 100644 --- a/src/declarative/qml/qdeclarativeparserstatus.h +++ b/src/declarative/qml/qdeclarativeparserstatus.h @@ -45,8 +45,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -74,6 +72,4 @@ Q_DECLARE_INTERFACE(QDeclarativeParserStatus, QDeclarativeParserStatus_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPARSERSTATUS_H diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index a501f53e..05a457c3 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -56,8 +56,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qvariant.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -253,6 +251,4 @@ namespace QDeclarativePrivate QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPRIVATE_H diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h index 7e8cbcf8..a6ae48d5 100644 --- a/src/declarative/qml/qdeclarativeproperty.h +++ b/src/declarative/qml/qdeclarativeproperty.h @@ -45,8 +45,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qmetaobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -139,6 +137,4 @@ inline uint qHash (const QDeclarativeProperty &key) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPROPERTY_H diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h index 71050211..f0a0a717 100644 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h @@ -45,8 +45,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -67,6 +65,4 @@ Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, QDeclarativePropertyVa QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h index fced27ec..e072fbd0 100644 --- a/src/declarative/qml/qdeclarativepropertyvaluesource.h +++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h @@ -45,8 +45,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -66,6 +64,4 @@ Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, QDeclarativePropertyValueSo QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPROPERTYVALUESOURCE_H diff --git a/src/declarative/qml/qdeclarativeproxymetaobject_p.h b/src/declarative/qml/qdeclarativeproxymetaobject_p.h index 2178a939..6bfe1991 100644 --- a/src/declarative/qml/qdeclarativeproxymetaobject_p.h +++ b/src/declarative/qml/qdeclarativeproxymetaobject_p.h @@ -61,8 +61,6 @@ #include <private/qobject_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -94,7 +92,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPROXYMETAOBJECT_P_H diff --git a/src/declarative/qml/qdeclarativerefcount_p.h b/src/declarative/qml/qdeclarativerefcount_p.h index 3c2780ee..ac847c6e 100644 --- a/src/declarative/qml/qdeclarativerefcount_p.h +++ b/src/declarative/qml/qdeclarativerefcount_p.h @@ -55,8 +55,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -75,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEREFCOUNT_P_H diff --git a/src/declarative/qml/qdeclarativescriptparser_p.h b/src/declarative/qml/qdeclarativescriptparser_p.h index c2e8f6c2..42a29752 100644 --- a/src/declarative/qml/qdeclarativescriptparser_p.h +++ b/src/declarative/qml/qdeclarativescriptparser_p.h @@ -58,8 +58,6 @@ #include <QtCore/QList> #include <QtCore/QUrl> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -143,6 +141,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVESCRIPTPARSER_P_H diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h index f84bb980..0bb58093 100644 --- a/src/declarative/qml/qdeclarativescriptstring.h +++ b/src/declarative/qml/qdeclarativescriptstring.h @@ -47,8 +47,6 @@ #include <QtCore/qshareddata.h> #include <QtCore/qmetatype.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -82,7 +80,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDeclarativeScriptString) -QT_END_HEADER - #endif // QDECLARATIVESCRIPTSTRING_H diff --git a/src/declarative/qml/qdeclarativetypenotavailable_p.h b/src/declarative/qml/qdeclarativetypenotavailable_p.h index 7a6b46fc..c16231cb 100644 --- a/src/declarative/qml/qdeclarativetypenotavailable_p.h +++ b/src/declarative/qml/qdeclarativetypenotavailable_p.h @@ -44,8 +44,6 @@ #include <qdeclarative.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -60,6 +58,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeTypeNotAvailable) -QT_END_HEADER - #endif // QDECLARATIVETYPENOTAVAILABLE_H diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h index 1581fe57..ee271279 100644 --- a/src/declarative/qml/qdeclarativeworkerscript_p.h +++ b/src/declarative/qml/qdeclarativeworkerscript_p.h @@ -60,8 +60,6 @@ #include <QtScript/qscriptvalue.h> #include <QtCore/qurl.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -124,6 +122,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeWorkerScript) -QT_END_HEADER - #endif // QDECLARATIVEWORKERSCRIPT_P_H diff --git a/src/declarative/qml/rewriter/textwriter_p.h b/src/declarative/qml/rewriter/textwriter_p.h index 8a1dfdc8..38b81f6a 100644 --- a/src/declarative/qml/rewriter/textwriter_p.h +++ b/src/declarative/qml/rewriter/textwriter_p.h @@ -48,7 +48,6 @@ #include <QtCore/QList> #include <QtGui/QTextCursor> -QT_BEGIN_HEADER QT_QML_BEGIN_NAMESPACE namespace QDeclarativeJS { @@ -96,6 +95,5 @@ public: } // end of namespace QDeclarativeJS QT_QML_END_NAMESPACE -QT_END_HEADER #endif // TEXTWRITER_H |