From 8b62bb86cd94287a29fd1474efe04822523600df Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sun, 27 Jan 2013 00:43:59 +0100 Subject: Remove QT_{BEGIN,END}_HEADER macro usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Ia07e99676e0134fde5e32880edb95e57c779a7ff Reviewed-by: Laszlo Papp Reviewed-by: Jędrzej Nowacki Reviewed-by: Alan Alpert --- src/qml/animations/qabstractanimationjob_p.h | 4 ---- src/qml/animations/qanimationgroupjob_p.h | 4 ---- src/qml/animations/qparallelanimationgroupjob_p.h | 4 ---- src/qml/animations/qpauseanimationjob_p.h | 4 ---- src/qml/animations/qsequentialanimationgroupjob_p.h | 4 ---- src/qml/debugger/qdebugmessageservice_p.h | 4 ---- src/qml/debugger/qqmldebug.h | 4 ---- src/qml/debugger/qqmldebugserver_p.h | 4 ---- src/qml/debugger/qqmldebugserverconnection_p.h | 4 ---- src/qml/debugger/qqmldebugservice_p.h | 4 ---- src/qml/debugger/qqmldebugservice_p_p.h | 4 ---- src/qml/debugger/qqmldebugstatesdelegate_p.h | 4 ---- src/qml/debugger/qqmlinspectorinterface_p.h | 4 ---- src/qml/debugger/qqmlinspectorservice_p.h | 4 ---- src/qml/debugger/qqmlprofilerservice_p.h | 4 ---- src/qml/debugger/qv8debugservice_p.h | 4 ---- src/qml/debugger/qv8profilerservice_p.h | 4 ---- src/qml/items/qqmldelegatemodel_p.h | 4 ---- src/qml/items/qqmlobjectmodel_p.h | 4 ---- src/qml/items/qquickpackage_p.h | 4 ---- src/qml/qml/ftw/qqmlrefcount_p.h | 4 ---- src/qml/qml/qqml.h | 4 ---- src/qml/qml/qqmlaccessors_p.h | 4 ---- src/qml/qml/qqmlbind_p.h | 4 ---- src/qml/qml/qqmlcomponent.h | 4 ---- src/qml/qml/qqmlcomponentattached_p.h | 4 ---- src/qml/qml/qqmlconnections_p.h | 4 ---- src/qml/qml/qqmlcontext.h | 4 ---- src/qml/qml/qqmlcustomparser_p.h | 4 ---- src/qml/qml/qqmlengine.h | 4 ---- src/qml/qml/qqmlerror.h | 4 ---- src/qml/qml/qqmlexpression.h | 4 ---- src/qml/qml/qqmlextensioninterface.h | 4 ---- src/qml/qml/qqmlextensionplugin.h | 4 ---- src/qml/qml/qqmlfile.h | 4 ---- src/qml/qml/qqmlglobal_p.h | 4 ---- src/qml/qml/qqmlincubator.h | 4 ---- src/qml/qml/qqmlinfo.h | 4 ---- src/qml/qml/qqmllist.h | 4 ---- src/qml/qml/qqmllistmodel_p.h | 4 ---- src/qml/qml/qqmllistmodel_p_p.h | 4 ---- src/qml/qml/qqmllistmodelworkeragent_p.h | 4 ---- src/qml/qml/qqmllocale_p.h | 4 ---- src/qml/qml/qqmlmemoryprofiler_p.h | 3 --- src/qml/qml/qqmlnetworkaccessmanagerfactory.h | 4 ---- src/qml/qml/qqmlopenmetaobject_p.h | 4 ---- src/qml/qml/qqmlparserstatus.h | 4 ---- src/qml/qml/qqmlprivate.h | 4 ---- src/qml/qml/qqmlproperty.h | 4 ---- src/qml/qml/qqmlpropertyvaluesource.h | 4 ---- src/qml/qml/qqmlproxymetaobject_p.h | 4 ---- src/qml/qml/qqmlscript_p.h | 4 ---- src/qml/qml/qqmlscriptstring.h | 4 ---- src/qml/qml/qqmltimer_p.h | 4 ---- src/qml/qml/qqmltypenotavailable_p.h | 4 ---- src/qml/qml/qquickworkerscript_p.h | 4 ---- src/qml/qml/rewriter/textwriter_p.h | 3 --- src/qml/qml/v4/qv4bindings_p.h | 4 ---- src/qml/qml/v4/qv4compiler_p.h | 4 ---- src/qml/qml/v4/qv4compiler_p_p.h | 4 ---- src/qml/qml/v4/qv4instruction_p.h | 4 ---- src/qml/qml/v4/qv4ir_p.h | 4 ---- src/qml/qml/v4/qv4irbuilder_p.h | 4 ---- src/qml/qml/v4/qv4program_p.h | 4 ---- src/qml/qml/v8/qjsengine.h | 4 ---- src/qml/qml/v8/qjsvalue.h | 4 ---- src/qml/qml/v8/qjsvalueiterator.h | 4 ---- src/qml/qml/v8/qv8bindings_p.h | 4 ---- src/qml/qml/v8/qv8domerrors_p.h | 4 ---- src/qml/qml/v8/qv8sqlerrors_p.h | 4 ---- src/qml/qtqmlglobal.h | 3 --- src/qml/util/qqmladaptormodel_p.h | 2 -- src/qml/util/qqmllistaccessor_p.h | 4 ---- src/qml/util/qqmlpropertymap.h | 4 ---- 74 files changed, 291 deletions(-) (limited to 'src/qml') diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index 29e263abe7..abf3cd6df6 100644 --- a/src/qml/animations/qabstractanimationjob_p.h +++ b/src/qml/animations/qabstractanimationjob_p.h @@ -47,8 +47,6 @@ #include #include "private/qpodvector_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAnimationGroupJob; @@ -235,6 +233,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractAnimationJob::ChangeTypes) QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTANIMATIONJOB_P_H diff --git a/src/qml/animations/qanimationgroupjob_p.h b/src/qml/animations/qanimationgroupjob_p.h index 2c27e96691..0f62194656 100644 --- a/src/qml/animations/qanimationgroupjob_p.h +++ b/src/qml/animations/qanimationgroupjob_p.h @@ -44,8 +44,6 @@ #include "private/qabstractanimationjob_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QML_PRIVATE_EXPORT QAnimationGroupJob : public QAbstractAnimationJob @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif //QANIMATIONGROUPJOB_P_H diff --git a/src/qml/animations/qparallelanimationgroupjob_p.h b/src/qml/animations/qparallelanimationgroupjob_p.h index 5f896a8bc9..8e29402f33 100644 --- a/src/qml/animations/qparallelanimationgroupjob_p.h +++ b/src/qml/animations/qparallelanimationgroupjob_p.h @@ -44,8 +44,6 @@ #include "private/qanimationgroupjob_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QML_PRIVATE_EXPORT QParallelAnimationGroupJob : public QAnimationGroupJob @@ -74,6 +72,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPARALLELANIMATIONGROUPJOB_P_H diff --git a/src/qml/animations/qpauseanimationjob_p.h b/src/qml/animations/qpauseanimationjob_p.h index 83e0553116..f84143d9bf 100644 --- a/src/qml/animations/qpauseanimationjob_p.h +++ b/src/qml/animations/qpauseanimationjob_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QML_PRIVATE_EXPORT QPauseAnimationJob : public QAbstractAnimationJob @@ -68,6 +66,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPAUSEANIMATIONJOB_P_H diff --git a/src/qml/animations/qsequentialanimationgroupjob_p.h b/src/qml/animations/qsequentialanimationgroupjob_p.h index fce83b094c..18dc6fcc7b 100644 --- a/src/qml/animations/qsequentialanimationgroupjob_p.h +++ b/src/qml/animations/qsequentialanimationgroupjob_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPauseAnimationJob; @@ -101,6 +99,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif //QSEQUENTIALANIMATIONGROUPJOB_P_H diff --git a/src/qml/debugger/qdebugmessageservice_p.h b/src/qml/debugger/qdebugmessageservice_p.h index 911f9fe3ed..dbd05646c9 100644 --- a/src/qml/debugger/qdebugmessageservice_p.h +++ b/src/qml/debugger/qdebugmessageservice_p.h @@ -57,8 +57,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDebugMessageServicePrivate; @@ -84,6 +82,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDEBUGMESSAGESERVICE_P_H diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index 3232f6bb6f..d2b0220bc6 100644 --- a/src/qml/debugger/qqmldebug.h +++ b/src/qml/debugger/qqmldebug.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -63,6 +61,4 @@ static QQmlDebuggingEnabler qmlEnableDebuggingHelper(true); QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLDEBUG_H diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h index d38b1d0147..27d54d6947 100644 --- a/src/qml/debugger/qqmldebugserver_p.h +++ b/src/qml/debugger/qqmldebugserver_p.h @@ -57,8 +57,6 @@ // We mean it. // -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -104,6 +102,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLDEBUGSERVICE_H diff --git a/src/qml/debugger/qqmldebugserverconnection_p.h b/src/qml/debugger/qqmldebugserverconnection_p.h index a622855071..82a02bb29e 100644 --- a/src/qml/debugger/qqmldebugserverconnection_p.h +++ b/src/qml/debugger/qqmldebugserverconnection_p.h @@ -56,8 +56,6 @@ // We mean it. // -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -82,6 +80,4 @@ Q_DECLARE_INTERFACE(QQmlDebugServerConnection, QQmlDebugServerConnection_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLDEBUGSERVERCONNECTION_H diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h index 3e7b2f11f3..71a116f6a5 100644 --- a/src/qml/debugger/qqmldebugservice_p.h +++ b/src/qml/debugger/qqmldebugservice_p.h @@ -58,8 +58,6 @@ // We mean it. // -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -121,7 +119,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLDEBUGSERVICE_H diff --git a/src/qml/debugger/qqmldebugservice_p_p.h b/src/qml/debugger/qqmldebugservice_p_p.h index f81a8285eb..940990f628 100644 --- a/src/qml/debugger/qqmldebugservice_p_p.h +++ b/src/qml/debugger/qqmldebugservice_p_p.h @@ -56,8 +56,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -77,6 +75,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLDEBUGSERVICE_P_H diff --git a/src/qml/debugger/qqmldebugstatesdelegate_p.h b/src/qml/debugger/qqmldebugstatesdelegate_p.h index 8beb4303de..7197b8cc3b 100644 --- a/src/qml/debugger/qqmldebugstatesdelegate_p.h +++ b/src/qml/debugger/qqmldebugstatesdelegate_p.h @@ -57,8 +57,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -96,6 +94,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLDEBUGSTATESDELEGATE_P_H diff --git a/src/qml/debugger/qqmlinspectorinterface_p.h b/src/qml/debugger/qqmlinspectorinterface_p.h index 1bc25937e9..0b4020c4a7 100644 --- a/src/qml/debugger/qqmlinspectorinterface_p.h +++ b/src/qml/debugger/qqmlinspectorinterface_p.h @@ -56,8 +56,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -81,6 +79,4 @@ Q_DECLARE_INTERFACE(QQmlInspectorInterface, QQmlInspectorInterface_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLINSPECTORINTERFACE_H diff --git a/src/qml/debugger/qqmlinspectorservice_p.h b/src/qml/debugger/qqmlinspectorservice_p.h index de97e1798d..f8b2a39240 100644 --- a/src/qml/debugger/qqmlinspectorservice_p.h +++ b/src/qml/debugger/qqmlinspectorservice_p.h @@ -58,8 +58,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -96,6 +94,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLINSPECTORSERVICE_H diff --git a/src/qml/debugger/qqmlprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h index d5443aaef6..a50fb5ea08 100644 --- a/src/qml/debugger/qqmlprofilerservice_p.h +++ b/src/qml/debugger/qqmlprofilerservice_p.h @@ -64,8 +64,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct Q_AUTOTEST_EXPORT QQmlProfilerData @@ -292,7 +290,5 @@ struct QQmlCompilingProfiler { QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPROFILERSERVICE_P_H diff --git a/src/qml/debugger/qv8debugservice_p.h b/src/qml/debugger/qv8debugservice_p.h index c93948c402..00ecf557c3 100644 --- a/src/qml/debugger/qv8debugservice_p.h +++ b/src/qml/debugger/qv8debugservice_p.h @@ -56,8 +56,6 @@ #include "qqmldebugservice_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -100,6 +98,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV8DEBUGSERVICE_P_H diff --git a/src/qml/debugger/qv8profilerservice_p.h b/src/qml/debugger/qv8profilerservice_p.h index 6a8c1e8c3b..10906442f5 100644 --- a/src/qml/debugger/qv8profilerservice_p.h +++ b/src/qml/debugger/qv8profilerservice_p.h @@ -55,8 +55,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -115,6 +113,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV8PROFILERSERVICE_P_H diff --git a/src/qml/items/qqmldelegatemodel_p.h b/src/qml/items/qqmldelegatemodel_p.h index 20cc228043..0fccf5720d 100644 --- a/src/qml/items/qqmldelegatemodel_p.h +++ b/src/qml/items/qqmldelegatemodel_p.h @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - Q_DECLARE_METATYPE(QModelIndex) QT_BEGIN_NAMESPACE @@ -233,6 +231,4 @@ QML_DECLARE_TYPE(QQmlDelegateModel) QML_DECLARE_TYPEINFO(QQmlDelegateModel, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPE(QQmlDataGroup) -QT_END_HEADER - #endif // QQMLDATAMODEL_P_H diff --git a/src/qml/items/qqmlobjectmodel_p.h b/src/qml/items/qqmlobjectmodel_p.h index 5ec57bddc5..59a4a551a7 100644 --- a/src/qml/items/qqmlobjectmodel_p.h +++ b/src/qml/items/qqmlobjectmodel_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QObject; @@ -169,6 +167,4 @@ QML_DECLARE_TYPE(QQmlInstanceModel) QML_DECLARE_TYPE(QQmlObjectModel) QML_DECLARE_TYPEINFO(QQmlObjectModel, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQMLINSTANCEMODEL_P_H diff --git a/src/qml/items/qquickpackage_p.h b/src/qml/items/qquickpackage_p.h index a777ff4a7e..9427c886a8 100644 --- a/src/qml/items/qquickpackage_p.h +++ b/src/qml/items/qquickpackage_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPackagePrivate; @@ -91,6 +89,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickPackage) QML_DECLARE_TYPEINFO(QQuickPackage, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQUICKPACKAGE_H diff --git a/src/qml/qml/ftw/qqmlrefcount_p.h b/src/qml/qml/ftw/qqmlrefcount_p.h index 0bc3ea038a..24c3e7a2cc 100644 --- a/src/qml/qml/ftw/qqmlrefcount_p.h +++ b/src/qml/qml/ftw/qqmlrefcount_p.h @@ -56,8 +56,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -193,6 +191,4 @@ QQmlRefPointer &QQmlRefPointer::take(T *other) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLREFCOUNT_P_H diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 597c59eeff..877e6c16b7 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - #define QML_VERSION 0x020000 #define QML_VERSION_STR "2.0" @@ -470,6 +468,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QObject) Q_DECLARE_METATYPE(QVariant) -QT_END_HEADER - #endif // QQML_H diff --git a/src/qml/qml/qqmlaccessors_p.h b/src/qml/qml/qqmlaccessors_p.h index 24b548c58c..6df624eaf1 100644 --- a/src/qml/qml/qqmlaccessors_p.h +++ b/src/qml/qml/qqmlaccessors_p.h @@ -52,8 +52,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QObject; @@ -167,6 +165,4 @@ QQmlAccessorProperties::Properties::Properties() QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLACCESSORS_P_H diff --git a/src/qml/qml/qqmlbind_p.h b/src/qml/qml/qqmlbind_p.h index 04dc72a4c0..1e29c257f0 100644 --- a/src/qml/qml/qqmlbind_p.h +++ b/src/qml/qml/qqmlbind_p.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlBindPrivate; @@ -91,6 +89,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQmlBind) -QT_END_HEADER - #endif diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h index e2d49b32db..aefad475b4 100644 --- a/src/qml/qml/qqmlcomponent.h +++ b/src/qml/qml/qqmlcomponent.h @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -139,6 +137,4 @@ Q_DECLARE_METATYPE(QQmlComponent::Status) QML_DECLARE_TYPE(QQmlComponent) QML_DECLARE_TYPEINFO(QQmlComponent, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQMLCOMPONENT_H diff --git a/src/qml/qml/qqmlcomponentattached_p.h b/src/qml/qml/qqmlcomponentattached_p.h index 9901821b94..3c27e795c6 100644 --- a/src/qml/qml/qqmlcomponentattached_p.h +++ b/src/qml/qml/qqmlcomponentattached_p.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,6 +78,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLCOMPONENTATTACHED_P_H diff --git a/src/qml/qml/qqmlconnections_p.h b/src/qml/qml/qqmlconnections_p.h index 15fba24df8..9bc668e5f4 100644 --- a/src/qml/qml/qqmlconnections_p.h +++ b/src/qml/qml/qqmlconnections_p.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlBoundSignal; @@ -95,6 +93,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQmlConnections) -QT_END_HEADER - #endif diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h index 5477b46e92..e191807cf4 100644 --- a/src/qml/qml/qqmlcontext.h +++ b/src/qml/qml/qqmlcontext.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -107,6 +105,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QList) -QT_END_HEADER - #endif // QQMLCONTEXT_H diff --git a/src/qml/qml/qqmlcustomparser_p.h b/src/qml/qml/qqmlcustomparser_p.h index 3114c52870..7a3fd47b46 100644 --- a/src/qml/qml/qqmlcustomparser_p.h +++ b/src/qml/qml/qqmlcustomparser_p.h @@ -61,8 +61,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -163,6 +161,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQmlCustomParserProperty) Q_DECLARE_METATYPE(QQmlCustomParserNode) -QT_END_HEADER - #endif diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index 76e6ce1d75..9433fcbcb3 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -157,6 +155,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLENGINE_H diff --git a/src/qml/qml/qqmlerror.h b/src/qml/qml/qqmlerror.h index c95e0c50b9..cea9ee4cc0 100644 --- a/src/qml/qml/qqmlerror.h +++ b/src/qml/qml/qqmlerror.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -84,6 +82,4 @@ Q_DECLARE_TYPEINFO(QQmlError, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLERROR_H diff --git a/src/qml/qml/qqmlexpression.h b/src/qml/qml/qqmlexpression.h index 8c3bf38581..b04abc1b98 100644 --- a/src/qml/qml/qqmlexpression.h +++ b/src/qml/qml/qqmlexpression.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -113,7 +111,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLEXPRESSION_H diff --git a/src/qml/qml/qqmlextensioninterface.h b/src/qml/qml/qqmlextensioninterface.h index 35facb0333..be2939d366 100644 --- a/src/qml/qml/qqmlextensioninterface.h +++ b/src/qml/qml/qqmlextensioninterface.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,6 +74,4 @@ Q_DECLARE_INTERFACE(QQmlExtensionInterface, QQmlExtensionInterface_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLEXTENSIONINTERFACE_H diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h index a7f5da137a..8568565f22 100644 --- a/src/qml/qml/qqmlextensionplugin.h +++ b/src/qml/qml/qqmlextensionplugin.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLEXTENSIONPLUGIN_H diff --git a/src/qml/qml/qqmlfile.h b/src/qml/qml/qqmlfile.h index 777bc0db7b..5e7a42d6bd 100644 --- a/src/qml/qml/qqmlfile.h +++ b/src/qml/qml/qqmlfile.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUrl; @@ -119,6 +117,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLFILE_H diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index 2631fc459f..0ce026a558 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -316,6 +314,4 @@ Q_AUTOTEST_EXPORT QQmlGuiProvider *QQml_guiProvider(); QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLGLOBAL_H diff --git a/src/qml/qml/qqmlincubator.h b/src/qml/qml/qqmlincubator.h index bbb232bfa2..4d3287a394 100644 --- a/src/qml/qml/qqmlincubator.h +++ b/src/qml/qml/qqmlincubator.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -125,6 +123,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLINCUBATOR_H diff --git a/src/qml/qml/qqmlinfo.h b/src/qml/qml/qqmlinfo.h index c2b2cb353e..16fca9428e 100644 --- a/src/qml/qml/qqmlinfo.h +++ b/src/qml/qml/qqmlinfo.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,6 +96,4 @@ Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList &errors) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLINFO_H diff --git a/src/qml/qml/qqmllist.h b/src/qml/qml/qqmllist.h index d2425bc6bf..a27a2da9ae 100644 --- a/src/qml/qml/qqmllist.h +++ b/src/qml/qml/qqmllist.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -150,6 +148,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQmlListReference) -QT_END_HEADER - #endif // QQMLLIST_H diff --git a/src/qml/qml/qqmllistmodel_p.h b/src/qml/qml/qqmllistmodel_p.h index 04a6c230f6..70477115bd 100644 --- a/src/qml/qml/qqmllistmodel_p.h +++ b/src/qml/qml/qqmllistmodel_p.h @@ -55,8 +55,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -197,6 +195,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQmlListModel) QML_DECLARE_TYPE(QQmlListElement) -QT_END_HEADER - #endif // QQMLLISTMODEL_H diff --git a/src/qml/qml/qqmllistmodel_p_p.h b/src/qml/qml/qqmllistmodel_p_p.h index d48edec0bf..f2720c6c39 100644 --- a/src/qml/qml/qqmllistmodel_p_p.h +++ b/src/qml/qml/qqmllistmodel_p_p.h @@ -58,8 +58,6 @@ #include "qqmlopenmetaobject_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -376,7 +374,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(ListModel *); -QT_END_HEADER - #endif // QQUICKLISTMODEL_P_P_H diff --git a/src/qml/qml/qqmllistmodelworkeragent_p.h b/src/qml/qml/qqmllistmodelworkeragent_p.h index 9471d6663f..614017069c 100644 --- a/src/qml/qml/qqmllistmodelworkeragent_p.h +++ b/src/qml/qml/qqmllistmodelworkeragent_p.h @@ -60,8 +60,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -154,7 +152,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQmlListModelWorkerAgent::VariantRef) -QT_END_HEADER - #endif // QQUICKLISTMODELWORKERAGENT_P_H diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 8015ca2bbe..25f98d9168 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -133,6 +131,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/qml/qml/qqmlmemoryprofiler_p.h b/src/qml/qml/qqmlmemoryprofiler_p.h index d0d96f20f9..dfc26aa8fb 100644 --- a/src/qml/qml/qqmlmemoryprofiler_p.h +++ b/src/qml/qml/qqmlmemoryprofiler_p.h @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QUrl; @@ -76,6 +75,4 @@ public: #define QML_MEMORY_SCOPE_STRING(s) QQmlMemoryScope _qml_memory_scope(s) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLMEMORYPROFILER_H diff --git a/src/qml/qml/qqmlnetworkaccessmanagerfactory.h b/src/qml/qml/qqmlnetworkaccessmanagerfactory.h index 6a79118c50..4c12e00c09 100644 --- a/src/qml/qml/qqmlnetworkaccessmanagerfactory.h +++ b/src/qml/qml/qqmlnetworkaccessmanagerfactory.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,6 +59,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLNETWORKACCESSMANAGERFACTORY_H diff --git a/src/qml/qml/qqmlopenmetaobject_p.h b/src/qml/qml/qqmlopenmetaobject_p.h index fd442e4ad9..a8c5744078 100644 --- a/src/qml/qml/qqmlopenmetaobject_p.h +++ b/src/qml/qml/qqmlopenmetaobject_p.h @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -130,6 +128,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLOPENMETAOBJECT_H diff --git a/src/qml/qml/qqmlparserstatus.h b/src/qml/qml/qqmlparserstatus.h index 253fe64022..d3447e7752 100644 --- a/src/qml/qml/qqmlparserstatus.h +++ b/src/qml/qml/qqmlparserstatus.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ Q_DECLARE_INTERFACE(QQmlParserStatus, QQmlParserStatus_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPARSERSTATUS_H diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h index e548f860be..4d345fad23 100644 --- a/src/qml/qml/qqmlprivate.h +++ b/src/qml/qml/qqmlprivate.h @@ -58,8 +58,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -265,6 +263,4 @@ namespace QQmlPrivate QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPRIVATE_H diff --git a/src/qml/qml/qqmlproperty.h b/src/qml/qml/qqmlproperty.h index 0079fed09a..c3322c0048 100644 --- a/src/qml/qml/qqmlproperty.h +++ b/src/qml/qml/qqmlproperty.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,6 +138,4 @@ Q_DECLARE_TYPEINFO(QQmlProperty, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPROPERTY_H diff --git a/src/qml/qml/qqmlpropertyvaluesource.h b/src/qml/qml/qqmlpropertyvaluesource.h index 38f06d0b02..ccf40eb6f8 100644 --- a/src/qml/qml/qqmlpropertyvaluesource.h +++ b/src/qml/qml/qqmlpropertyvaluesource.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -65,6 +63,4 @@ Q_DECLARE_INTERFACE(QQmlPropertyValueSource, QQmlPropertyValueSource_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPROPERTYVALUESOURCE_H diff --git a/src/qml/qml/qqmlproxymetaobject_p.h b/src/qml/qml/qqmlproxymetaobject_p.h index 9f9c346d9f..c7b266835d 100644 --- a/src/qml/qml/qqmlproxymetaobject_p.h +++ b/src/qml/qml/qqmlproxymetaobject_p.h @@ -61,8 +61,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -93,7 +91,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPROXYMETAOBJECT_P_H diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h index 20cec3703d..54e7a67b65 100644 --- a/src/qml/qml/qqmlscript_p.h +++ b/src/qml/qml/qqmlscript_p.h @@ -62,8 +62,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -520,6 +518,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQmlScript::Variant) -QT_END_HEADER - #endif // QQMLSCRIPT_P_H diff --git a/src/qml/qml/qqmlscriptstring.h b/src/qml/qml/qqmlscriptstring.h index fc732877ab..5421ef95fc 100644 --- a/src/qml/qml/qqmlscriptstring.h +++ b/src/qml/qml/qqmlscriptstring.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,7 +84,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQmlScriptString) -QT_END_HEADER - #endif // QQMLSCRIPTSTRING_H diff --git a/src/qml/qml/qqmltimer_p.h b/src/qml/qml/qqmltimer_p.h index ff6d6207ff..c625522851 100644 --- a/src/qml/qml/qqmltimer_p.h +++ b/src/qml/qml/qqmltimer_p.h @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlTimerPrivate; @@ -106,6 +104,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQmlTimer) -QT_END_HEADER - #endif diff --git a/src/qml/qml/qqmltypenotavailable_p.h b/src/qml/qml/qqmltypenotavailable_p.h index f2e829e2ac..2529db3e5f 100644 --- a/src/qml/qml/qqmltypenotavailable_p.h +++ b/src/qml/qml/qqmltypenotavailable_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -59,6 +57,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQmlTypeNotAvailable) -QT_END_HEADER - #endif // QQMLTYPENOTAVAILABLE_H diff --git a/src/qml/qml/qquickworkerscript_p.h b/src/qml/qml/qquickworkerscript_p.h index e643751953..d568e58d0e 100644 --- a/src/qml/qml/qquickworkerscript_p.h +++ b/src/qml/qml/qquickworkerscript_p.h @@ -60,8 +60,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -125,6 +123,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickWorkerScript) -QT_END_HEADER - #endif // QQUICKWORKERSCRIPT_P_H diff --git a/src/qml/qml/rewriter/textwriter_p.h b/src/qml/qml/rewriter/textwriter_p.h index 5c22a62a02..fdfd955d9f 100644 --- a/src/qml/qml/rewriter/textwriter_p.h +++ b/src/qml/qml/rewriter/textwriter_p.h @@ -47,7 +47,6 @@ #include #include -QT_BEGIN_HEADER QT_QML_BEGIN_NAMESPACE namespace QQmlJS { @@ -92,6 +91,4 @@ public: } // end of namespace QQmlJS QT_QML_END_NAMESPACE -QT_END_HEADER - #endif // TEXTWRITER_H diff --git a/src/qml/qml/v4/qv4bindings_p.h b/src/qml/qml/v4/qv4bindings_p.h index 6ea548c642..adb05ba1f4 100644 --- a/src/qml/qml/v4/qv4bindings_p.h +++ b/src/qml/qml/v4/qv4bindings_p.h @@ -59,8 +59,6 @@ #include "private/qv4instruction_p.h" #include "private/qpointervaluepair_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct QV4Program; @@ -170,7 +168,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV4BINDINGS_P_H diff --git a/src/qml/qml/v4/qv4compiler_p.h b/src/qml/qml/v4/qv4compiler_p.h index c5175b2bbd..5b6cee2a55 100644 --- a/src/qml/qml/v4/qv4compiler_p.h +++ b/src/qml/qml/v4/qv4compiler_p.h @@ -61,8 +61,6 @@ Q_DECLARE_METATYPE(v8::Handle) -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlTypeNameCache; @@ -103,7 +101,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV4COMPILER_P_H diff --git a/src/qml/qml/v4/qv4compiler_p_p.h b/src/qml/qml/v4/qv4compiler_p_p.h index c2d6b8c362..58ec521a97 100644 --- a/src/qml/qml/v4/qv4compiler_p_p.h +++ b/src/qml/qml/v4/qv4compiler_p_p.h @@ -59,8 +59,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE template @@ -243,7 +241,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV4COMPILER_P_P_H diff --git a/src/qml/qml/v4/qv4instruction_p.h b/src/qml/qml/v4/qv4instruction_p.h index be3b4bef1e..9797abf69d 100644 --- a/src/qml/qml/v4/qv4instruction_p.h +++ b/src/qml/qml/v4/qv4instruction_p.h @@ -60,8 +60,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define FOR_EACH_V4_INSTR(F) \ @@ -481,7 +479,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV4INSTRUCTION_P_H diff --git a/src/qml/qml/v4/qv4ir_p.h b/src/qml/qml/v4/qv4ir_p.h index 08cfe43091..701f76d9e4 100644 --- a/src/qml/qml/v4/qv4ir_p.h +++ b/src/qml/qml/v4/qv4ir_p.h @@ -69,8 +69,6 @@ # undef CONST #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QTextStream; @@ -614,6 +612,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV4IR_P_H diff --git a/src/qml/qml/v4/qv4irbuilder_p.h b/src/qml/qml/v4/qv4irbuilder_p.h index dc0d62f438..86baae463d 100644 --- a/src/qml/qml/v4/qv4irbuilder_p.h +++ b/src/qml/qml/v4/qv4irbuilder_p.h @@ -46,8 +46,6 @@ #include "qv4ir_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QV4IRBuilder : public QQmlJS::AST::Visitor @@ -238,6 +236,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV4IRBUILDER_P_H diff --git a/src/qml/qml/v4/qv4program_p.h b/src/qml/qml/v4/qv4program_p.h index d04ada487e..fb23e863af 100644 --- a/src/qml/qml/v4/qv4program_p.h +++ b/src/qml/qml/v4/qv4program_p.h @@ -60,8 +60,6 @@ # pragma warning( disable : 4200 ) #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct QV4Program { @@ -126,7 +124,5 @@ QV4Program::BindingReferenceList *QV4Program::signalTable(int signalIndex) const QT_END_NAMESPACE -QT_END_HEADER - #endif // QV4PROGRAM_P_H diff --git a/src/qml/qml/v8/qjsengine.h b/src/qml/qml/v8/qjsengine.h index 23ee289d6c..0a575f84e9 100644 --- a/src/qml/qml/v8/qjsengine.h +++ b/src/qml/qml/v8/qjsengine.h @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -137,6 +135,4 @@ inline QVariant qjsvalue_cast(const QJSValue &value) QT_END_NAMESPACE -QT_END_HEADER - #endif // QJSENGINE_H diff --git a/src/qml/qml/v8/qjsvalue.h b/src/qml/qml/v8/qjsvalue.h index 0a57e3533e..efd52ce880 100644 --- a/src/qml/qml/v8/qjsvalue.h +++ b/src/qml/qml/v8/qjsvalue.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -157,6 +155,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QJSValue) -QT_END_HEADER - #endif diff --git a/src/qml/qml/v8/qjsvalueiterator.h b/src/qml/qml/v8/qjsvalueiterator.h index e9a67738ab..b4f90a44b7 100644 --- a/src/qml/qml/v8/qjsvalueiterator.h +++ b/src/qml/qml/v8/qjsvalueiterator.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -77,6 +75,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTVALUEITERATOR_H diff --git a/src/qml/qml/v8/qv8bindings_p.h b/src/qml/qml/v8/qv8bindings_p.h index f3e62faa3b..98b367ac72 100644 --- a/src/qml/qml/v8/qv8bindings_p.h +++ b/src/qml/qml/v8/qv8bindings_p.h @@ -61,8 +61,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlCompiledData; @@ -158,8 +156,6 @@ void QV8Bindings::release() QT_END_NAMESPACE -QT_END_HEADER - #endif // QV8BINDINGS_P_H diff --git a/src/qml/qml/v8/qv8domerrors_p.h b/src/qml/qml/v8/qv8domerrors_p.h index 0542863c32..8fd1ccb6d6 100644 --- a/src/qml/qml/v8/qv8domerrors_p.h +++ b/src/qml/qml/v8/qv8domerrors_p.h @@ -55,8 +55,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // From DOM-Level-3-Core spec // http://www.w3.org/TR/DOM-Level-3-Core/core.html @@ -89,6 +87,4 @@ void qt_add_domexceptions(QV8Engine *engine); QT_END_NAMESPACE -QT_END_HEADER - #endif // QV8DOMERRORS_P_H diff --git a/src/qml/qml/v8/qv8sqlerrors_p.h b/src/qml/qml/v8/qv8sqlerrors_p.h index b2ffbf9233..8a612d69ab 100644 --- a/src/qml/qml/v8/qv8sqlerrors_p.h +++ b/src/qml/qml/v8/qv8sqlerrors_p.h @@ -55,8 +55,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define SQLEXCEPTION_UNKNOWN_ERR 1 #define SQLEXCEPTION_DATABASE_ERR 2 @@ -72,6 +70,4 @@ void qt_add_sqlexceptions(QV8Engine *engine); QT_END_NAMESPACE -QT_END_HEADER - #endif // QV8SQLERRORS_P_H diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h index e0668dfb90..07a4136e3a 100644 --- a/src/qml/qtqmlglobal.h +++ b/src/qml/qtqmlglobal.h @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,4 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER - #endif // QTQMLGLOBAL_H diff --git a/src/qml/util/qqmladaptormodel_p.h b/src/qml/util/qqmladaptormodel_p.h index 6e9af8ebda..399350d725 100644 --- a/src/qml/util/qqmladaptormodel_p.h +++ b/src/qml/util/qqmladaptormodel_p.h @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlEngine; diff --git a/src/qml/util/qqmllistaccessor_p.h b/src/qml/util/qqmllistaccessor_p.h index 71f7542105..8f3fb41186 100644 --- a/src/qml/util/qqmllistaccessor_p.h +++ b/src/qml/util/qqmllistaccessor_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlEngine; @@ -73,6 +71,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLLISTACCESSOR_H diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h index cd3516a907..c327fd8ce4 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -100,6 +98,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif -- cgit v1.2.3