From 8b62bb86cd94287a29fd1474efe04822523600df Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sun, 27 Jan 2013 00:43:59 +0100 Subject: [PATCH] Remove QT_{BEGIN,END}_HEADER macro usage MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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/imports/folderlistmodel/qquickfolderlistmodel.h | 4 ---- src/imports/testlib/signalspy.h | 4 ---- src/imports/testlib/testcase.h | 4 ---- src/imports/xmllistmodel/qqmlxmllistmodel_p.h | 4 ---- src/particles/qquickage_p.h | 3 --- src/particles/qquickangledirection_p.h | 3 --- src/particles/qquickcumulativedirection_p.h | 4 ---- src/particles/qquickcustomaffector_p.h | 3 --- src/particles/qquickcustomparticle_p.h | 4 ---- src/particles/qquickdirection_p.h | 3 --- src/particles/qquickellipseextruder_p.h | 3 --- src/particles/qquickfriction_p.h | 3 --- src/particles/qquickgravity_p.h | 3 --- src/particles/qquickgroupgoal_p.h | 4 ---- src/particles/qquickimageparticle_p.h | 3 --- src/particles/qquickitemparticle_p.h | 3 --- src/particles/qquickmaskextruder_p.h | 4 ---- src/particles/qquickparticleaffector_p.h | 3 --- src/particles/qquickparticleemitter_p.h | 4 ---- src/particles/qquickparticleextruder_p.h | 4 ---- src/particles/qquickparticlepainter_p.h | 3 --- src/particles/qquickparticlesmodule_p.h | 4 ---- src/particles/qquickparticlesystem_p.h | 4 ---- src/particles/qquickpointattractor_p.h | 3 --- src/particles/qquickpointdirection_p.h | 3 --- src/particles/qquickrectangleextruder_p.h | 4 ---- src/particles/qquickspritegoal_p.h | 4 ---- src/particles/qquicktargetdirection_p.h | 3 --- src/particles/qquicktrailemitter_p.h | 3 --- src/particles/qquickturbulence_p.h | 3 --- src/particles/qquickv8particledata_p.h | 4 ---- src/particles/qquickwander_p.h | 3 --- 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 ---- src/qmltest/qtestoptions_p.h | 4 ---- src/qmltest/quicktest.h | 4 ---- src/qmltest/quicktestglobal.h | 2 -- src/quick/designer/designersupport.h | 4 ---- src/quick/designer/designerwindowmanager_p.h | 3 --- src/quick/items/context2d/qquickcanvascontext_p.h | 4 ---- src/quick/items/context2d/qquickcanvasitem_p.h | 4 ---- src/quick/items/context2d/qquickcontext2d_p.h | 4 ---- src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h | 4 ---- src/quick/items/context2d/qquickcontext2dtexture_p.h | 4 ---- src/quick/items/context2d/qquickcontext2dtile_p.h | 4 ---- src/quick/items/qquickaccessibleattached_p.h | 4 ---- src/quick/items/qquickanchors_p.h | 4 ---- src/quick/items/qquickanimatedimage_p.h | 4 ---- src/quick/items/qquickanimatedsprite_p.h | 4 ---- src/quick/items/qquickborderimage_p.h | 2 -- src/quick/items/qquickdrag_p.h | 4 ---- src/quick/items/qquickdroparea_p.h | 4 ---- src/quick/items/qquickflickable_p.h | 4 ---- src/quick/items/qquickflipable_p.h | 4 ---- src/quick/items/qquickfocusscope_p.h | 4 ---- src/quick/items/qquickgridview_p.h | 4 ---- src/quick/items/qquickimage_p.h | 4 ---- src/quick/items/qquickimagebase_p.h | 4 ---- src/quick/items/qquickimplicitsizeitem_p.h | 4 ---- src/quick/items/qquickitem.h | 4 ---- src/quick/items/qquickitemanimation_p.h | 4 ---- src/quick/items/qquickitemsmodule_p.h | 4 ---- src/quick/items/qquickitemview_p.h | 4 ---- src/quick/items/qquickitemview_p_p.h | 4 ---- src/quick/items/qquickitemviewtransition_p.h | 4 ---- src/quick/items/qquicklistview_p.h | 4 ---- src/quick/items/qquickloader_p.h | 4 ---- src/quick/items/qquickmousearea_p.h | 4 ---- src/quick/items/qquickmultipointtoucharea_p.h | 4 ---- src/quick/items/qquickpainteditem.h | 4 ---- src/quick/items/qquickpathview_p.h | 3 --- src/quick/items/qquickpincharea_p.h | 4 ---- src/quick/items/qquickpositioners_p.h | 4 ---- src/quick/items/qquickrectangle_p.h | 4 ---- src/quick/items/qquickrepeater_p.h | 4 ---- src/quick/items/qquickscalegrid_p_p.h | 4 ---- src/quick/items/qquickscreen_p.h | 4 ---- src/quick/items/qquickshadereffect_p.h | 4 ---- src/quick/items/qquickshadereffectmesh_p.h | 4 ---- src/quick/items/qquickshadereffectnode_p.h | 4 ---- src/quick/items/qquickshadereffectsource_p.h | 4 ---- src/quick/items/qquicksprite_p.h | 3 --- src/quick/items/qquickspriteengine_p.h | 4 ---- src/quick/items/qquickspritesequence_p.h | 4 ---- src/quick/items/qquickstateoperations_p.h | 4 ---- src/quick/items/qquicktext_p.h | 4 ---- src/quick/items/qquicktextcontrol_p.h | 4 ---- src/quick/items/qquicktextedit_p.h | 4 ---- src/quick/items/qquicktextinput_p.h | 4 ---- src/quick/items/qquicktranslate_p.h | 4 ---- src/quick/items/qquickview.h | 4 ---- src/quick/items/qquickview_p.h | 4 ---- src/quick/items/qquickwindow.h | 4 ---- src/quick/items/qquickwindowmodule_p.h | 4 ---- src/quick/qtquick2_p.h | 4 ---- src/quick/qtquickglobal.h | 2 -- src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h | 4 ---- src/quick/scenegraph/coreapi/qsggeometry.h | 4 ---- src/quick/scenegraph/coreapi/qsgmaterial.h | 4 ---- src/quick/scenegraph/coreapi/qsgnode.h | 4 ---- src/quick/scenegraph/coreapi/qsgnodeupdater_p.h | 4 ---- src/quick/scenegraph/coreapi/qsgrenderer_p.h | 4 ---- src/quick/scenegraph/coreapi/qsgrendernode_p.h | 4 ---- src/quick/scenegraph/qsgadaptationlayer_p.h | 4 ---- src/quick/scenegraph/qsgcontext_p.h | 4 ---- src/quick/scenegraph/qsgcontextplugin_p.h | 4 ---- src/quick/scenegraph/qsgdefaultglyphnode_p.h | 4 ---- src/quick/scenegraph/qsgdefaultimagenode_p.h | 4 ---- src/quick/scenegraph/qsgdefaultrectanglenode_p.h | 4 ---- src/quick/scenegraph/qsgdistancefieldglyphnode_p.h | 4 ---- src/quick/scenegraph/qsgflashnode_p.h | 4 ---- src/quick/scenegraph/qsgrenderloop_p.h | 4 ---- src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h | 4 ---- src/quick/scenegraph/qsgthreadedrenderloop_p.h | 4 ---- src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h | 4 ---- src/quick/scenegraph/util/qsgflatcolormaterial.h | 4 ---- src/quick/scenegraph/util/qsgpainternode_p.h | 4 ---- src/quick/scenegraph/util/qsgsimplematerial.h | 4 ---- src/quick/scenegraph/util/qsgsimplerectnode.h | 4 ---- src/quick/scenegraph/util/qsgsimpletexturenode.h | 4 ---- src/quick/scenegraph/util/qsgtexture.h | 4 ---- src/quick/scenegraph/util/qsgtexturematerial.h | 4 ---- src/quick/scenegraph/util/qsgtexturematerial_p.h | 4 ---- src/quick/scenegraph/util/qsgtextureprovider.h | 4 ---- src/quick/scenegraph/util/qsgvertexcolormaterial.h | 4 ---- src/quick/util/qquickanimation_p.h | 4 ---- src/quick/util/qquickanimationcontroller_p.h | 4 ---- src/quick/util/qquickapplication_p.h | 4 ---- src/quick/util/qquickbehavior_p.h | 4 ---- src/quick/util/qquickfontloader_p.h | 4 ---- src/quick/util/qquickimageprovider.h | 4 ---- src/quick/util/qquickpath_p.h | 4 ---- src/quick/util/qquickpathinterpolator_p.h | 4 ---- src/quick/util/qquickpixmapcache_p.h | 4 ---- src/quick/util/qquickpropertychanges_p.h | 4 ---- src/quick/util/qquicksmoothedanimation_p.h | 4 ---- src/quick/util/qquickspringanimation_p.h | 4 ---- src/quick/util/qquickstate_p.h | 4 ---- src/quick/util/qquickstatechangescript_p.h | 4 ---- src/quick/util/qquickstategroup_p.h | 4 ---- src/quick/util/qquicksystempalette_p.h | 4 ---- src/quick/util/qquicktransition_p.h | 4 ---- src/quick/util/qquickutilmodule_p.h | 4 ---- src/quick/util/qquickvaluetypes_p.h | 4 ---- 216 files changed, 833 deletions(-) diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h index eb16bd0..03cb24d 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.h +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -165,6 +163,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKFOLDERLISTMODEL_H diff --git a/src/imports/testlib/signalspy.h b/src/imports/testlib/signalspy.h index 27dc12a..a7ff89f 100644 --- a/src/imports/testlib/signalspy.h +++ b/src/imports/testlib/signalspy.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class SignalSpy : public QQuickItem @@ -78,6 +76,4 @@ QML_DECLARE_TYPE(SignalSpy) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/imports/testlib/testcase.h b/src/imports/testlib/testcase.h index a5e393a..3b76798 100644 --- a/src/imports/testlib/testcase.h +++ b/src/imports/testlib/testcase.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class TestCase : public QQuickItem @@ -89,6 +87,4 @@ QML_DECLARE_TYPE(TestCase) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h index 776ae50..0a11cc6 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h +++ b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -207,6 +205,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickXmlListModel) QML_DECLARE_TYPE(QQuickXmlListModelRole) -QT_END_HEADER - #endif // QQUICKXMLLISTMODEL_H diff --git a/src/particles/qquickage_p.h b/src/particles/qquickage_p.h index b9047ca..0839517 100644 --- a/src/particles/qquickage_p.h +++ b/src/particles/qquickage_p.h @@ -43,8 +43,6 @@ #define KILLAFFECTOR_H #include "qquickparticleaffector_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAgeAffector : public QQuickParticleAffector @@ -95,5 +93,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // KILLAFFECTOR_H diff --git a/src/particles/qquickangledirection_p.h b/src/particles/qquickangledirection_p.h index 7ac70ce..d89455a 100644 --- a/src/particles/qquickangledirection_p.h +++ b/src/particles/qquickangledirection_p.h @@ -42,8 +42,6 @@ #ifndef QQuickANGLEDDIRECTION_H #define QQuickANGLEDDIRECTION_H #include "qquickdirection_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAngleDirection : public QQuickDirection @@ -127,5 +125,4 @@ qreal m_magnitudeVariation; }; QT_END_NAMESPACE -QT_END_HEADER #endif // QQuickANGLEDDIRECTION_H diff --git a/src/particles/qquickcumulativedirection_p.h b/src/particles/qquickcumulativedirection_p.h index 52e8915..c9aa1e8 100644 --- a/src/particles/qquickcumulativedirection_p.h +++ b/src/particles/qquickcumulativedirection_p.h @@ -43,8 +43,6 @@ #define QQuickCUMULATIVEDIRECTION_P_H #include "qquickdirection_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCumulativeDirection : public QQuickDirection @@ -62,6 +60,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQuickCUMULATIVEDIRECTION_P_H diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h index ad6409a..a4a077f 100644 --- a/src/particles/qquickcustomaffector_p.h +++ b/src/particles/qquickcustomaffector_p.h @@ -48,8 +48,6 @@ #include "qquickparticleaffector_p.h" #include "qquickdirection_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCustomAffector : public QQuickParticleAffector @@ -158,5 +156,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // CUSTOMAFFECTOR_H diff --git a/src/particles/qquickcustomparticle_p.h b/src/particles/qquickcustomparticle_p.h index 66f0fd3..16c1a0c 100644 --- a/src/particles/qquickcustomparticle_p.h +++ b/src/particles/qquickcustomparticle_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGNode; @@ -114,6 +112,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif //HEADER_GUARD diff --git a/src/particles/qquickdirection_p.h b/src/particles/qquickdirection_p.h index 796be7c..4ceae16 100644 --- a/src/particles/qquickdirection_p.h +++ b/src/particles/qquickdirection_p.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickDirection : public QObject @@ -64,5 +62,4 @@ protected: }; QT_END_NAMESPACE -QT_END_HEADER #endif // VARYINGVECTOR_H diff --git a/src/particles/qquickellipseextruder_p.h b/src/particles/qquickellipseextruder_p.h index 3c65d0b..a9425b6 100644 --- a/src/particles/qquickellipseextruder_p.h +++ b/src/particles/qquickellipseextruder_p.h @@ -43,8 +43,6 @@ #define ELLIPSEEXTRUDER_H #include "qquickparticleextruder_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickEllipseExtruder : public QQuickParticleExtruder @@ -79,5 +77,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // ELLIPSEEXTRUDER_H diff --git a/src/particles/qquickfriction_p.h b/src/particles/qquickfriction_p.h index f92ed36..13ba715 100644 --- a/src/particles/qquickfriction_p.h +++ b/src/particles/qquickfriction_p.h @@ -43,8 +43,6 @@ #define FRICTIONAFFECTOR_H #include "qquickparticleaffector_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickFrictionAffector : public QQuickParticleAffector @@ -97,5 +95,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // FRICTIONAFFECTOR_H diff --git a/src/particles/qquickgravity_p.h b/src/particles/qquickgravity_p.h index a34e431..e6010b5 100644 --- a/src/particles/qquickgravity_p.h +++ b/src/particles/qquickgravity_p.h @@ -43,8 +43,6 @@ #define GRAVITYAFFECTOR_H #include "qquickparticleaffector_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickGravityAffector : public QQuickParticleAffector @@ -111,5 +109,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // GRAVITYAFFECTOR_H diff --git a/src/particles/qquickgroupgoal_p.h b/src/particles/qquickgroupgoal_p.h index 64d1152..6a31b88 100644 --- a/src/particles/qquickgroupgoal_p.h +++ b/src/particles/qquickgroupgoal_p.h @@ -43,8 +43,6 @@ #define GROUPGOALAFFECTOR_H #include "qquickparticleaffector_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickStochasticEngine; @@ -95,6 +93,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // GROUPGOALAFFECTOR_H diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index 55bf353..daa3d5c 100644 --- a/src/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class ImageMaterialData; @@ -442,5 +440,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // ULTRAPARTICLE_H diff --git a/src/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h index df79168..e5c7239 100644 --- a/src/particles/qquickitemparticle_p.h +++ b/src/particles/qquickitemparticle_p.h @@ -45,8 +45,6 @@ #include #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickVisualDataModel; @@ -137,5 +135,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPEINFO(QQuickItemParticle, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER #endif // ITEMPARTICLE_H diff --git a/src/particles/qquickmaskextruder_p.h b/src/particles/qquickmaskextruder_p.h index 5b45559..5c948cc 100644 --- a/src/particles/qquickmaskextruder_p.h +++ b/src/particles/qquickmaskextruder_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickMaskExtruder : public QQuickParticleExtruder @@ -89,6 +87,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // MASKEXTRUDER_H diff --git a/src/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h index fe8d211..2629ecc 100644 --- a/src/particles/qquickparticleaffector_p.h +++ b/src/particles/qquickparticleaffector_p.h @@ -46,8 +46,6 @@ #include "qquickparticlesystem_p.h" #include "qquickparticleextruder_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParticleAffector : public QQuickItem @@ -196,5 +194,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // PARTICLEAFFECTOR_H diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h index 9c34d8d..70de934 100644 --- a/src/particles/qquickparticleemitter_p.h +++ b/src/particles/qquickparticleemitter_p.h @@ -51,8 +51,6 @@ #include #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParticleEmitter : public QQuickItem @@ -345,6 +343,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // PARTICLEEMITTER_H diff --git a/src/particles/qquickparticleextruder_p.h b/src/particles/qquickparticleextruder_p.h index 19000ff..36edc9c 100644 --- a/src/particles/qquickparticleextruder_p.h +++ b/src/particles/qquickparticleextruder_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParticleExtruder : public QObject @@ -66,6 +64,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // PARTICLEEXTRUDER_H diff --git a/src/particles/qquickparticlepainter_p.h b/src/particles/qquickparticlepainter_p.h index 82dda82..7801fdd 100644 --- a/src/particles/qquickparticlepainter_p.h +++ b/src/particles/qquickparticlepainter_p.h @@ -47,8 +47,6 @@ #include #include "qquickparticlesystem_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParticlePainter : public QQuickItem @@ -133,5 +131,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // PARTICLE_H diff --git a/src/particles/qquickparticlesmodule_p.h b/src/particles/qquickparticlesmodule_p.h index 83f6e01..20b1d49 100644 --- a/src/particles/qquickparticlesmodule_p.h +++ b/src/particles/qquickparticlesmodule_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticlesModule @@ -56,6 +54,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKPARTICLESMODULE_H diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h index ba21679..1177e30 100644 --- a/src/particles/qquickparticlesystem_p.h +++ b/src/particles/qquickparticlesystem_p.h @@ -53,8 +53,6 @@ #include #include //For QQmlV8Handle -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParticleSystem; @@ -378,8 +376,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // PARTICLESYSTEM_H diff --git a/src/particles/qquickpointattractor_p.h b/src/particles/qquickpointattractor_p.h index 0f2c58d..1332591 100644 --- a/src/particles/qquickpointattractor_p.h +++ b/src/particles/qquickpointattractor_p.h @@ -43,8 +43,6 @@ #define ATTRACTORAFFECTOR_H #include "qquickparticleaffector_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAttractorAffector : public QQuickParticleAffector @@ -163,5 +161,4 @@ Proportion m_proportionalToDistance; }; QT_END_NAMESPACE -QT_END_HEADER #endif // ATTRACTORAFFECTOR_H diff --git a/src/particles/qquickpointdirection_p.h b/src/particles/qquickpointdirection_p.h index 2757588..eae385a 100644 --- a/src/particles/qquickpointdirection_p.h +++ b/src/particles/qquickpointdirection_p.h @@ -43,8 +43,6 @@ #define POINTVECTOR_H #include "qquickdirection_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPointDirection : public QQuickDirection @@ -129,5 +127,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // POINTVECTOR_H diff --git a/src/particles/qquickrectangleextruder_p.h b/src/particles/qquickrectangleextruder_p.h index 3edb54b..e048068 100644 --- a/src/particles/qquickrectangleextruder_p.h +++ b/src/particles/qquickrectangleextruder_p.h @@ -44,8 +44,6 @@ #include "qquickparticleextruder_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickRectangleExtruder : public QQuickParticleExtruder @@ -81,6 +79,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // RectangleEXTRUDER_H diff --git a/src/particles/qquickspritegoal_p.h b/src/particles/qquickspritegoal_p.h index 7b61f0e..4d5f192 100644 --- a/src/particles/qquickspritegoal_p.h +++ b/src/particles/qquickspritegoal_p.h @@ -44,8 +44,6 @@ #include "qquickparticleaffector_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickStochasticEngine; @@ -118,6 +116,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // SPRITEGOALAFFECTOR_H diff --git a/src/particles/qquicktargetdirection_p.h b/src/particles/qquicktargetdirection_p.h index aecf880..886a560 100644 --- a/src/particles/qquicktargetdirection_p.h +++ b/src/particles/qquicktargetdirection_p.h @@ -42,8 +42,6 @@ #ifndef DIRECTEDVECTOR_H #define DIRECTEDVECTOR_H #include "qquickdirection_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -185,5 +183,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // DIRECTEDVECTOR_H diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h index b57cb57..3ae1507 100644 --- a/src/particles/qquicktrailemitter_p.h +++ b/src/particles/qquicktrailemitter_p.h @@ -44,8 +44,6 @@ #include "qquickparticleemitter_p.h" #include "qquickparticleaffector_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTrailEmitter : public QQuickParticleEmitter @@ -164,5 +162,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // FOLLOWEMITTER_H diff --git a/src/particles/qquickturbulence_p.h b/src/particles/qquickturbulence_p.h index d0dd458..eea550e 100644 --- a/src/particles/qquickturbulence_p.h +++ b/src/particles/qquickturbulence_p.h @@ -44,8 +44,6 @@ #include "qquickparticleaffector_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParticlePainter; @@ -112,5 +110,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // TURBULENCEAFFECTOR_H diff --git a/src/particles/qquickv8particledata_p.h b/src/particles/qquickv8particledata_p.h index 5b88dd9..e3c1bf9 100644 --- a/src/particles/qquickv8particledata_p.h +++ b/src/particles/qquickv8particledata_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParticleData; @@ -61,7 +59,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/particles/qquickwander_p.h b/src/particles/qquickwander_p.h index 54974d2..0f09418 100644 --- a/src/particles/qquickwander_p.h +++ b/src/particles/qquickwander_p.h @@ -44,8 +44,6 @@ #include #include "qquickparticleaffector_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct WanderData{ @@ -154,5 +152,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // WANDERAFFECTOR_H diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index 29e263a..abf3cd6 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 2c27e96..0f62194 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 5f896a8..8e29402 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 83e0553..f84143d 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 fce83b0..18dc6fc 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 911f9fe..dbd0564 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 3232f6b..d2b0220 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 d38b1d0..27d54d6 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 a622855..82a02bb 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 3e7b2f1..71a116f 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 f81a828..940990f 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 8beb430..7197b8c 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 1bc2593..0b4020c 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 de97e17..f8b2a39 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 d5443aa..a50fb5e 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 c93948c..00ecf55 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 6a8c1e8..1090644 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 20cc228..0fccf57 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 5ec57bd..59a4a55 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 a777ff4..9427c88 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 0bc3ea0..24c3e7a 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 597c59e..877e6c1 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 24b548c..6df624e 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 04dc72a..1e29c25 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 e2d49b3..aefad47 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 9901821..3c27e79 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 15fba24..9bc668e 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 5477b46..e191807 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 3114c52..7a3fd47 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 76e6ce1..9433fcb 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 c95e0c5..cea9ee4 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 8c3bf38..b04abc1 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 35facb0..be2939d 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 a7f5da1..8568565 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 777bc0d..5e7a42d 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 2631fc4..0ce026a 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 bbb232b..4d3287a 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 c2b2cb3..16fca94 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 d2425bc..a27a2da 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 04a6c23..7047711 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 d48edec..f2720c6 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 9471d66..6140170 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 8015ca2..25f98d9 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 d0d96f2..dfc26aa 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 6a79118..4c12e00 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 fd442e4..a8c5744 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 253fe64..d3447e7 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 e548f86..4d345fa 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 0079fed..c3322c0 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 38f06d0..ccf40eb 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 9f9c346..c7b2668 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 20cec37..54e7a67 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 fc73287..5421ef9 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 ff6d620..c625522 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 f2e829e..2529db3 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 e643751..d568e58 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 5c22a62..fdfd955 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 6ea548c..adb05ba 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 c5175b2..5b6cee2 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 c2d6b8c..58ec521 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 be3b4be..9797abf 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 08cfe43..701f76d 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 dc0d62f..86baae4 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 d04ada4..fb23e86 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 23ee289..0a575f8 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 0a57e35..efd52ce 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 e9a6773..b4f90a4 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 f3e62fa..98b367a 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 0542863..8fd1ccb 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 b2ffbf9..8a612d6 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 e0668df..07a4136 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 6e9af8e..399350d 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 71f7542..8f3fb41 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 cd3516a..c327fd8 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 diff --git a/src/qmltest/qtestoptions_p.h b/src/qmltest/qtestoptions_p.h index 36706b2..ac2d428 100644 --- a/src/qmltest/qtestoptions_p.h +++ b/src/qmltest/qtestoptions_p.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,6 +59,4 @@ namespace QTest QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/qmltest/quicktest.h b/src/qmltest/quicktest.h index d20d71a..d6ffcf8 100644 --- a/src/qmltest/quicktest.h +++ b/src/qmltest/quicktest.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, const char *sourceDir); @@ -82,6 +80,4 @@ Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/qmltest/quicktestglobal.h b/src/qmltest/quicktestglobal.h index d9a3b00..32461fd 100644 --- a/src/qmltest/quicktestglobal.h +++ b/src/qmltest/quicktestglobal.h @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h index 63809c3..c93cffa 100644 --- a/src/quick/designer/designersupport.h +++ b/src/quick/designer/designersupport.h @@ -59,8 +59,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -157,6 +155,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DESIGNERSUPPORT_H diff --git a/src/quick/designer/designerwindowmanager_p.h b/src/quick/designer/designerwindowmanager_p.h index 878d236..02aacf0 100644 --- a/src/quick/designer/designerwindowmanager_p.h +++ b/src/quick/designer/designerwindowmanager_p.h @@ -60,8 +60,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickWindow; @@ -103,5 +101,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER #endif // DESIGNERWINDOWMANAGER_P_H diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h index bfea0e5..d15f5d9 100644 --- a/src/quick/items/context2d/qquickcanvascontext_p.h +++ b/src/quick/items/context2d/qquickcanvascontext_p.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCanvasItem; @@ -83,6 +81,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif //QQUICKCANVASCONTEXT_P_H diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index d2a9075..c53e4f9 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCanvasContext; @@ -207,6 +205,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickCanvasItem) -QT_END_HEADER - #endif //QQUICKCANVASITEM_P_H diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index 8d96ab5..24f5c44 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -62,8 +62,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickContext2DCommandBuffer; @@ -257,6 +255,4 @@ public: QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickContext2D) -QT_END_HEADER - #endif // QQUICKCONTEXT2D_P_H diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h index 0247a9e..ff0a3a4 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h @@ -45,8 +45,6 @@ #include #include "qquickcontext2d_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCanvasItem; @@ -266,8 +264,6 @@ private: QMutex queueLock; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // QQUICKCONTEXT2DCOMMANDBUFFER_P_H diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h index 8fe3168..df96a0e 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture_p.h +++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h @@ -53,8 +53,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickContext2DTile; @@ -180,8 +178,6 @@ private: QSGPlainTexture* m_texture; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // QQUICKCONTEXT2DTEXTURE_P_H diff --git a/src/quick/items/context2d/qquickcontext2dtile_p.h b/src/quick/items/context2d/qquickcontext2dtile_p.h index 60415ee..22cbbe6 100644 --- a/src/quick/items/context2d/qquickcontext2dtile_p.h +++ b/src/quick/items/context2d/qquickcontext2dtile_p.h @@ -45,8 +45,6 @@ #include "qquickcontext2d_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickContext2DTexture; @@ -103,8 +101,6 @@ public: private: QImage m_image; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // QQUICKCONTEXT2DTILE_P_H diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 1526123..2124356 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -165,8 +163,6 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAccessibleAttached) QML_DECLARE_TYPEINFO(QQuickAccessibleAttached, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QT_NO_ACCESSIBILITY #endif diff --git a/src/quick/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h index df3577c..1f18961 100644 --- a/src/quick/items/qquickanchors_p.h +++ b/src/quick/items/qquickanchors_p.h @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -200,6 +198,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAnchors) -QT_END_HEADER - #endif // QQUICKANCHORS_P_H diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h index 83bae59..2775023 100644 --- a/src/quick/items/qquickanimatedimage_p.h +++ b/src/quick/items/qquickanimatedimage_p.h @@ -46,8 +46,6 @@ #ifndef QT_NO_MOVIE -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QMovie; @@ -108,8 +106,6 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAnimatedImage) -QT_END_HEADER - #endif // QT_NO_MOVIE #endif // QQUICKANIMATEDIMAGE_P_H diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index 47dd51c..6d0a821 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -378,6 +376,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKANIMATEDSPRITE_P_H diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h index 1cc86bc..2ba69a3 100644 --- a/src/quick/items/qquickborderimage_p.h +++ b/src/quick/items/qquickborderimage_p.h @@ -44,7 +44,6 @@ #include "qquickimagebase_p.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickScaleGrid; @@ -102,6 +101,5 @@ private: QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickBorderImage) -QT_END_HEADER #endif // QQUICKBORDERIMAGE_P_H diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h index 5e1448a..c1835d9 100644 --- a/src/quick/items/qquickdrag_p.h +++ b/src/quick/items/qquickdrag_p.h @@ -51,8 +51,6 @@ #ifndef QT_NO_DRAGANDDROP -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -205,8 +203,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DRAGANDDROP #endif diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h index 14921a2..bfc3f92 100644 --- a/src/quick/items/qquickdroparea_p.h +++ b/src/quick/items/qquickdroparea_p.h @@ -51,8 +51,6 @@ #ifndef QT_NO_DRAGANDDROP -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickDropAreaPrivate; @@ -162,8 +160,6 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickDropEvent) QML_DECLARE_TYPE(QQuickDropArea) -QT_END_HEADER - #endif // QT_NO_DRAGANDDROP #endif // QQUICKDROPAREA_P_H diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 2e16f11..5d36ea0 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -45,8 +45,6 @@ #include "qquickitem.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickFlickablePrivate; @@ -278,6 +276,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickFlickable) -QT_END_HEADER - #endif // QQUICKFLICKABLE_P_H diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h index 1bc6f41..795dc4f 100644 --- a/src/quick/items/qquickflipable_p.h +++ b/src/quick/items/qquickflipable_p.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickFlipablePrivate; @@ -96,6 +94,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickFlipable) -QT_END_HEADER - #endif // QQUICKFLIPABLE_P_H diff --git a/src/quick/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h index d72eae0..965c753 100644 --- a/src/quick/items/qquickfocusscope_p.h +++ b/src/quick/items/qquickfocusscope_p.h @@ -44,8 +44,6 @@ #include "qquickitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QQuickFocusScope : public QQuickItem @@ -60,6 +58,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickFocusScope) -QT_END_HEADER - #endif // QQUICKFOCUSSCOPE_P_H diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h index a1c0ce9..d98de10 100644 --- a/src/quick/items/qquickgridview_p.h +++ b/src/quick/items/qquickgridview_p.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickGridViewAttached; @@ -144,6 +142,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickGridView) QML_DECLARE_TYPEINFO(QQuickGridView, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQUICKGRIDVIEW_P_H diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h index 9437b47..b1f27a6 100644 --- a/src/quick/items/qquickimage_p.h +++ b/src/quick/items/qquickimage_p.h @@ -45,8 +45,6 @@ #include "qquickimagebase_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickImagePrivate; @@ -114,6 +112,4 @@ private: QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickImage) -QT_END_HEADER - #endif // QQUICKIMAGE_P_H diff --git a/src/quick/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h index f5ed691..388873b 100644 --- a/src/quick/items/qquickimagebase_p.h +++ b/src/quick/items/qquickimagebase_p.h @@ -45,8 +45,6 @@ #include "qquickimplicitsizeitem_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickImageBasePrivate; @@ -114,6 +112,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKIMAGEBASE_P_H diff --git a/src/quick/items/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h index 6e306d8..54b94dd 100644 --- a/src/quick/items/qquickimplicitsizeitem_p.h +++ b/src/quick/items/qquickimplicitsizeitem_p.h @@ -45,8 +45,6 @@ #include "qquickpainteditem.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickImplicitSizeItemPrivate; @@ -70,6 +68,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKIMPLICITSIZEITEM_H diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index b3ac933..e9c817a 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -446,6 +444,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickItem) QML_DECLARE_TYPE(QQuickTransform) -QT_END_HEADER - #endif // QQUICKITEM_H diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h index 1dfce52..796f6c8 100644 --- a/src/quick/items/qquickitemanimation_p.h +++ b/src/quick/items/qquickitemanimation_p.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParentAnimationPrivate; @@ -198,6 +196,4 @@ QML_DECLARE_TYPE(QQuickParentAnimation) QML_DECLARE_TYPE(QQuickAnchorAnimation) QML_DECLARE_TYPE(QQuickPathAnimation) -QT_END_HEADER - #endif // QQUICKITEMANIMATION_H diff --git a/src/quick/items/qquickitemsmodule_p.h b/src/quick/items/qquickitemsmodule_p.h index d21f182..bbc7c5c 100644 --- a/src/quick/items/qquickitemsmodule_p.h +++ b/src/quick/items/qquickitemsmodule_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItemsModule @@ -56,7 +54,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKITEMSMODULE_P_H diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index f941371..b0f9106 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_p.h @@ -44,8 +44,6 @@ #include "qquickflickable_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlChangeSet; @@ -352,7 +350,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKITEMVIEW_P_H diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index af895fb..1fa933e 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -50,8 +50,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -364,6 +362,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKITEMVIEW_P_P_H diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index 2667971..4fb4386 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -211,6 +209,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickViewTransitionAttached) QML_DECLARE_TYPEINFO(QQuickViewTransitionAttached, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQUICKITEMVIEWTRANSITION_P_P_H diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index e0ad1ff..3e766f8 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickListView; @@ -205,6 +203,4 @@ QML_DECLARE_TYPEINFO(QQuickListView, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPE(QQuickListView) QML_DECLARE_TYPE(QQuickViewSection) -QT_END_HEADER - #endif // QQUICKLISTVIEW_P_H diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h index ebf9e16..6a69ccd 100644 --- a/src/quick/items/qquickloader_p.h +++ b/src/quick/items/qquickloader_p.h @@ -44,8 +44,6 @@ #include "qquickimplicitsizeitem_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickLoaderPrivate; @@ -115,6 +113,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickLoader) -QT_END_HEADER - #endif // QQUICKLOADER_P_H diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h index eb49535..ad15167 100644 --- a/src/quick/items/qquickmousearea_p.h +++ b/src/quick/items/qquickmousearea_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickMouseEvent; @@ -252,6 +250,4 @@ QML_DECLARE_TYPEINFO(QQuickDrag, QML_HAS_ATTACHED_PROPERTIES) #endif QML_DECLARE_TYPE(QQuickMouseArea) -QT_END_HEADER - #endif // QQUICKMOUSEAREA_P_H diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index 1ab934e..e2ae5ed 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickMultiPointTouchArea; @@ -271,6 +269,4 @@ QML_DECLARE_TYPE(QQuickTouchPoint) QML_DECLARE_TYPE(QQuickGrabGestureEvent) QML_DECLARE_TYPE(QQuickMultiPointTouchArea) -QT_END_HEADER - #endif // QQUICKMULTIPOINTTOUCHAREA_H diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h index d2d7a54..8892400 100644 --- a/src/quick/items/qquickpainteditem.h +++ b/src/quick/items/qquickpainteditem.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPaintedItemPrivate; @@ -125,6 +123,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPaintedItem::PerformanceHints) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKPAINTEDITEM_P_H diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h index 1ee23ed..998707a 100644 --- a/src/quick/items/qquickpathview_p.h +++ b/src/quick/items/qquickpathview_p.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlChangeSet; @@ -281,6 +279,5 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickPathView) QML_DECLARE_TYPEINFO(QQuickPathView, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER #endif // QQUICKPATHVIEW_P_H diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h index 2f22b4e..4fc77d7 100644 --- a/src/quick/items/qquickpincharea_p.h +++ b/src/quick/items/qquickpincharea_p.h @@ -44,8 +44,6 @@ #include "qquickitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QQuickPinch : public QObject @@ -301,7 +299,5 @@ QML_DECLARE_TYPE(QQuickPinch) QML_DECLARE_TYPE(QQuickPinchEvent) QML_DECLARE_TYPE(QQuickPinchArea) -QT_END_HEADER - #endif // QQUICKPINCHAREA_H diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h index 784efea..aeb722d 100644 --- a/src/quick/items/qquickpositioners_p.h +++ b/src/quick/items/qquickpositioners_p.h @@ -51,8 +51,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickBasePositionerPrivate; @@ -318,6 +316,4 @@ QML_DECLARE_TYPE(QQuickFlow) QML_DECLARE_TYPE(QQuickBasePositioner) QML_DECLARE_TYPEINFO(QQuickBasePositioner, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQUICKPOSITIONERS_P_H diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h index 911c3fd..2ad144a 100644 --- a/src/quick/items/qquickrectangle_p.h +++ b/src/quick/items/qquickrectangle_p.h @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QQuickPen : public QObject @@ -178,6 +176,4 @@ QML_DECLARE_TYPE(QQuickGradientStop) QML_DECLARE_TYPE(QQuickGradient) QML_DECLARE_TYPE(QQuickRectangle) -QT_END_HEADER - #endif // QQUICKRECTANGLE_P_H diff --git a/src/quick/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h index 8698b82..be9ed72 100644 --- a/src/quick/items/qquickrepeater_p.h +++ b/src/quick/items/qquickrepeater_p.h @@ -44,8 +44,6 @@ #include "qquickitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlChangeSet; @@ -104,6 +102,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickRepeater) -QT_END_HEADER - #endif // QQUICKREPEATER_P_H diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h index b10785f..264c444 100644 --- a/src/quick/items/qquickscalegrid_p_p.h +++ b/src/quick/items/qquickscalegrid_p_p.h @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickScaleGrid : public QObject @@ -126,6 +124,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickScaleGrid) -QT_END_HEADER - #endif // QQUICKSCALEGRID_P_P_H diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index 014fc07..98f38b7 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -104,6 +102,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPEINFO(QQuickScreen, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index 6abb41b..5c3dcf4 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -52,8 +52,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE const char *qtPositionAttributeName(); @@ -193,6 +191,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSHADEREFFECT_P_H diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h index 15f4d02..9c19b8e 100644 --- a/src/quick/items/qquickshadereffectmesh_p.h +++ b/src/quick/items/qquickshadereffectmesh_p.h @@ -51,8 +51,6 @@ #ifndef QQUICKSHADEREFFECTMESH_P_H #define QQUICKSHADEREFFECTMESH_P_H -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGGeometry; @@ -101,6 +99,4 @@ inline QColor qt_premultiply_color(const QColor &c) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSHADEREFFECTMESH_P_H diff --git a/src/quick/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h index db21d06..a685452 100644 --- a/src/quick/items/qquickshadereffectnode_p.h +++ b/src/quick/items/qquickshadereffectnode_p.h @@ -51,8 +51,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct QQuickShaderEffectMaterialKey { @@ -147,6 +145,4 @@ private Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSHADEREFFECTNODE_P_H diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h index 5c9427a..57aba31 100644 --- a/src/quick/items/qquickshadereffectsource_p.h +++ b/src/quick/items/qquickshadereffectsource_p.h @@ -55,8 +55,6 @@ #define QSG_DEBUG_FBO_OVERLAY -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGNode; @@ -257,6 +255,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSHADEREFFECTSOURCE_P_H diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h index dce28e8..a85059e 100644 --- a/src/quick/items/qquicksprite_p.h +++ b/src/quick/items/qquicksprite_p.h @@ -50,8 +50,6 @@ #include "qquickspriteengine_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickSprite : public QQuickStochasticState @@ -316,5 +314,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QQUICKSPRITE_P_H diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 612a2b4..768b5e4 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -53,8 +53,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickSprite; @@ -323,6 +321,4 @@ inline int spriteCount(QQmlListProperty *p) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSPRITEENGINE_P_H diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h index b07d177..b954a44 100644 --- a/src/quick/items/qquickspritesequence_p.h +++ b/src/quick/items/qquickspritesequence_p.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -145,6 +143,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKSPRITESEQUENCE_P_H diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h index d43420f..9ee0d59 100644 --- a/src/quick/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_p.h @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParentChangePrivate; @@ -213,7 +211,5 @@ QML_DECLARE_TYPE(QQuickParentChange) QML_DECLARE_TYPE(QQuickAnchorSet) QML_DECLARE_TYPE(QQuickAnchorChanges) -QT_END_HEADER - #endif // QQUICKSTATEOPERATIONS_P_H diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index ba0260c..03b436b 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTextPrivate; @@ -295,6 +293,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickText) QML_DECLARE_TYPE(QQuickTextLine) -QT_END_HEADER - #endif // QQUICKTEXT_P_H diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h index 84d6fcc..94eae81 100644 --- a/src/quick/items/qquicktextcontrol_p.h +++ b/src/quick/items/qquicktextcontrol_p.h @@ -63,8 +63,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -196,6 +194,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQuickTextControl_H diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index e88ca16..0538270 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTextEditPrivate; @@ -351,6 +349,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickTextEdit) -QT_END_HEADER - #endif // QQUICKTEXTEDIT_P_H diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 83bc125..602e9dc 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTextInputPrivate; @@ -415,6 +413,4 @@ QML_DECLARE_TYPE(QQuickDoubleValidator) QML_DECLARE_TYPE(QRegExpValidator) #endif -QT_END_HEADER - #endif // QQUICKTEXTINPUT_P_H diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h index 8c3438c..4181f5a 100644 --- a/src/quick/items/qquicktranslate_p.h +++ b/src/quick/items/qquicktranslate_p.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTranslatePrivate; @@ -154,6 +152,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickTranslate) -QT_END_HEADER - #endif diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h index 10bad4c..3e8883d 100644 --- a/src/quick/items/qquickview.h +++ b/src/quick/items/qquickview.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlEngine; @@ -115,6 +113,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKVIEW_H diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h index 4b78d8b..43b17e5 100644 --- a/src/quick/items/qquickview_p.h +++ b/src/quick/items/qquickview_p.h @@ -55,8 +55,6 @@ #include "qquickitemchangelistener_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlContext; @@ -100,6 +98,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKVIEW_P_H diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index a98f3a6..959c52b 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -173,7 +171,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQuickWindow *) -QT_END_HEADER - #endif // QQUICKWINDOW_H diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h index 10f0c63..4afc457 100644 --- a/src/quick/items/qquickwindowmodule_p.h +++ b/src/quick/items/qquickwindowmodule_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -57,6 +55,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/qtquick2_p.h b/src/quick/qtquick2_p.h index ad624e6..47f4939 100644 --- a/src/quick/qtquick2_p.h +++ b/src/quick/qtquick2_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QQmlQtQuick2Module @@ -56,6 +54,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTQUICK2_P_H diff --git a/src/quick/qtquickglobal.h b/src/quick/qtquickglobal.h index 7ac75b2..4cbeb4a 100644 --- a/src/quick/qtquickglobal.h +++ b/src/quick/qtquickglobal.h @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // QTQUICKGLOBAL_H diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h index 5bd6eee..645ba93 100644 --- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h @@ -47,8 +47,6 @@ #include #include "qsgrendernode_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QSGDefaultRenderer : public QSGRenderer @@ -91,6 +89,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMLRENDERER_H diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index c9b44e8..679b773 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGGeometryData; @@ -295,6 +293,4 @@ int QSGGeometry::sizeOfIndex() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGGEOMETRY_H diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index 062311e..5effdbf 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGMaterial; @@ -143,6 +141,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGMaterialShader::RenderState::DirtyStates) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h index 82bb66f..522546d 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.h +++ b/src/quick/scenegraph/coreapi/qsgnode.h @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE //#define QML_RUNTIME_TESTING @@ -335,6 +333,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags) QT_END_NAMESPACE -QT_END_HEADER - #endif // NODE_H diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h index 88eb814..7e57bf5 100644 --- a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGNode; @@ -96,6 +94,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // NODEUPDATER_P_H diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h index 92072e2..5dd5354 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h @@ -55,8 +55,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGMaterialShader; @@ -241,6 +239,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // RENDERER_H diff --git a/src/quick/scenegraph/coreapi/qsgrendernode_p.h b/src/quick/scenegraph/coreapi/qsgrendernode_p.h index 6c3e03b..1f1bc23 100644 --- a/src/quick/scenegraph/coreapi/qsgrendernode_p.h +++ b/src/quick/scenegraph/coreapi/qsgrendernode_p.h @@ -56,8 +56,6 @@ #include "qsgnode.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QSGRenderNode : public QSGNode @@ -110,6 +108,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGRenderNode::StateFlags) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h index 8b37deb..85c1d2e 100644 --- a/src/quick/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -59,8 +59,6 @@ // ### remove #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGNode; @@ -292,6 +290,4 @@ inline bool QSGDistanceFieldGlyphCache::containsGlyph(glyph_t glyph) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index cdc83d1..b069c53 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -54,8 +54,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,6 +138,4 @@ signals: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGCONTEXT_H diff --git a/src/quick/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h index 036bc69..be3987d 100644 --- a/src/quick/scenegraph/qsgcontextplugin_p.h +++ b/src/quick/scenegraph/qsgcontextplugin_p.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -84,6 +82,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGCONTEXTPLUGIN_H diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h index 8f764b2..a1cd381 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode_p.h +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QGlyphs; @@ -80,6 +78,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DEFAULT_GLYPHNODE_H diff --git a/src/quick/scenegraph/qsgdefaultimagenode_p.h b/src/quick/scenegraph/qsgdefaultimagenode_p.h index 07cfa2c..d2b3baa 100644 --- a/src/quick/scenegraph/qsgdefaultimagenode_p.h +++ b/src/quick/scenegraph/qsgdefaultimagenode_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class SmoothTextureMaterial : public QSGTextureMaterial @@ -103,6 +101,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h index f42a1fa..e456078 100644 --- a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h +++ b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -104,6 +102,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h index bb42382..b75a123 100644 --- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGContext; @@ -112,8 +110,6 @@ private: uint m_dirtyMaterial: 1; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // DISTANCEFIELD_GLYPHNODE_H diff --git a/src/quick/scenegraph/qsgflashnode_p.h b/src/quick/scenegraph/qsgflashnode_p.h index 84ea734..d8d2ef4 100644 --- a/src/quick/scenegraph/qsgflashnode_p.h +++ b/src/quick/scenegraph/qsgflashnode_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGFlashNode : public QSGSimpleRectNode @@ -61,7 +59,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGFLASHNODE_H diff --git a/src/quick/scenegraph/qsgrenderloop_p.h b/src/quick/scenegraph/qsgrenderloop_p.h index fc705f4..2ec6de9 100644 --- a/src/quick/scenegraph/qsgrenderloop_p.h +++ b/src/quick/scenegraph/qsgrenderloop_p.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickWindow; @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGRenderLoop_P_H diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h index 0286408..ac613c1 100644 --- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h +++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlatformSharedGraphicsCache; @@ -132,6 +130,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGSHAREDDISTANCEFIELDGLYPHCACHE_H diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h index fd3ab65..4c297f5 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h +++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h @@ -48,8 +48,6 @@ #include "qsgrenderloop_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGRenderThread; @@ -120,6 +118,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGTHREADEDRENDERLOOP_P_H diff --git a/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h b/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h index 479c8e2..f3fb92c 100644 --- a/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h +++ b/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGDepthStencilBufferManager; @@ -137,6 +135,4 @@ extern uint qHash(const QSGDepthStencilBuffer::Format &format); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.h b/src/quick/scenegraph/util/qsgflatcolormaterial.h index 97b8c14..27cf256 100644 --- a/src/quick/scenegraph/util/qsgflatcolormaterial.h +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGFlatColorMaterial : public QSGMaterial @@ -67,6 +65,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // FLATCOLORMATERIAL_H diff --git a/src/quick/scenegraph/util/qsgpainternode_p.h b/src/quick/scenegraph/util/qsgpainternode_p.h index 8c79981..387ca9b 100644 --- a/src/quick/scenegraph/util/qsgpainternode_p.h +++ b/src/quick/scenegraph/util/qsgpainternode_p.h @@ -50,8 +50,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QOpenGLFramebufferObject; @@ -151,8 +149,6 @@ private: bool m_dirtyTexture; }; -QT_END_HEADER - QT_END_NAMESPACE #endif // QSGPAINTERNODE_P_H diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h index 25ac93b..0a733e3 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.h +++ b/src/quick/scenegraph/util/qsgsimplematerial.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE template @@ -215,7 +213,5 @@ Q_INLINE_TEMPLATE void QSGSimpleMaterialShader::updateState(const RenderS QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.h b/src/quick/scenegraph/util/qsgsimplerectnode.h index 2808354..856e679 100644 --- a/src/quick/scenegraph/util/qsgsimplerectnode.h +++ b/src/quick/scenegraph/util/qsgsimplerectnode.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGSimpleRectNode : public QSGGeometryNode @@ -70,6 +68,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // SOLIDRECTNODE_H diff --git a/src/quick/scenegraph/util/qsgsimpletexturenode.h b/src/quick/scenegraph/util/qsgsimpletexturenode.h index a2ce808..ffd1021 100644 --- a/src/quick/scenegraph/util/qsgsimpletexturenode.h +++ b/src/quick/scenegraph/util/qsgsimpletexturenode.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGSimpleTextureNode : public QSGGeometryNode @@ -75,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGSIMPLETEXTURENODE_H diff --git a/src/quick/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h index 9d91d4e..ace29cd 100644 --- a/src/quick/scenegraph/util/qsgtexture.h +++ b/src/quick/scenegraph/util/qsgtexture.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSGTexturePrivate; @@ -127,6 +125,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h index 7fc06c7..cbc4f7d 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial @@ -94,6 +92,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // TEXTUREMATERIAL_H diff --git a/src/quick/scenegraph/util/qsgtexturematerial_p.h b/src/quick/scenegraph/util/qsgtexturematerial_p.h index 346004b..a07cb79 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial_p.h +++ b/src/quick/scenegraph/util/qsgtexturematerial_p.h @@ -45,8 +45,6 @@ #include "qsgtexturematerial.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader @@ -81,6 +79,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGTEXTUREMATERIAL_P_H diff --git a/src/quick/scenegraph/util/qsgtextureprovider.h b/src/quick/scenegraph/util/qsgtextureprovider.h index f492561..608b3c6 100644 --- a/src/quick/scenegraph/util/qsgtextureprovider.h +++ b/src/quick/scenegraph/util/qsgtextureprovider.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGTextureProvider : public QObject @@ -61,6 +59,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.h b/src/quick/scenegraph/util/qsgvertexcolormaterial.h index 7e1eb43..a3ffa48 100644 --- a/src/quick/scenegraph/util/qsgvertexcolormaterial.h +++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGVertexColorMaterial : public QSGMaterial @@ -62,6 +60,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // VERTEXCOLORMATERIAL_H diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h index cb0da61..82d1ba2 100644 --- a/src/quick/util/qquickanimation_p.h +++ b/src/quick/util/qquickanimation_p.h @@ -54,8 +54,6 @@ #include "private/qabstractanimationjob_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAbstractAnimationPrivate; @@ -460,6 +458,4 @@ QML_DECLARE_TYPE(QQuickParallelAnimation) QML_DECLARE_TYPE(QQuickVector3dAnimation) QML_DECLARE_TYPE(QQuickRotationAnimation) -QT_END_HEADER - #endif // QQUICKANIMATION_H diff --git a/src/quick/util/qquickanimationcontroller_p.h b/src/quick/util/qquickanimationcontroller_p.h index 0fe3888..5286e77 100644 --- a/src/quick/util/qquickanimationcontroller_p.h +++ b/src/quick/util/qquickanimationcontroller_p.h @@ -45,8 +45,6 @@ #include #include "qquickanimation_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAnimationControllerPrivate; @@ -89,6 +87,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAnimationController) -QT_END_HEADER - #endif // QQUICKANIMATIONCONTROLLER_H diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h index aa46a6a..2eef59b 100644 --- a/src/quick/util/qquickapplication_p.h +++ b/src/quick/util/qquickapplication_p.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -81,6 +79,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickApplication) -QT_END_HEADER - #endif // QQUICKAPPLICATION_P_H diff --git a/src/quick/util/qquickbehavior_p.h b/src/quick/util/qquickbehavior_p.h index a93b597..0a49891 100644 --- a/src/quick/util/qquickbehavior_p.h +++ b/src/quick/util/qquickbehavior_p.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAbstractAnimation; @@ -88,6 +86,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickBehavior) -QT_END_HEADER - #endif // QQUICKBEHAVIOR_H diff --git a/src/quick/util/qquickfontloader_p.h b/src/quick/util/qquickfontloader_p.h index 9337f5c..1488ffe 100644 --- a/src/quick/util/qquickfontloader_p.h +++ b/src/quick/util/qquickfontloader_p.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickFontLoaderPrivate; @@ -89,7 +87,5 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickFontLoader) -QT_END_HEADER - #endif // QQUICKFONTLOADER_H diff --git a/src/quick/util/qquickimageprovider.h b/src/quick/util/qquickimageprovider.h index 75c2e80..2735c9a 100644 --- a/src/quick/util/qquickimageprovider.h +++ b/src/quick/util/qquickimageprovider.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -87,6 +85,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKIMAGEPROVIDER_H diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h index 545e985..7154585 100644 --- a/src/quick/util/qquickpath_p.h +++ b/src/quick/util/qquickpath_p.h @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickCurve; @@ -446,6 +444,4 @@ QML_DECLARE_TYPE(QQuickPathSvg) QML_DECLARE_TYPE(QQuickPathPercent) QML_DECLARE_TYPE(QQuickPath) -QT_END_HEADER - #endif // QQUICKPATH_H diff --git a/src/quick/util/qquickpathinterpolator_p.h b/src/quick/util/qquickpathinterpolator_p.h index f5414e0..b66af40 100644 --- a/src/quick/util/qquickpathinterpolator_p.h +++ b/src/quick/util/qquickpathinterpolator_p.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPath; @@ -93,6 +91,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickPathInterpolator) -QT_END_HEADER - #endif // QQUICKPATHINTERPOLATOR_P_H diff --git a/src/quick/util/qquickpixmapcache_p.h b/src/quick/util/qquickpixmapcache_p.h index a6c2a7c..3fefa35 100644 --- a/src/quick/util/qquickpixmapcache_p.h +++ b/src/quick/util/qquickpixmapcache_p.h @@ -51,8 +51,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlEngine; @@ -139,6 +137,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPixmap::Options) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKPIXMAPCACHE_H diff --git a/src/quick/util/qquickpropertychanges_p.h b/src/quick/util/qquickpropertychanges_p.h index 95320af..674dfa7 100644 --- a/src/quick/util/qquickpropertychanges_p.h +++ b/src/quick/util/qquickpropertychanges_p.h @@ -45,8 +45,6 @@ #include "qquickstatechangescript_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPropertyChangesPrivate; @@ -105,6 +103,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickPropertyChanges) -QT_END_HEADER - #endif // QQUICKPROPERTYCHANGES_H diff --git a/src/quick/util/qquicksmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h index 644ebf2..7bf8b6c 100644 --- a/src/quick/util/qquicksmoothedanimation_p.h +++ b/src/quick/util/qquicksmoothedanimation_p.h @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlProperty; @@ -95,6 +93,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickSmoothedAnimation) -QT_END_HEADER - #endif // QQUICKSMOOTHEDANIMATION_H diff --git a/src/quick/util/qquickspringanimation_p.h b/src/quick/util/qquickspringanimation_p.h index f43d6a4..14968b7 100644 --- a/src/quick/util/qquickspringanimation_p.h +++ b/src/quick/util/qquickspringanimation_p.h @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickSpringAnimationPrivate; @@ -102,6 +100,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickSpringAnimation) -QT_END_HEADER - #endif // QQUICKSPRINGANIMATION_H diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h index e9324f4..6a7b1b3 100644 --- a/src/quick/util/qquickstate_p.h +++ b/src/quick/util/qquickstate_p.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickActionEvent; @@ -205,6 +203,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickStateOperation) QML_DECLARE_TYPE(QQuickState) -QT_END_HEADER - #endif // QQUICKSTATE_H diff --git a/src/quick/util/qquickstatechangescript_p.h b/src/quick/util/qquickstatechangescript_p.h index 8d3e380..3d8e139 100644 --- a/src/quick/util/qquickstatechangescript_p.h +++ b/src/quick/util/qquickstatechangescript_p.h @@ -45,8 +45,6 @@ #include "qquickstate_p.h" #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickStateChangeScriptPrivate; @@ -80,6 +78,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickStateChangeScript) -QT_END_HEADER - #endif // QQUICKSTATEOPERATIONS_H diff --git a/src/quick/util/qquickstategroup_p.h b/src/quick/util/qquickstategroup_p.h index ccd928a..b8e3423 100644 --- a/src/quick/util/qquickstategroup_p.h +++ b/src/quick/util/qquickstategroup_p.h @@ -44,8 +44,6 @@ #include "qquickstate_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickStateGroupPrivate; @@ -90,6 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickStateGroup) -QT_END_HEADER - #endif // QQUICKSTATEGROUP_H diff --git a/src/quick/util/qquicksystempalette_p.h b/src/quick/util/qquicksystempalette_p.h index c8267b6..6ff3182 100644 --- a/src/quick/util/qquicksystempalette_p.h +++ b/src/quick/util/qquicksystempalette_p.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickSystemPalettePrivate; @@ -115,6 +113,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickSystemPalette) -QT_END_HEADER - #endif // QQUICKSYSTEMPALETTE_H diff --git a/src/quick/util/qquicktransition_p.h b/src/quick/util/qquicktransition_p.h index 6ed2ad6..831aec0 100644 --- a/src/quick/util/qquicktransition_p.h +++ b/src/quick/util/qquicktransition_p.h @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickAbstractAnimation; @@ -127,6 +125,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickTransition) -QT_END_HEADER - #endif // QQUICKTRANSITION_H diff --git a/src/quick/util/qquickutilmodule_p.h b/src/quick/util/qquickutilmodule_p.h index 5a7406b..360480a 100644 --- a/src/quick/util/qquickutilmodule_p.h +++ b/src/quick/util/qquickutilmodule_p.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickUtilModule @@ -56,6 +54,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKUTILMODULE_H diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h index 557cbd4..2f8756f 100644 --- a/src/quick/util/qquickvaluetypes_p.h +++ b/src/quick/util/qquickvaluetypes_p.h @@ -54,8 +54,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QQuickValueTypes { @@ -365,6 +363,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKVALUETYPES_P_H -- 2.7.4