From 37f34eb393d750c310e93e95b964a28a0118ad3a Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@digia.com>
Date: Sun, 27 Jan 2013 10:41:42 +0100
Subject: [PATCH] Remove QT_{BEGIN,END}_HEADER macro usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: I74e76ed86361fbbf8957bf7a0540f2bd3350eb0a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
src/xmlpatterns/acceltree/qacceliterators_p.h | 4 ----
src/xmlpatterns/acceltree/qacceltree_p.h | 4 ----
src/xmlpatterns/acceltree/qacceltreebuilder_p.h | 4 ----
src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h | 4 ----
src/xmlpatterns/acceltree/qcompressedwhitespace_p.h | 4 ----
src/xmlpatterns/api/qabstractmessagehandler.h | 4 ----
src/xmlpatterns/api/qabstracturiresolver.h | 3 ---
src/xmlpatterns/api/qabstractxmlforwarditerator_p.h | 4 ----
src/xmlpatterns/api/qabstractxmlnodemodel.h | 3 ---
src/xmlpatterns/api/qabstractxmlnodemodel_p.h | 4 ----
src/xmlpatterns/api/qabstractxmlpullprovider_p.h | 4 ----
src/xmlpatterns/api/qabstractxmlreceiver.h | 4 ----
src/xmlpatterns/api/qabstractxmlreceiver_p.h | 4 ----
src/xmlpatterns/api/qcoloringmessagehandler_p.h | 4 ----
src/xmlpatterns/api/qcoloroutput_p.h | 4 ----
src/xmlpatterns/api/qdeviceresourceloader_p.h | 3 ---
src/xmlpatterns/api/qnetworkaccessdelegator_p.h | 3 ---
src/xmlpatterns/api/qpullbridge_p.h | 4 ----
src/xmlpatterns/api/qreferencecountedvalue_p.h | 2 --
src/xmlpatterns/api/qresourcedelegator_p.h | 2 --
src/xmlpatterns/api/qsimplexmlnodemodel.h | 4 ----
src/xmlpatterns/api/qsourcelocation.h | 4 ----
src/xmlpatterns/api/qtxmlpatternsglobal.h | 4 ----
src/xmlpatterns/api/qvariableloader_p.h | 4 ----
src/xmlpatterns/api/qxmlformatter.h | 4 ----
src/xmlpatterns/api/qxmlname.h | 4 ----
src/xmlpatterns/api/qxmlnamepool.h | 4 ----
src/xmlpatterns/api/qxmlpatternistcli_p.h | 4 ----
src/xmlpatterns/api/qxmlquery.h | 2 --
src/xmlpatterns/api/qxmlquery_p.h | 2 --
src/xmlpatterns/api/qxmlresultitems.h | 2 --
src/xmlpatterns/api/qxmlschema.h | 3 ---
src/xmlpatterns/api/qxmlschema_p.h | 4 ----
src/xmlpatterns/api/qxmlschemavalidator.h | 3 ---
src/xmlpatterns/api/qxmlschemavalidator_p.h | 4 ----
src/xmlpatterns/api/qxmlserializer.h | 4 ----
src/xmlpatterns/api/qxmlserializer_p.h | 3 ---
src/xmlpatterns/data/qabstractdatetime_p.h | 4 ----
src/xmlpatterns/data/qabstractduration_p.h | 4 ----
src/xmlpatterns/data/qabstractfloat_p.h | 4 ----
src/xmlpatterns/data/qabstractfloatcasters_p.h | 4 ----
src/xmlpatterns/data/qabstractfloatmathematician_p.h | 2 --
src/xmlpatterns/data/qanyuri_p.h | 4 ----
src/xmlpatterns/data/qatomiccaster_p.h | 4 ----
src/xmlpatterns/data/qatomiccasters_p.h | 4 ----
src/xmlpatterns/data/qatomiccomparator_p.h | 4 ----
src/xmlpatterns/data/qatomiccomparators_p.h | 4 ----
src/xmlpatterns/data/qatomicmathematician_p.h | 4 ----
src/xmlpatterns/data/qatomicmathematicians_p.h | 4 ----
src/xmlpatterns/data/qatomicstring_p.h | 4 ----
src/xmlpatterns/data/qbase64binary_p.h | 4 ----
src/xmlpatterns/data/qboolean_p.h | 3 ---
src/xmlpatterns/data/qcommonvalues_p.h | 4 ----
src/xmlpatterns/data/qcomparisonfactory_p.h | 2 --
src/xmlpatterns/data/qdate_p.h | 4 ----
src/xmlpatterns/data/qdaytimeduration_p.h | 4 ----
src/xmlpatterns/data/qdecimal_p.h | 4 ----
src/xmlpatterns/data/qderivedinteger_p.h | 4 ----
src/xmlpatterns/data/qderivedstring_p.h | 4 ----
src/xmlpatterns/data/qduration_p.h | 4 ----
src/xmlpatterns/data/qgday_p.h | 4 ----
src/xmlpatterns/data/qgmonth_p.h | 4 ----
src/xmlpatterns/data/qgmonthday_p.h | 4 ----
src/xmlpatterns/data/qgyear_p.h | 4 ----
src/xmlpatterns/data/qgyearmonth_p.h | 4 ----
src/xmlpatterns/data/qhexbinary_p.h | 4 ----
src/xmlpatterns/data/qinteger_p.h | 4 ----
src/xmlpatterns/data/qitem_p.h | 4 ----
src/xmlpatterns/data/qnodebuilder_p.h | 4 ----
src/xmlpatterns/data/qqnamevalue_p.h | 4 ----
src/xmlpatterns/data/qresourceloader_p.h | 4 ----
src/xmlpatterns/data/qschemadatetime_p.h | 4 ----
src/xmlpatterns/data/qschemanumeric_p.h | 4 ----
src/xmlpatterns/data/qschematime_p.h | 4 ----
src/xmlpatterns/data/qsequencereceiver_p.h | 4 ----
src/xmlpatterns/data/qsorttuple_p.h | 4 ----
src/xmlpatterns/data/quntypedatomic_p.h | 4 ----
src/xmlpatterns/data/qvalidationerror_p.h | 4 ----
src/xmlpatterns/data/qvaluefactory_p.h | 2 --
src/xmlpatterns/data/qyearmonthduration_p.h | 4 ----
src/xmlpatterns/environment/qcurrentitemcontext_p.h | 4 ----
src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h | 4 ----
src/xmlpatterns/environment/qdelegatingstaticcontext_p.h | 4 ----
src/xmlpatterns/environment/qdynamiccontext_p.h | 4 ----
src/xmlpatterns/environment/qfocus_p.h | 4 ----
src/xmlpatterns/environment/qgenericdynamiccontext_p.h | 4 ----
src/xmlpatterns/environment/qgenericstaticcontext_p.h | 4 ----
src/xmlpatterns/environment/qreceiverdynamiccontext_p.h | 4 ----
src/xmlpatterns/environment/qreportcontext_p.h | 4 ----
src/xmlpatterns/environment/qstackcontextbase_p.h | 4 ----
src/xmlpatterns/environment/qstaticbaseuricontext_p.h | 4 ----
src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h | 2 --
src/xmlpatterns/environment/qstaticcontext_p.h | 4 ----
src/xmlpatterns/environment/qstaticcurrentcontext_p.h | 4 ----
src/xmlpatterns/environment/qstaticfocuscontext_p.h | 4 ----
src/xmlpatterns/environment/qstaticnamespacecontext_p.h | 4 ----
src/xmlpatterns/expr/qandexpression_p.h | 4 ----
src/xmlpatterns/expr/qapplytemplate_p.h | 2 --
src/xmlpatterns/expr/qargumentreference_p.h | 4 ----
src/xmlpatterns/expr/qarithmeticexpression_p.h | 4 ----
src/xmlpatterns/expr/qattributeconstructor_p.h | 4 ----
src/xmlpatterns/expr/qattributenamevalidator_p.h | 4 ----
src/xmlpatterns/expr/qaxisstep_p.h | 4 ----
src/xmlpatterns/expr/qcachecells_p.h | 4 ----
src/xmlpatterns/expr/qcallsite_p.h | 2 --
src/xmlpatterns/expr/qcalltargetdescription_p.h | 4 ----
src/xmlpatterns/expr/qcalltemplate_p.h | 2 --
src/xmlpatterns/expr/qcastableas_p.h | 4 ----
src/xmlpatterns/expr/qcastas_p.h | 4 ----
src/xmlpatterns/expr/qcastingplatform_p.h | 4 ----
src/xmlpatterns/expr/qcollationchecker_p.h | 4 ----
src/xmlpatterns/expr/qcombinenodes_p.h | 4 ----
src/xmlpatterns/expr/qcommentconstructor_p.h | 4 ----
src/xmlpatterns/expr/qcomparisonplatform_p.h | 4 ----
src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h | 4 ----
src/xmlpatterns/expr/qcontextitem_p.h | 4 ----
src/xmlpatterns/expr/qcopyof_p.h | 4 ----
src/xmlpatterns/expr/qcurrentitemstore_p.h | 4 ----
src/xmlpatterns/expr/qdocumentconstructor_p.h | 4 ----
src/xmlpatterns/expr/qdocumentcontentvalidator_p.h | 4 ----
src/xmlpatterns/expr/qdynamiccontextstore_p.h | 4 ----
src/xmlpatterns/expr/qelementconstructor_p.h | 4 ----
src/xmlpatterns/expr/qemptycontainer_p.h | 4 ----
src/xmlpatterns/expr/qemptysequence_p.h | 4 ----
src/xmlpatterns/expr/qevaluationcache_p.h | 4 ----
src/xmlpatterns/expr/qexpression_p.h | 4 ----
src/xmlpatterns/expr/qexpressiondispatch_p.h | 4 ----
src/xmlpatterns/expr/qexpressionfactory_p.h | 4 ----
src/xmlpatterns/expr/qexpressionsequence_p.h | 4 ----
src/xmlpatterns/expr/qexpressionvariablereference_p.h | 4 ----
src/xmlpatterns/expr/qexternalvariableloader_p.h | 4 ----
src/xmlpatterns/expr/qexternalvariablereference_p.h | 4 ----
src/xmlpatterns/expr/qfirstitempredicate_p.h | 4 ----
src/xmlpatterns/expr/qforclause_p.h | 4 ----
src/xmlpatterns/expr/qgeneralcomparison_p.h | 4 ----
src/xmlpatterns/expr/qgenericpredicate_p.h | 4 ----
src/xmlpatterns/expr/qifthenclause_p.h | 4 ----
src/xmlpatterns/expr/qinstanceof_p.h | 4 ----
src/xmlpatterns/expr/qletclause_p.h | 4 ----
src/xmlpatterns/expr/qliteral_p.h | 4 ----
src/xmlpatterns/expr/qliteralsequence_p.h | 4 ----
src/xmlpatterns/expr/qnamespaceconstructor_p.h | 4 ----
src/xmlpatterns/expr/qncnameconstructor_p.h | 4 ----
src/xmlpatterns/expr/qnodecomparison_p.h | 4 ----
src/xmlpatterns/expr/qnodesort_p.h | 4 ----
src/xmlpatterns/expr/qoperandsiterator_p.h | 3 ---
src/xmlpatterns/expr/qoptimizationpasses_p.h | 4 ----
src/xmlpatterns/expr/qoptimizerblocks_p.h | 4 ----
src/xmlpatterns/expr/qoptimizerframework_p.h | 4 ----
src/xmlpatterns/expr/qorderby_p.h | 4 ----
src/xmlpatterns/expr/qorexpression_p.h | 4 ----
src/xmlpatterns/expr/qpaircontainer_p.h | 4 ----
src/xmlpatterns/expr/qparentnodeaxis_p.h | 4 ----
src/xmlpatterns/expr/qpath_p.h | 4 ----
src/xmlpatterns/expr/qpositionalvariablereference_p.h | 4 ----
src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h | 4 ----
src/xmlpatterns/expr/qqnameconstructor_p.h | 4 ----
src/xmlpatterns/expr/qquantifiedexpression_p.h | 4 ----
src/xmlpatterns/expr/qrangeexpression_p.h | 4 ----
src/xmlpatterns/expr/qrangevariablereference_p.h | 4 ----
src/xmlpatterns/expr/qreturnorderby_p.h | 4 ----
src/xmlpatterns/expr/qsimplecontentconstructor_p.h | 4 ----
src/xmlpatterns/expr/qsinglecontainer_p.h | 4 ----
src/xmlpatterns/expr/qsourcelocationreflection_p.h | 4 ----
src/xmlpatterns/expr/qstaticbaseuristore_p.h | 4 ----
src/xmlpatterns/expr/qstaticcompatibilitystore_p.h | 4 ----
src/xmlpatterns/expr/qtemplate_p.h | 2 --
src/xmlpatterns/expr/qtemplateinvoker_p.h | 2 --
src/xmlpatterns/expr/qtemplatemode_p.h | 3 ---
src/xmlpatterns/expr/qtemplateparameterreference_p.h | 2 --
src/xmlpatterns/expr/qtemplatepattern_p.h | 3 ---
src/xmlpatterns/expr/qtextnodeconstructor_p.h | 4 ----
src/xmlpatterns/expr/qtreatas_p.h | 4 ----
src/xmlpatterns/expr/qtriplecontainer_p.h | 4 ----
src/xmlpatterns/expr/qtruthpredicate_p.h | 4 ----
src/xmlpatterns/expr/qunaryexpression_p.h | 4 ----
src/xmlpatterns/expr/qunlimitedcontainer_p.h | 4 ----
src/xmlpatterns/expr/qunresolvedvariablereference_p.h | 2 --
src/xmlpatterns/expr/quserfunction_p.h | 4 ----
src/xmlpatterns/expr/quserfunctioncallsite_p.h | 3 ---
src/xmlpatterns/expr/qvalidate_p.h | 4 ----
src/xmlpatterns/expr/qvaluecomparison_p.h | 4 ----
src/xmlpatterns/expr/qvariabledeclaration_p.h | 4 ----
src/xmlpatterns/expr/qvariablereference_p.h | 4 ----
src/xmlpatterns/expr/qwithparam_p.h | 4 ----
src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h | 2 --
src/xmlpatterns/functions/qabstractfunctionfactory_p.h | 4 ----
src/xmlpatterns/functions/qaccessorfns_p.h | 4 ----
src/xmlpatterns/functions/qaggregatefns_p.h | 4 ----
src/xmlpatterns/functions/qaggregator_p.h | 4 ----
src/xmlpatterns/functions/qassemblestringfns_p.h | 4 ----
src/xmlpatterns/functions/qbooleanfns_p.h | 4 ----
src/xmlpatterns/functions/qcomparescaseaware_p.h | 4 ----
src/xmlpatterns/functions/qcomparestringfns_p.h | 4 ----
src/xmlpatterns/functions/qcomparingaggregator_p.h | 4 ----
src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h | 4 ----
src/xmlpatterns/functions/qcontextfns_p.h | 4 ----
src/xmlpatterns/functions/qcontextnodechecker_p.h | 2 --
src/xmlpatterns/functions/qcurrentfn_p.h | 4 ----
src/xmlpatterns/functions/qdatetimefn_p.h | 4 ----
src/xmlpatterns/functions/qdatetimefns_p.h | 4 ----
src/xmlpatterns/functions/qdeepequalfn_p.h | 4 ----
src/xmlpatterns/functions/qdocumentfn_p.h | 4 ----
src/xmlpatterns/functions/qelementavailablefn_p.h | 3 ---
src/xmlpatterns/functions/qerrorfn_p.h | 4 ----
src/xmlpatterns/functions/qfunctionargument_p.h | 4 ----
src/xmlpatterns/functions/qfunctionavailablefn_p.h | 4 ----
src/xmlpatterns/functions/qfunctioncall_p.h | 4 ----
src/xmlpatterns/functions/qfunctionfactory_p.h | 4 ----
src/xmlpatterns/functions/qfunctionfactorycollection_p.h | 4 ----
src/xmlpatterns/functions/qfunctionsignature_p.h | 4 ----
src/xmlpatterns/functions/qgenerateidfn_p.h | 4 ----
src/xmlpatterns/functions/qnodefns_p.h | 4 ----
src/xmlpatterns/functions/qnumericfns_p.h | 4 ----
src/xmlpatterns/functions/qpatternmatchingfns_p.h | 4 ----
src/xmlpatterns/functions/qpatternplatform_p.h | 4 ----
src/xmlpatterns/functions/qqnamefns_p.h | 4 ----
src/xmlpatterns/functions/qresolveurifn_p.h | 4 ----
src/xmlpatterns/functions/qsequencefns_p.h | 4 ----
src/xmlpatterns/functions/qsequencegeneratingfns_p.h | 3 ---
src/xmlpatterns/functions/qstaticbaseuricontainer_p.h | 3 +--
src/xmlpatterns/functions/qstaticnamespacescontainer_p.h | 4 ----
src/xmlpatterns/functions/qstringvaluefns_p.h | 4 ----
src/xmlpatterns/functions/qsubstringfns_p.h | 4 ----
src/xmlpatterns/functions/qsystempropertyfn_p.h | 4 ----
src/xmlpatterns/functions/qtimezonefns_p.h | 4 ----
src/xmlpatterns/functions/qtracefn_p.h | 4 ----
src/xmlpatterns/functions/qtypeavailablefn_p.h | 4 ----
src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h | 4 ----
src/xmlpatterns/functions/qunparsedentityurifn_p.h | 4 ----
src/xmlpatterns/functions/qunparsedtextavailablefn_p.h | 4 ----
src/xmlpatterns/functions/qunparsedtextfn_p.h | 4 ----
src/xmlpatterns/functions/qxpath10corefunctions_p.h | 4 ----
src/xmlpatterns/functions/qxpath20corefunctions_p.h | 4 ----
src/xmlpatterns/functions/qxslt20corefunctions_p.h | 4 ----
src/xmlpatterns/iterators/qcachingiterator_p.h | 4 ----
src/xmlpatterns/iterators/qdeduplicateiterator_p.h | 4 ----
src/xmlpatterns/iterators/qdistinctiterator_p.h | 4 ----
src/xmlpatterns/iterators/qemptyiterator_p.h | 4 ----
src/xmlpatterns/iterators/qexceptiterator_p.h | 4 ----
src/xmlpatterns/iterators/qindexofiterator_p.h | 4 ----
src/xmlpatterns/iterators/qinsertioniterator_p.h | 4 ----
src/xmlpatterns/iterators/qintersectiterator_p.h | 4 ----
src/xmlpatterns/iterators/qitemmappingiterator_p.h | 4 ----
src/xmlpatterns/iterators/qrangeiterator_p.h | 4 ----
src/xmlpatterns/iterators/qremovaliterator_p.h | 4 ----
src/xmlpatterns/iterators/qsequencemappingiterator_p.h | 4 ----
src/xmlpatterns/iterators/qsingletoniterator_p.h | 4 ----
src/xmlpatterns/iterators/qsubsequenceiterator_p.h | 4 ----
src/xmlpatterns/iterators/qtocodepointsiterator_p.h | 4 ----
src/xmlpatterns/iterators/qunioniterator_p.h | 4 ----
src/xmlpatterns/janitors/qargumentconverter_p.h | 4 ----
src/xmlpatterns/janitors/qatomizer_p.h | 4 ----
src/xmlpatterns/janitors/qcardinalityverifier_p.h | 4 ----
src/xmlpatterns/janitors/qebvextractor_p.h | 4 ----
src/xmlpatterns/janitors/qitemverifier_p.h | 4 ----
src/xmlpatterns/janitors/quntypedatomicconverter_p.h | 4 ----
src/xmlpatterns/parser/qmaintainingreader_p.h | 2 --
src/xmlpatterns/parser/qparsercontext_p.h | 4 ----
src/xmlpatterns/parser/qtokenizer_p.h | 4 ----
src/xmlpatterns/parser/qtokenrevealer_p.h | 3 ---
src/xmlpatterns/parser/qtokensource_p.h | 4 ----
src/xmlpatterns/parser/qxquerytokenizer_p.h | 4 ----
src/xmlpatterns/parser/qxslttokenizer_p.h | 4 ----
src/xmlpatterns/projection/qdocumentprojector_p.h | 4 ----
src/xmlpatterns/projection/qprojectedexpression_p.h | 4 ----
src/xmlpatterns/schema/qnamespacesupport_p.h | 4 ----
src/xmlpatterns/schema/qxsdalternative_p.h | 4 ----
src/xmlpatterns/schema/qxsdannotated_p.h | 4 ----
src/xmlpatterns/schema/qxsdannotation_p.h | 4 ----
src/xmlpatterns/schema/qxsdapplicationinformation_p.h | 4 ----
src/xmlpatterns/schema/qxsdassertion_p.h | 4 ----
src/xmlpatterns/schema/qxsdattribute_p.h | 4 ----
src/xmlpatterns/schema/qxsdattributegroup_p.h | 4 ----
src/xmlpatterns/schema/qxsdattributereference_p.h | 4 ----
src/xmlpatterns/schema/qxsdattributeterm_p.h | 4 ----
src/xmlpatterns/schema/qxsdattributeuse_p.h | 4 ----
src/xmlpatterns/schema/qxsdcomplextype_p.h | 4 ----
src/xmlpatterns/schema/qxsddocumentation_p.h | 4 ----
src/xmlpatterns/schema/qxsdelement_p.h | 4 ----
src/xmlpatterns/schema/qxsdfacet_p.h | 4 ----
src/xmlpatterns/schema/qxsdidcache_p.h | 4 ----
src/xmlpatterns/schema/qxsdidchelper_p.h | 4 ----
src/xmlpatterns/schema/qxsdidentityconstraint_p.h | 4 ----
src/xmlpatterns/schema/qxsdinstancereader_p.h | 4 ----
src/xmlpatterns/schema/qxsdmodelgroup_p.h | 4 ----
src/xmlpatterns/schema/qxsdnotation_p.h | 4 ----
src/xmlpatterns/schema/qxsdparticle_p.h | 4 ----
src/xmlpatterns/schema/qxsdparticlechecker_p.h | 4 ----
src/xmlpatterns/schema/qxsdreference_p.h | 4 ----
src/xmlpatterns/schema/qxsdschema_p.h | 4 ----
src/xmlpatterns/schema/qxsdschemachecker_p.h | 4 ----
src/xmlpatterns/schema/qxsdschemacontext_p.h | 4 ----
src/xmlpatterns/schema/qxsdschemadebugger_p.h | 4 ----
src/xmlpatterns/schema/qxsdschemahelper_p.h | 4 ----
src/xmlpatterns/schema/qxsdschemamerger_p.h | 4 ----
src/xmlpatterns/schema/qxsdschemaparser_p.h | 4 ----
src/xmlpatterns/schema/qxsdschemaparsercontext_p.h | 4 ----
src/xmlpatterns/schema/qxsdschemaresolver_p.h | 4 ----
src/xmlpatterns/schema/qxsdschematypesfactory_p.h | 4 ----
src/xmlpatterns/schema/qxsdsimpletype_p.h | 4 ----
src/xmlpatterns/schema/qxsdstatemachine_p.h | 4 ----
src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h | 4 ----
src/xmlpatterns/schema/qxsdterm_p.h | 4 ----
src/xmlpatterns/schema/qxsdtypechecker_p.h | 4 ----
src/xmlpatterns/schema/qxsduserschematype_p.h | 4 ----
src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h | 4 ----
src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h | 4 ----
src/xmlpatterns/schema/qxsdwildcard_p.h | 4 ----
src/xmlpatterns/schema/qxsdxpathexpression_p.h | 4 ----
src/xmlpatterns/type/qabstractnodetest_p.h | 4 ----
src/xmlpatterns/type/qanyitemtype_p.h | 4 ----
src/xmlpatterns/type/qanynodetype_p.h | 4 ----
src/xmlpatterns/type/qanysimpletype_p.h | 4 ----
src/xmlpatterns/type/qanytype_p.h | 4 ----
src/xmlpatterns/type/qatomiccasterlocator_p.h | 4 ----
src/xmlpatterns/type/qatomiccasterlocators_p.h | 4 ----
src/xmlpatterns/type/qatomiccomparatorlocator_p.h | 4 ----
src/xmlpatterns/type/qatomiccomparatorlocators_p.h | 4 ----
src/xmlpatterns/type/qatomicmathematicianlocator_p.h | 4 ----
src/xmlpatterns/type/qatomicmathematicianlocators_p.h | 4 ----
src/xmlpatterns/type/qatomictype_p.h | 4 ----
src/xmlpatterns/type/qatomictypedispatch_p.h | 4 ----
src/xmlpatterns/type/qbasictypesfactory_p.h | 4 ----
src/xmlpatterns/type/qbuiltinatomictype_p.h | 4 ----
src/xmlpatterns/type/qbuiltinatomictypes_p.h | 4 ----
src/xmlpatterns/type/qbuiltinnodetype_p.h | 4 ----
src/xmlpatterns/type/qbuiltintypes_p.h | 4 ----
src/xmlpatterns/type/qcardinality_p.h | 4 ----
src/xmlpatterns/type/qcommonsequencetypes_p.h | 4 ----
src/xmlpatterns/type/qebvtype_p.h | 4 ----
src/xmlpatterns/type/qemptysequencetype_p.h | 4 ----
src/xmlpatterns/type/qgenericsequencetype_p.h | 4 ----
src/xmlpatterns/type/qitemtype_p.h | 4 ----
src/xmlpatterns/type/qlocalnametest_p.h | 4 ----
src/xmlpatterns/type/qmultiitemtype_p.h | 4 ----
src/xmlpatterns/type/qnamedschemacomponent_p.h | 4 ----
src/xmlpatterns/type/qnamespacenametest_p.h | 4 ----
src/xmlpatterns/type/qnonetype_p.h | 4 ----
src/xmlpatterns/type/qnumerictype_p.h | 4 ----
src/xmlpatterns/type/qprimitives_p.h | 4 ----
src/xmlpatterns/type/qqnametest_p.h | 4 ----
src/xmlpatterns/type/qschemacomponent_p.h | 4 ----
src/xmlpatterns/type/qschematype_p.h | 4 ----
src/xmlpatterns/type/qschematypefactory_p.h | 4 ----
src/xmlpatterns/type/qsequencetype_p.h | 4 ----
src/xmlpatterns/type/qtypechecker_p.h | 4 ----
src/xmlpatterns/type/quntyped_p.h | 4 ----
src/xmlpatterns/type/qxsltnodetest_p.h | 4 ----
src/xmlpatterns/utils/qcommonnamespaces_p.h | 4 ----
src/xmlpatterns/utils/qcppcastinghelper_p.h | 4 ----
src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h | 4 ----
src/xmlpatterns/utils/qgenericnamespaceresolver_p.h | 4 ----
src/xmlpatterns/utils/qnamepool_p.h | 4 ----
src/xmlpatterns/utils/qnamespacebinding_p.h | 4 ----
src/xmlpatterns/utils/qnamespaceresolver_p.h | 4 ----
src/xmlpatterns/utils/qnodenamespaceresolver_p.h | 4 ----
src/xmlpatterns/utils/qoutputvalidator_p.h | 4 ----
src/xmlpatterns/utils/qxpathhelper_p.h | 4 ----
tests/auto/xmlpatternssdk/ASTItem.h | 4 ----
tests/auto/xmlpatternssdk/DebugExpressionFactory.h | 4 ----
tests/auto/xmlpatternssdk/ErrorHandler.h | 4 ----
tests/auto/xmlpatternssdk/ErrorItem.h | 4 ----
tests/auto/xmlpatternssdk/ExitCode.h | 4 ----
tests/auto/xmlpatternssdk/ExpressionInfo.h | 4 ----
tests/auto/xmlpatternssdk/ExpressionNamer.h | 4 ----
tests/auto/xmlpatternssdk/ExternalSourceLoader.h | 4 ----
tests/auto/xmlpatternssdk/Global.h | 4 ----
tests/auto/xmlpatternssdk/ResultThreader.h | 4 ----
tests/auto/xmlpatternssdk/TestBaseLine.h | 4 ----
tests/auto/xmlpatternssdk/TestCase.h | 4 ----
tests/auto/xmlpatternssdk/TestContainer.h | 4 ----
tests/auto/xmlpatternssdk/TestGroup.h | 4 ----
tests/auto/xmlpatternssdk/TestItem.h | 4 ----
tests/auto/xmlpatternssdk/TestResult.h | 4 ----
tests/auto/xmlpatternssdk/TestResultHandler.h | 4 ----
tests/auto/xmlpatternssdk/TestSuite.h | 4 ----
tests/auto/xmlpatternssdk/TestSuiteHandler.h | 4 ----
tests/auto/xmlpatternssdk/TestSuiteResult.h | 4 ----
tests/auto/xmlpatternssdk/TreeItem.h | 4 ----
tests/auto/xmlpatternssdk/TreeModel.h | 4 ----
tests/auto/xmlpatternssdk/Worker.h | 4 ----
tests/auto/xmlpatternssdk/XMLWriter.h | 4 ----
tests/auto/xmlpatternssdk/XQTSTestCase.h | 4 ----
tests/auto/xmlpatternssdk/XSDTSTestCase.h | 2 --
tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h | 2 --
tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h | 4 ----
tests/auto/xmlpatternssdk/tests/XMLWriterTest.h | 4 ----
tests/auto/xmlpatternsview/view/FunctionSignaturesView.h | 4 ----
tests/auto/xmlpatternsview/view/MainWindow.h | 4 ----
tests/auto/xmlpatternsview/view/TestCaseView.h | 4 ----
tests/auto/xmlpatternsview/view/TestResultView.h | 4 ----
tests/auto/xmlpatternsview/view/TreeSortFilter.h | 4 ----
tests/auto/xmlpatternsview/view/UserTestCase.h | 4 ----
tests/auto/xmlpatternsview/view/XDTItemItem.h | 4 ----
tools/xmlpatterns/qapplicationargument_p.h | 3 +--
tools/xmlpatterns/qapplicationargumentparser_p.h | 3 +--
tools/xmlpatternsvalidator/main.h | 3 ---
398 files changed, 3 insertions(+), 1528 deletions(-)
diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h
index 45c9c000..0b1c0a4d 100644
--- a/src/xmlpatterns/acceltree/qacceliterators_p.h
+++ b/src/xmlpatterns/acceltree/qacceliterators_p.h
@@ -55,8 +55,6 @@
#include <private/qacceltree_p.h>
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -408,6 +406,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h
index def20c67..0b32e719 100644
--- a/src/xmlpatterns/acceltree/qacceltree_p.h
+++ b/src/xmlpatterns/acceltree/qacceltree_p.h
@@ -60,8 +60,6 @@
#include <private/qitem_p.h>
#include <private/qnamepool_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -399,6 +397,4 @@ Q_DECLARE_TYPEINFO(QPatternist::AccelTree::BasicNodeData, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
index 8e7eafa2..23c9a302 100644
--- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
@@ -66,8 +66,6 @@
#include <private/qpatternistlocale_p.h>
#include <QtDebug>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -199,6 +197,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
index e0f639c5..51bc5314 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
@@ -63,8 +63,6 @@
#include <private/qnetworkaccessdelegator_p.h>
#include <private/qreportcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QIODevice;
@@ -205,6 +203,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
index 05b8a9e6..cc0b6f38 100644
--- a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
+++ b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
@@ -54,8 +54,6 @@
#include <QtGlobal>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QChar;
@@ -181,6 +179,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h
index 8fbd8ae4..6007395e 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/src/xmlpatterns/api/qabstractmessagehandler.h
@@ -45,8 +45,6 @@
#include <QtXmlPatterns/QSourceLocation>
#include <QtCore/QObject>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -75,6 +73,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index 5014ec72..c84d4d55 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.h
+++ b/src/xmlpatterns/api/qabstracturiresolver.h
@@ -45,7 +45,6 @@
#include <QtCore/QObject>
#include <QtXmlPatterns/qtxmlpatternsglobal.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -69,6 +68,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
index 5ab4e7d2..69544a1c 100644
--- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
+++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
@@ -57,8 +57,6 @@
#include <QtCore/QSharedData>
#include <QtCore/QString>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -335,6 +333,4 @@ qint64 QAbstractXmlForwardIterator<T>::sizeHint() const
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index 08461d7d..7db8a76a 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h
@@ -46,7 +46,6 @@
#include <QtCore/QSharedData>
#include <QtCore/QScopedPointer>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -428,6 +427,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QXmlItem) /* This macro must appear after QT_END_NAMESPACE. */
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
index 9a915037..0d10c17a 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
@@ -55,8 +55,6 @@
#include "qabstractxmlnodemodel.h"
#include "qsourcelocation.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QAbstractXmlNodeModelPrivate
@@ -76,6 +74,4 @@ public:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
index b84a4a04..27491923 100644
--- a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
+++ b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
@@ -54,8 +54,6 @@
#include <QtCore/QtGlobal>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QXmlItem;
@@ -108,6 +106,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.h b/src/xmlpatterns/api/qabstractxmlreceiver.h
index a31579c0..61008566 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver.h
+++ b/src/xmlpatterns/api/qabstractxmlreceiver.h
@@ -46,8 +46,6 @@
#include <QtCore/QScopedPointer>
#include <QtXmlPatterns/QXmlNodeModelIndex>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -101,6 +99,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver_p.h b/src/xmlpatterns/api/qabstractxmlreceiver_p.h
index ed91afc3..40f651fb 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver_p.h
+++ b/src/xmlpatterns/api/qabstractxmlreceiver_p.h
@@ -52,8 +52,6 @@
#ifndef QABSTRACTXMLRECEIVER_P_H
#define QABSTRACTXMLRECEIVER_P_H
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QAbstractXmlReceiverPrivate
@@ -66,6 +64,4 @@ public:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qcoloringmessagehandler_p.h b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
index bf595364..4fe16c13 100644
--- a/src/xmlpatterns/api/qcoloringmessagehandler_p.h
+++ b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
@@ -57,8 +57,6 @@
#include <private/qcoloroutput_p.h>
#include <QAbstractMessageHandler>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h
index bdcdc8c8..85034ace 100644
--- a/src/xmlpatterns/api/qcoloroutput_p.h
+++ b/src/xmlpatterns/api/qcoloroutput_p.h
@@ -55,8 +55,6 @@
#include <QtCore/QtGlobal>
#include <QtCore/QHash>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -129,6 +127,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QPatternist::ColorOutput::ColorCode)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qdeviceresourceloader_p.h b/src/xmlpatterns/api/qdeviceresourceloader_p.h
index d29f1b43..00902b35 100644
--- a/src/xmlpatterns/api/qdeviceresourceloader_p.h
+++ b/src/xmlpatterns/api/qdeviceresourceloader_p.h
@@ -54,7 +54,6 @@
#include <private/qresourceloader_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
template<typename T> class QSet;
@@ -83,6 +82,4 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
index c9d4d23c..7024279d 100644
--- a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
+++ b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
@@ -56,7 +56,6 @@
#include <QPointer>
#include <QSharedData>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QNetworkAccessManager;
@@ -101,6 +100,4 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qpullbridge_p.h b/src/xmlpatterns/api/qpullbridge_p.h
index 3b5e746e..75191c65 100644
--- a/src/xmlpatterns/api/qpullbridge_p.h
+++ b/src/xmlpatterns/api/qpullbridge_p.h
@@ -59,8 +59,6 @@
#include <private/qabstractxmlpullprovider_p.h>
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qreferencecountedvalue_p.h b/src/xmlpatterns/api/qreferencecountedvalue_p.h
index 1f1a81b1..6b07d245 100644
--- a/src/xmlpatterns/api/qreferencecountedvalue_p.h
+++ b/src/xmlpatterns/api/qreferencecountedvalue_p.h
@@ -52,7 +52,6 @@
#ifndef QPatternist_ReferenceCountedValue_p_h
#define QPatternist_ReferenceCountedValue_p_h
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -101,6 +100,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/api/qresourcedelegator_p.h b/src/xmlpatterns/api/qresourcedelegator_p.h
index 4ededf8a..0ca6dff8 100644
--- a/src/xmlpatterns/api/qresourcedelegator_p.h
+++ b/src/xmlpatterns/api/qresourcedelegator_p.h
@@ -57,7 +57,6 @@
#include <private/qdeviceresourceloader_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -114,6 +113,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h
index 8fbeb63d..d26608ec 100644
--- a/src/xmlpatterns/api/qsimplexmlnodemodel.h
+++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h
@@ -45,8 +45,6 @@
#include <QtXmlPatterns/QAbstractXmlNodeModel>
#include <QtXmlPatterns/QXmlQuery>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -71,6 +69,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qsourcelocation.h b/src/xmlpatterns/api/qsourcelocation.h
index f6ccca32..de97a9c9 100644
--- a/src/xmlpatterns/api/qsourcelocation.h
+++ b/src/xmlpatterns/api/qsourcelocation.h
@@ -46,8 +46,6 @@
#include <QtCore/QUrl>
#include <QtXmlPatterns/qtxmlpatternsglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -96,6 +94,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QSourceLocation) /* This macro must appear after QT_END_NAMESPACE. */
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qtxmlpatternsglobal.h b/src/xmlpatterns/api/qtxmlpatternsglobal.h
index 0795d0b2..b69ace81 100644
--- a/src/xmlpatterns/api/qtxmlpatternsglobal.h
+++ b/src/xmlpatterns/api/qtxmlpatternsglobal.h
@@ -44,8 +44,6 @@
#include <QtCore/qglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
#ifndef Q_XMLPATTERNS_EXPORT
@@ -62,6 +60,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qvariableloader_p.h b/src/xmlpatterns/api/qvariableloader_p.h
index c1d6e718..337d23ec 100644
--- a/src/xmlpatterns/api/qvariableloader_p.h
+++ b/src/xmlpatterns/api/qvariableloader_p.h
@@ -59,8 +59,6 @@
#include <private/qdynamiccontext_p.h>
#include <private/qexternalvariableloader_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -113,6 +111,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QIODevice *)
Q_DECLARE_METATYPE(QXmlQuery)
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h
index 164d7a4e..f3515cf2 100644
--- a/src/xmlpatterns/api/qxmlformatter.h
+++ b/src/xmlpatterns/api/qxmlformatter.h
@@ -44,8 +44,6 @@
#include <QtXmlPatterns/QXmlSerializer>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -88,6 +86,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlname.h b/src/xmlpatterns/api/qxmlname.h
index eb1f04c3..8808507a 100644
--- a/src/xmlpatterns/api/qxmlname.h
+++ b/src/xmlpatterns/api/qxmlname.h
@@ -46,8 +46,6 @@
#include <QtCore/QMetaType>
#include <QtXmlPatterns/qtxmlpatternsglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -137,6 +135,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QXmlName) /* This macro must appear after QT_END_NAMESPACE. */
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlnamepool.h b/src/xmlpatterns/api/qxmlnamepool.h
index 24e7916c..ae7ce78c 100644
--- a/src/xmlpatterns/api/qxmlnamepool.h
+++ b/src/xmlpatterns/api/qxmlnamepool.h
@@ -46,8 +46,6 @@
#include <QtCore/QString>
#include <QtXmlPatterns/qtxmlpatternsglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -90,6 +88,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlpatternistcli_p.h b/src/xmlpatterns/api/qxmlpatternistcli_p.h
index 7569589f..1b4ca5ba 100644
--- a/src/xmlpatterns/api/qxmlpatternistcli_p.h
+++ b/src/xmlpatterns/api/qxmlpatternistcli_p.h
@@ -54,8 +54,6 @@
#include <QCoreApplication>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QXmlPatternistCLI
@@ -69,6 +67,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlquery.h b/src/xmlpatterns/api/qxmlquery.h
index f8c904f7..b84987b5 100644
--- a/src/xmlpatterns/api/qxmlquery.h
+++ b/src/xmlpatterns/api/qxmlquery.h
@@ -47,7 +47,6 @@
#include <QtXmlPatterns/QAbstractXmlReceiver>
#include <QtXmlPatterns/QXmlNamePool>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -149,6 +148,5 @@ private:
};
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/api/qxmlquery_p.h b/src/xmlpatterns/api/qxmlquery_p.h
index b91f9e5c..69f8f5b5 100644
--- a/src/xmlpatterns/api/qxmlquery_p.h
+++ b/src/xmlpatterns/api/qxmlquery_p.h
@@ -323,6 +323,4 @@ public:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h
index 64d53351..975aff04 100644
--- a/src/xmlpatterns/api/qxmlresultitems.h
+++ b/src/xmlpatterns/api/qxmlresultitems.h
@@ -46,7 +46,6 @@
#include <QtCore/QScopedPointer>
#include <QtXmlPatterns/qtxmlpatternsglobal.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -72,6 +71,5 @@ private:
};
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/api/qxmlschema.h b/src/xmlpatterns/api/qxmlschema.h
index 3f4f28a4..68f9a6f8 100644
--- a/src/xmlpatterns/api/qxmlschema.h
+++ b/src/xmlpatterns/api/qxmlschema.h
@@ -46,7 +46,6 @@
#include <QtCore/QUrl>
#include <QtXmlPatterns/QXmlNamePool>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -91,6 +90,4 @@ class Q_XMLPATTERNS_EXPORT QXmlSchema
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlschema_p.h b/src/xmlpatterns/api/qxmlschema_p.h
index 63619f7a..f11abd25 100644
--- a/src/xmlpatterns/api/qxmlschema_p.h
+++ b/src/xmlpatterns/api/qxmlschema_p.h
@@ -65,8 +65,6 @@
#include <QtCore/QSharedData>
#include <QtNetwork/QNetworkAccessManager>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QXmlSchemaPrivate : public QSharedData
@@ -104,6 +102,4 @@ class QXmlSchemaPrivate : public QSharedData
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlschemavalidator.h b/src/xmlpatterns/api/qxmlschemavalidator.h
index 237e14ad..e65af25f 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator.h
+++ b/src/xmlpatterns/api/qxmlschemavalidator.h
@@ -45,7 +45,6 @@
#include <QtCore/QUrl>
#include <QtXmlPatterns/QXmlNamePool>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -91,6 +90,4 @@ class Q_XMLPATTERNS_EXPORT QXmlSchemaValidator
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlschemavalidator_p.h b/src/xmlpatterns/api/qxmlschemavalidator_p.h
index 2ee4b8c5..4cee5508 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator_p.h
+++ b/src/xmlpatterns/api/qxmlschemavalidator_p.h
@@ -64,8 +64,6 @@
#include <QtNetwork/QNetworkAccessManager>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QXmlSchemaValidatorPrivate
@@ -126,6 +124,4 @@ public:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h
index 74c4eb8c..ae142da1 100644
--- a/src/xmlpatterns/api/qxmlserializer.h
+++ b/src/xmlpatterns/api/qxmlserializer.h
@@ -44,8 +44,6 @@
#include <QtXmlPatterns/QAbstractXmlReceiver>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -152,6 +150,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/api/qxmlserializer_p.h b/src/xmlpatterns/api/qxmlserializer_p.h
index 43580d29..83a835af 100644
--- a/src/xmlpatterns/api/qxmlserializer_p.h
+++ b/src/xmlpatterns/api/qxmlserializer_p.h
@@ -62,8 +62,6 @@
#include <private/qnamepool_p.h>
#include <private/qabstractxmlreceiver_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QXmlSerializerPrivate : public QAbstractXmlReceiverPrivate
@@ -125,6 +123,5 @@ void QXmlSerializerPrivate::write(const char c)
device->putChar(c);
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/data/qabstractdatetime_p.h b/src/xmlpatterns/data/qabstractdatetime_p.h
index 85696a7a..8c3341a2 100644
--- a/src/xmlpatterns/data/qabstractdatetime_p.h
+++ b/src/xmlpatterns/data/qabstractdatetime_p.h
@@ -57,8 +57,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -256,6 +254,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qabstractduration_p.h b/src/xmlpatterns/data/qabstractduration_p.h
index 696bb0d5..8d3a3008 100644
--- a/src/xmlpatterns/data/qabstractduration_p.h
+++ b/src/xmlpatterns/data/qabstractduration_p.h
@@ -56,8 +56,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -187,6 +185,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h
index cb2b4edc..e1341c85 100644
--- a/src/xmlpatterns/data/qabstractfloat_p.h
+++ b/src/xmlpatterns/data/qabstractfloat_p.h
@@ -62,8 +62,6 @@
#include <private/qvalidationerror_p.h>
#include <private/qbuiltintypes_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -169,6 +167,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h
index 615defb6..d55c03ca 100644
--- a/src/xmlpatterns/data/qabstractfloatcasters_p.h
+++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h
@@ -62,8 +62,6 @@
* are responsible of casting an atomic value to AbstractFloat.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -170,6 +168,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qabstractfloatmathematician_p.h b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
index 4f76ba47..4a165d3d 100644
--- a/src/xmlpatterns/data/qabstractfloatmathematician_p.h
+++ b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
@@ -59,7 +59,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qsourcelocationreflection_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -99,6 +98,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h
index 6961e87c..a6611d0e 100644
--- a/src/xmlpatterns/data/qanyuri_p.h
+++ b/src/xmlpatterns/data/qanyuri_p.h
@@ -60,8 +60,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qreportcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -207,6 +205,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qatomiccaster_p.h b/src/xmlpatterns/data/qatomiccaster_p.h
index 54ff76a6..069dbace 100644
--- a/src/xmlpatterns/data/qatomiccaster_p.h
+++ b/src/xmlpatterns/data/qatomiccaster_p.h
@@ -56,8 +56,6 @@
#include <private/qitem_p.h>
#include <private/qatomictypedispatch_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h
index 91720d72..0b61dff5 100644
--- a/src/xmlpatterns/data/qatomiccasters_p.h
+++ b/src/xmlpatterns/data/qatomiccasters_p.h
@@ -65,8 +65,6 @@
* are responsible of casting an atomic value to another type.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -700,6 +698,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qatomiccomparator_p.h b/src/xmlpatterns/data/qatomiccomparator_p.h
index 4319862f..961b71fa 100644
--- a/src/xmlpatterns/data/qatomiccomparator_p.h
+++ b/src/xmlpatterns/data/qatomiccomparator_p.h
@@ -57,8 +57,6 @@
#include <private/qitem_p.h>
#include <private/qatomictypedispatch_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QString;
@@ -218,6 +216,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h
index a7709afe..9deefc55 100644
--- a/src/xmlpatterns/data/qatomiccomparators_p.h
+++ b/src/xmlpatterns/data/qatomiccomparators_p.h
@@ -61,8 +61,6 @@
* @short Contains all the classes implementing comparisons between atomic values.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -293,6 +291,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qatomicmathematician_p.h b/src/xmlpatterns/data/qatomicmathematician_p.h
index 346f545d..ef5fa35d 100644
--- a/src/xmlpatterns/data/qatomicmathematician_p.h
+++ b/src/xmlpatterns/data/qatomicmathematician_p.h
@@ -58,8 +58,6 @@
#include <private/qitem_p.h>
#include <private/qatomictypedispatch_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h
index 7546014c..843d8ef7 100644
--- a/src/xmlpatterns/data/qatomicmathematicians_p.h
+++ b/src/xmlpatterns/data/qatomicmathematicians_p.h
@@ -61,8 +61,6 @@
* subtracting two dates.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -244,6 +242,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h
index e22a4e15..e3d0d996 100644
--- a/src/xmlpatterns/data/qatomicstring_p.h
+++ b/src/xmlpatterns/data/qatomicstring_p.h
@@ -56,8 +56,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -118,6 +116,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h
index 76a981c1..9705e6b9 100644
--- a/src/xmlpatterns/data/qbase64binary_p.h
+++ b/src/xmlpatterns/data/qbase64binary_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -113,6 +111,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h
index 89c1c054..6720131d 100644
--- a/src/xmlpatterns/data/qboolean_p.h
+++ b/src/xmlpatterns/data/qboolean_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -121,6 +119,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/data/qcommonvalues_p.h b/src/xmlpatterns/data/qcommonvalues_p.h
index c98234c9..48a6732f 100644
--- a/src/xmlpatterns/data/qcommonvalues_p.h
+++ b/src/xmlpatterns/data/qcommonvalues_p.h
@@ -56,8 +56,6 @@
#include <private/qyearmonthduration_p.h>
#include <private/qemptyiterator_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -223,6 +221,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qcomparisonfactory_p.h b/src/xmlpatterns/data/qcomparisonfactory_p.h
index 826abce6..88f2a830 100644
--- a/src/xmlpatterns/data/qcomparisonfactory_p.h
+++ b/src/xmlpatterns/data/qcomparisonfactory_p.h
@@ -58,7 +58,6 @@
#include <private/qreportcontext_p.h>
#include <private/qschematype_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -116,6 +115,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h
index 6004a8bc..6628f851 100644
--- a/src/xmlpatterns/data/qdate_p.h
+++ b/src/xmlpatterns/data/qdate_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractdatetime_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -90,6 +88,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h
index f5839ea5..cc7df541 100644
--- a/src/xmlpatterns/data/qdaytimeduration_p.h
+++ b/src/xmlpatterns/data/qdaytimeduration_p.h
@@ -55,8 +55,6 @@
#include <private/qabstractduration_p.h>
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -149,6 +147,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h
index 4bea118f..d50b0b51 100644
--- a/src/xmlpatterns/data/qdecimal_p.h
+++ b/src/xmlpatterns/data/qdecimal_p.h
@@ -54,8 +54,6 @@
#include <private/qschemanumeric_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
/**
@@ -151,6 +149,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h
index fc091dc2..79782680 100644
--- a/src/xmlpatterns/data/qderivedinteger_p.h
+++ b/src/xmlpatterns/data/qderivedinteger_p.h
@@ -57,8 +57,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qvalidationerror_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -619,6 +617,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h
index 68c9e8b8..df36ca40 100644
--- a/src/xmlpatterns/data/qderivedstring_p.h
+++ b/src/xmlpatterns/data/qderivedstring_p.h
@@ -59,8 +59,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qvalidationerror_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -336,6 +334,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h
index ba196dbc..d6d7d091 100644
--- a/src/xmlpatterns/data/qduration_p.h
+++ b/src/xmlpatterns/data/qduration_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractduration_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h
index e451da45..4883a99a 100644
--- a/src/xmlpatterns/data/qgday_p.h
+++ b/src/xmlpatterns/data/qgday_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractdatetime_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h
index 257d6960..da446d4d 100644
--- a/src/xmlpatterns/data/qgmonth_p.h
+++ b/src/xmlpatterns/data/qgmonth_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractdatetime_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h
index 3503a155..aeea7514 100644
--- a/src/xmlpatterns/data/qgmonthday_p.h
+++ b/src/xmlpatterns/data/qgmonthday_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractdatetime_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -90,6 +88,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h
index 16ac4cc0..8ffdfc76 100644
--- a/src/xmlpatterns/data/qgyear_p.h
+++ b/src/xmlpatterns/data/qgyear_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractdatetime_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h
index dbc6407f..b04315db 100644
--- a/src/xmlpatterns/data/qgyearmonth_p.h
+++ b/src/xmlpatterns/data/qgyearmonth_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractdatetime_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h
index 9b4bb4b0..f15f9cf0 100644
--- a/src/xmlpatterns/data/qhexbinary_p.h
+++ b/src/xmlpatterns/data/qhexbinary_p.h
@@ -54,8 +54,6 @@
#include <private/qbase64binary_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h
index ec826d44..d6917592 100644
--- a/src/xmlpatterns/data/qinteger_p.h
+++ b/src/xmlpatterns/data/qinteger_p.h
@@ -54,8 +54,6 @@
#include <private/qschemanumeric_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -136,6 +134,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qitem_p.h b/src/xmlpatterns/data/qitem_p.h
index 1b917e6d..9bf4ae23 100644
--- a/src/xmlpatterns/data/qitem_p.h
+++ b/src/xmlpatterns/data/qitem_p.h
@@ -72,8 +72,6 @@
* @short Qt's base class for reference counting.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename T> class QList;
@@ -528,6 +526,4 @@ Q_DECLARE_TYPEINFO(QPatternist::AtomicValue, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qnodebuilder_p.h b/src/xmlpatterns/data/qnodebuilder_p.h
index 63f670ce..29d02fff 100644
--- a/src/xmlpatterns/data/qnodebuilder_p.h
+++ b/src/xmlpatterns/data/qnodebuilder_p.h
@@ -56,8 +56,6 @@
#include "qabstractxmlreceiver.h"
#include <private/qautoptr_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -106,6 +104,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h
index 19e8a11b..fc890887 100644
--- a/src/xmlpatterns/data/qqnamevalue_p.h
+++ b/src/xmlpatterns/data/qqnamevalue_p.h
@@ -55,8 +55,6 @@
#include <private/qitem_p.h>
#include <QXmlName>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -108,6 +106,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qresourceloader_p.h b/src/xmlpatterns/data/qresourceloader_p.h
index b39a04a7..0db7ea46 100644
--- a/src/xmlpatterns/data/qresourceloader_p.h
+++ b/src/xmlpatterns/data/qresourceloader_p.h
@@ -57,8 +57,6 @@
#include <private/qsequencetype_p.h>
#include <private/qsourcelocationreflection_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QUrl;
@@ -315,6 +313,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h
index 435d91b3..954f55c9 100644
--- a/src/xmlpatterns/data/qschemadatetime_p.h
+++ b/src/xmlpatterns/data/qschemadatetime_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractdatetime_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
/**
@@ -96,6 +94,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qschemanumeric_p.h b/src/xmlpatterns/data/qschemanumeric_p.h
index 8b9533bd..a10d46f0 100644
--- a/src/xmlpatterns/data/qschemanumeric_p.h
+++ b/src/xmlpatterns/data/qschemanumeric_p.h
@@ -55,8 +55,6 @@
#include <private/qitem_p.h>
#include <private/qprimitives_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
/**
@@ -230,6 +228,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h
index 96302559..76203121 100644
--- a/src/xmlpatterns/data/qschematime_p.h
+++ b/src/xmlpatterns/data/qschematime_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractdatetime_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qsequencereceiver_p.h b/src/xmlpatterns/data/qsequencereceiver_p.h
index 39eb3c82..5208b8cd 100644
--- a/src/xmlpatterns/data/qsequencereceiver_p.h
+++ b/src/xmlpatterns/data/qsequencereceiver_p.h
@@ -56,8 +56,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -187,6 +185,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h
index 810f10e8..06a924a4 100644
--- a/src/xmlpatterns/data/qsorttuple_p.h
+++ b/src/xmlpatterns/data/qsorttuple_p.h
@@ -56,8 +56,6 @@
#include <private/qitem_p.h>
#include <private/qitemtype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -143,6 +141,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h
index 4518eaa7..4193d996 100644
--- a/src/xmlpatterns/data/quntypedatomic_p.h
+++ b/src/xmlpatterns/data/quntypedatomic_p.h
@@ -54,8 +54,6 @@
#include <private/qatomicstring_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -92,6 +90,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h
index d7a1964c..e271750f 100644
--- a/src/xmlpatterns/data/qvalidationerror_p.h
+++ b/src/xmlpatterns/data/qvalidationerror_p.h
@@ -55,8 +55,6 @@
#include <private/qitem_p.h>
#include <private/qreportcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -118,6 +116,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/data/qvaluefactory_p.h b/src/xmlpatterns/data/qvaluefactory_p.h
index 74f12493..90192977 100644
--- a/src/xmlpatterns/data/qvaluefactory_p.h
+++ b/src/xmlpatterns/data/qvaluefactory_p.h
@@ -56,7 +56,6 @@
#include <private/qreportcontext_p.h>
#include <private/qschematype_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -93,6 +92,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h
index cd514948..64b9264a 100644
--- a/src/xmlpatterns/data/qyearmonthduration_p.h
+++ b/src/xmlpatterns/data/qyearmonthduration_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractduration_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -146,6 +144,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
index 51fcbbbc..ded69a1e 100644
--- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h
+++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
@@ -54,8 +54,6 @@
#include <private/qdelegatingdynamiccontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -88,6 +86,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
index 75fb2d7b..4f377e58 100644
--- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
@@ -55,8 +55,6 @@
#include <private/qdynamiccontext_p.h>
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -125,6 +123,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
index a1e7b4e8..2a835eac 100644
--- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
@@ -58,8 +58,6 @@
#include <private/qfunctionfactory_p.h>
#include <private/qschematypefactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -142,6 +140,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h
index 51fd63e6..a16e7cae 100644
--- a/src/xmlpatterns/environment/qdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdynamiccontext_p.h
@@ -62,8 +62,6 @@
#include <private/qreportcontext_p.h>
#include <private/qresourceloader_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDateTime;
@@ -226,6 +224,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h
index 57397c84..fcb7ea15 100644
--- a/src/xmlpatterns/environment/qfocus_p.h
+++ b/src/xmlpatterns/environment/qfocus_p.h
@@ -54,8 +54,6 @@
#include <private/qdelegatingdynamiccontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
index feb4c7ab..fba1b04f 100644
--- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
@@ -59,8 +59,6 @@
#include <private/qstackcontextbase_p.h>
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -150,6 +148,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
index d0d393c7..b7c65587 100644
--- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
@@ -59,8 +59,6 @@
#include <private/qfunctionfactory_p.h>
#include <private/qschematypefactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -194,6 +192,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
index 96e8cbcb..0ca896e2 100644
--- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
@@ -54,8 +54,6 @@
#include <private/qdelegatingdynamiccontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -84,6 +82,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qreportcontext_p.h b/src/xmlpatterns/environment/qreportcontext_p.h
index 035bea69..4283dc62 100644
--- a/src/xmlpatterns/environment/qreportcontext_p.h
+++ b/src/xmlpatterns/environment/qreportcontext_p.h
@@ -59,8 +59,6 @@
#include <private/qnamepool_p.h>
#include <QXmlName>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QAbstractMessageHandler;
@@ -2459,6 +2457,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h
index 1a6184ea..9c09b1e8 100644
--- a/src/xmlpatterns/environment/qstackcontextbase_p.h
+++ b/src/xmlpatterns/environment/qstackcontextbase_p.h
@@ -58,8 +58,6 @@
#include <private/qdelegatingdynamiccontext_p.h>
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
index bde699ed..ede23ccd 100644
--- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
+++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
@@ -54,8 +54,6 @@
#include <private/qdelegatingstaticcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -86,6 +84,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
index f4bbd932..cf7f3b70 100644
--- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
@@ -54,7 +54,6 @@
#include <private/qdelegatingstaticcontext_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -79,6 +78,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h
index 89cbc31c..01508438 100644
--- a/src/xmlpatterns/environment/qstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcontext_p.h
@@ -59,8 +59,6 @@
#include <private/qreportcontext_p.h>
#include <private/qresourceloader_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QUrl;
@@ -294,6 +292,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
index ba19eb46..a2111a33 100644
--- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
@@ -54,8 +54,6 @@
#include <private/qdelegatingstaticcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -85,6 +83,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
index 0dc59310..0a3ed823 100644
--- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h
+++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
@@ -54,8 +54,6 @@
#include <private/qdelegatingstaticcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -86,6 +84,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
index 7dd83927..63cf5a6c 100644
--- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
+++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
@@ -54,8 +54,6 @@
#include <private/qdelegatingstaticcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -84,6 +82,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h
index 03b15845..79e4c0f5 100644
--- a/src/xmlpatterns/expr/qandexpression_p.h
+++ b/src/xmlpatterns/expr/qandexpression_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h
index 3e42f33c..60550fe2 100644
--- a/src/xmlpatterns/expr/qapplytemplate_p.h
+++ b/src/xmlpatterns/expr/qapplytemplate_p.h
@@ -54,7 +54,6 @@
#include <private/qtemplatemode_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -139,6 +138,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h
index ecdd72a6..5e60313e 100644
--- a/src/xmlpatterns/expr/qargumentreference_p.h
+++ b/src/xmlpatterns/expr/qargumentreference_p.h
@@ -54,8 +54,6 @@
#include <private/qvariablereference_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h
index 933df98f..6c43f9b5 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression_p.h
+++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h
@@ -55,8 +55,6 @@
#include <private/qatomicmathematician_p.h>
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -128,6 +126,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h
index 2a29c0d6..e2265338 100644
--- a/src/xmlpatterns/expr/qattributeconstructor_p.h
+++ b/src/xmlpatterns/expr/qattributeconstructor_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -103,6 +101,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h
index ea7b8327..7ab61273 100644
--- a/src/xmlpatterns/expr/qattributenamevalidator_p.h
+++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -94,6 +92,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h
index faf247f6..6f2ff7fe 100644
--- a/src/xmlpatterns/expr/qaxisstep_p.h
+++ b/src/xmlpatterns/expr/qaxisstep_p.h
@@ -55,8 +55,6 @@
#include <private/qemptycontainer_p.h>
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -163,6 +161,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcachecells_p.h b/src/xmlpatterns/expr/qcachecells_p.h
index 69a00451..38790df3 100644
--- a/src/xmlpatterns/expr/qcachecells_p.h
+++ b/src/xmlpatterns/expr/qcachecells_p.h
@@ -57,8 +57,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -152,6 +150,4 @@ Q_DECLARE_TYPEINFO(QPatternist::ItemSequenceCacheCell, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcallsite_p.h b/src/xmlpatterns/expr/qcallsite_p.h
index 90b13ee6..8ae5c68e 100644
--- a/src/xmlpatterns/expr/qcallsite_p.h
+++ b/src/xmlpatterns/expr/qcallsite_p.h
@@ -56,7 +56,6 @@
#include <private/qcalltargetdescription_p.h>
#include <QXmlName>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -106,6 +105,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h
index 4489b1b5..69895937 100644
--- a/src/xmlpatterns/expr/qcalltargetdescription_p.h
+++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h
@@ -56,8 +56,6 @@
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename Key, typename Value> class QHash;
@@ -114,7 +112,5 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h
index d3f787d9..deac7bcf 100644
--- a/src/xmlpatterns/expr/qcalltemplate_p.h
+++ b/src/xmlpatterns/expr/qcalltemplate_p.h
@@ -56,7 +56,6 @@
#include <private/qtemplateinvoker_p.h>
#include <private/qtemplate_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -112,6 +111,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h
index 94be0ef1..96792eea 100644
--- a/src/xmlpatterns/expr/qcastableas_p.h
+++ b/src/xmlpatterns/expr/qcastableas_p.h
@@ -55,8 +55,6 @@
#include <private/qsinglecontainer_p.h>
#include <private/qcastingplatform_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -106,6 +104,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h
index 75723c5f..5c9a433f 100644
--- a/src/xmlpatterns/expr/qcastas_p.h
+++ b/src/xmlpatterns/expr/qcastas_p.h
@@ -55,8 +55,6 @@
#include <private/qsinglecontainer_p.h>
#include <private/qcastingplatform_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -143,6 +141,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcastingplatform_p.h b/src/xmlpatterns/expr/qcastingplatform_p.h
index 1f6b32df..048f150f 100644
--- a/src/xmlpatterns/expr/qcastingplatform_p.h
+++ b/src/xmlpatterns/expr/qcastingplatform_p.h
@@ -64,8 +64,6 @@
#include <private/qstaticcontext_p.h>
#include <private/qvalidationerror_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -201,6 +199,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h
index 339f68ce..860ccca5 100644
--- a/src/xmlpatterns/expr/qcollationchecker_p.h
+++ b/src/xmlpatterns/expr/qcollationchecker_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -94,6 +92,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h
index c94bddf9..22d1d7d6 100644
--- a/src/xmlpatterns/expr/qcombinenodes_p.h
+++ b/src/xmlpatterns/expr/qcombinenodes_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -111,6 +109,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h
index 6c898c5c..c1459abc 100644
--- a/src/xmlpatterns/expr/qcommentconstructor_p.h
+++ b/src/xmlpatterns/expr/qcommentconstructor_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -95,6 +93,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcomparisonplatform_p.h b/src/xmlpatterns/expr/qcomparisonplatform_p.h
index dd98047b..1e5c6846 100644
--- a/src/xmlpatterns/expr/qcomparisonplatform_p.h
+++ b/src/xmlpatterns/expr/qcomparisonplatform_p.h
@@ -60,8 +60,6 @@
#include <private/qitemtype_p.h>
#include <private/qpatternistlocale_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -203,6 +201,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
index 9d542eed..fff8dd38 100644
--- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -97,6 +95,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h
index fa3a0e69..6cfc7003 100644
--- a/src/xmlpatterns/expr/qcontextitem_p.h
+++ b/src/xmlpatterns/expr/qcontextitem_p.h
@@ -54,8 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -123,6 +121,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h
index ff9eeb60..fc1a6b2f 100644
--- a/src/xmlpatterns/expr/qcopyof_p.h
+++ b/src/xmlpatterns/expr/qcopyof_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -116,6 +114,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h
index 42d492f3..7d851771 100644
--- a/src/xmlpatterns/expr/qcurrentitemstore_p.h
+++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -99,6 +97,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h
index 976eae08..76dd6f24 100644
--- a/src/xmlpatterns/expr/qdocumentconstructor_p.h
+++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h
@@ -56,8 +56,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
index 468e1997..f3a27229 100644
--- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
+++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
@@ -56,8 +56,6 @@
#include <private/qexpression_p.h>
#include "qabstractxmlreceiver.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -112,6 +110,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
index ffd4e361..050034cf 100644
--- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h
+++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -92,6 +90,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h
index e14580b2..1a99cf33 100644
--- a/src/xmlpatterns/expr/qelementconstructor_p.h
+++ b/src/xmlpatterns/expr/qelementconstructor_p.h
@@ -56,8 +56,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -102,6 +100,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h
index 990e51ff..c974a6ad 100644
--- a/src/xmlpatterns/expr/qemptycontainer_p.h
+++ b/src/xmlpatterns/expr/qemptycontainer_p.h
@@ -54,8 +54,6 @@
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h
index 6ca34f12..f4dd36ab 100644
--- a/src/xmlpatterns/expr/qemptysequence_p.h
+++ b/src/xmlpatterns/expr/qemptysequence_p.h
@@ -54,8 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h
index 2dc8940a..ca4d09d7 100644
--- a/src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_p.h
@@ -59,8 +59,6 @@
#include <private/qsinglecontainer_p.h>
#include <private/qvariabledeclaration_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -141,6 +139,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h
index 002092a3..5d95fdae 100644
--- a/src/xmlpatterns/expr/qexpression_p.h
+++ b/src/xmlpatterns/expr/qexpression_p.h
@@ -64,8 +64,6 @@
#include <private/qsourcelocationreflection_p.h>
#include <private/qstaticcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename T> class QList;
@@ -904,6 +902,4 @@ Q_DECLARE_TYPEINFO(QPatternist::Expression::Ptr, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qexpressiondispatch_p.h b/src/xmlpatterns/expr/qexpressiondispatch_p.h
index 552fff36..e459d9f3 100644
--- a/src/xmlpatterns/expr/qexpressiondispatch_p.h
+++ b/src/xmlpatterns/expr/qexpressiondispatch_p.h
@@ -55,8 +55,6 @@
#include <QSharedData>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -236,6 +234,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qexpressionfactory_p.h b/src/xmlpatterns/expr/qexpressionfactory_p.h
index a2579320..d4a16c55 100644
--- a/src/xmlpatterns/expr/qexpressionfactory_p.h
+++ b/src/xmlpatterns/expr/qexpressionfactory_p.h
@@ -60,8 +60,6 @@
#include <QSharedData>
#include <QUrl>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QIODevice;
@@ -182,6 +180,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h
index 28b096be..e9074604 100644
--- a/src/xmlpatterns/expr/qexpressionsequence_p.h
+++ b/src/xmlpatterns/expr/qexpressionsequence_p.h
@@ -54,8 +54,6 @@
#include <private/qunlimitedcontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
index 88c3b94f..cd9529a9 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
@@ -55,8 +55,6 @@
#include <private/qvariabledeclaration_p.h>
#include <private/qvariablereference_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qexternalvariableloader_p.h b/src/xmlpatterns/expr/qexternalvariableloader_p.h
index 323b0541..f423fee0 100644
--- a/src/xmlpatterns/expr/qexternalvariableloader_p.h
+++ b/src/xmlpatterns/expr/qexternalvariableloader_p.h
@@ -56,8 +56,6 @@
#include <private/qsequencetype_p.h>
#include <QXmlName>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -134,6 +132,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h
index 8ba1141b..9823f03d 100644
--- a/src/xmlpatterns/expr/qexternalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h
@@ -54,8 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h
index 321c53b5..a61e1360 100644
--- a/src/xmlpatterns/expr/qfirstitempredicate_p.h
+++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h
index c416ea45..c5792b4c 100644
--- a/src/xmlpatterns/expr/qforclause_p.h
+++ b/src/xmlpatterns/expr/qforclause_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -117,6 +115,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h
index 3aa2955b..0530ad78 100644
--- a/src/xmlpatterns/expr/qgeneralcomparison_p.h
+++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h
@@ -56,8 +56,6 @@
#include <private/qpaircontainer_p.h>
#include <private/qcomparisonplatform_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h
index ab8ff753..72d26b84 100644
--- a/src/xmlpatterns/expr/qgenericpredicate_p.h
+++ b/src/xmlpatterns/expr/qgenericpredicate_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -143,6 +141,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h
index ba80804f..e1a34fb9 100644
--- a/src/xmlpatterns/expr/qifthenclause_p.h
+++ b/src/xmlpatterns/expr/qifthenclause_p.h
@@ -54,8 +54,6 @@
#include <private/qtriplecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h
index bd4290ff..d4e91167 100644
--- a/src/xmlpatterns/expr/qinstanceof_p.h
+++ b/src/xmlpatterns/expr/qinstanceof_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h
index 63ebd34d..e0db56f6 100644
--- a/src/xmlpatterns/expr/qletclause_p.h
+++ b/src/xmlpatterns/expr/qletclause_p.h
@@ -55,8 +55,6 @@
#include <private/qpaircontainer_p.h>
#include <private/qvariabledeclaration_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h
index aefa8d1a..7ecf6d3f 100644
--- a/src/xmlpatterns/expr/qliteral_p.h
+++ b/src/xmlpatterns/expr/qliteral_p.h
@@ -54,8 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -143,6 +141,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h
index 32921c8c..67db8e1d 100644
--- a/src/xmlpatterns/expr/qliteralsequence_p.h
+++ b/src/xmlpatterns/expr/qliteralsequence_p.h
@@ -54,8 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -99,6 +97,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
index 0e8c9a0e..df163128 100644
--- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
@@ -54,8 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h
index 110205d2..52f9d07c 100644
--- a/src/xmlpatterns/expr/qncnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qncnameconstructor_p.h
@@ -56,8 +56,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qxmlutils_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -149,6 +147,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h
index 1844d010..89fb00ef 100644
--- a/src/xmlpatterns/expr/qnodecomparison_p.h
+++ b/src/xmlpatterns/expr/qnodecomparison_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h
index 8cf620be..460cb3e8 100644
--- a/src/xmlpatterns/expr/qnodesort_p.h
+++ b/src/xmlpatterns/expr/qnodesort_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qoperandsiterator_p.h b/src/xmlpatterns/expr/qoperandsiterator_p.h
index 526f1f12..5ec45c86 100644
--- a/src/xmlpatterns/expr/qoperandsiterator_p.h
+++ b/src/xmlpatterns/expr/qoperandsiterator_p.h
@@ -57,8 +57,6 @@
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -188,6 +186,5 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/expr/qoptimizationpasses_p.h b/src/xmlpatterns/expr/qoptimizationpasses_p.h
index e78f39ed..b0f06582 100644
--- a/src/xmlpatterns/expr/qoptimizationpasses_p.h
+++ b/src/xmlpatterns/expr/qoptimizationpasses_p.h
@@ -56,8 +56,6 @@
#include <private/qexpression_p.h>
#include <private/qoptimizerframework_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -138,6 +136,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h
index 57552d15..ab6ca5a4 100644
--- a/src/xmlpatterns/expr/qoptimizerblocks_p.h
+++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h
@@ -56,8 +56,6 @@
#include <private/qexpression_p.h>
#include <private/qoptimizerframework_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -221,6 +219,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qoptimizerframework_p.h b/src/xmlpatterns/expr/qoptimizerframework_p.h
index 4f914573..e5344f75 100644
--- a/src/xmlpatterns/expr/qoptimizerframework_p.h
+++ b/src/xmlpatterns/expr/qoptimizerframework_p.h
@@ -56,8 +56,6 @@
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -289,6 +287,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h
index 21216e5d..92400bfe 100644
--- a/src/xmlpatterns/expr/qorderby_p.h
+++ b/src/xmlpatterns/expr/qorderby_p.h
@@ -56,8 +56,6 @@
#include <private/qcomparisonplatform_p.h>
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -178,6 +176,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h
index 1b0ec2e8..358ef253 100644
--- a/src/xmlpatterns/expr/qorexpression_p.h
+++ b/src/xmlpatterns/expr/qorexpression_p.h
@@ -54,8 +54,6 @@
#include <private/qandexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -83,6 +81,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h
index a54d7b07..679854a7 100644
--- a/src/xmlpatterns/expr/qpaircontainer_p.h
+++ b/src/xmlpatterns/expr/qpaircontainer_p.h
@@ -55,8 +55,6 @@
#include <private/qexpression_p.h>
#include <private/qatomictype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -84,6 +82,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h
index f9924437..21bd3567 100644
--- a/src/xmlpatterns/expr/qparentnodeaxis_p.h
+++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h
@@ -54,8 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h
index d374dd95..9e64a980 100644
--- a/src/xmlpatterns/expr/qpath_p.h
+++ b/src/xmlpatterns/expr/qpath_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -171,6 +169,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
index 1315c3c2..520ce1d6 100644
--- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
@@ -54,8 +54,6 @@
#include <private/qvariablereference_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -95,6 +93,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
index 6e22f747..25b71374 100644
--- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
+++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h
index 74cafac6..5ad47fff 100644
--- a/src/xmlpatterns/expr/qqnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qqnameconstructor_p.h
@@ -57,8 +57,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qxpathhelper_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -177,6 +175,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h
index 4fc130cc..577aefd6 100644
--- a/src/xmlpatterns/expr/qquantifiedexpression_p.h
+++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h
index 0a8229d2..efbe1845 100644
--- a/src/xmlpatterns/expr/qrangeexpression_p.h
+++ b/src/xmlpatterns/expr/qrangeexpression_p.h
@@ -54,8 +54,6 @@
#include <private/qpaircontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -107,6 +105,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h
index 39cb3088..7420550b 100644
--- a/src/xmlpatterns/expr/qrangevariablereference_p.h
+++ b/src/xmlpatterns/expr/qrangevariablereference_p.h
@@ -54,8 +54,6 @@
#include <private/qvariablereference_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -95,6 +93,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h
index 4283c14a..7132e58b 100644
--- a/src/xmlpatterns/expr/qreturnorderby_p.h
+++ b/src/xmlpatterns/expr/qreturnorderby_p.h
@@ -55,8 +55,6 @@
#include <private/qorderby_p.h>
#include <private/qunlimitedcontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
index 4a1ccc25..9be782e6 100644
--- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h
index 96f67c78..fa380a5e 100644
--- a/src/xmlpatterns/expr/qsinglecontainer_p.h
+++ b/src/xmlpatterns/expr/qsinglecontainer_p.h
@@ -54,8 +54,6 @@
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -83,6 +81,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
index 6fbbcdb2..99e69149 100644
--- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h
+++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
@@ -52,8 +52,6 @@
#ifndef Patternist_SourceLocationReflection_H
#define Patternist_SourceLocationReflection_H
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QString;
@@ -126,6 +124,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
index 82c385ce..32f89475 100644
--- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h
+++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
index e1482fe9..97c97b6c 100644
--- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
+++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h
index 1881a16f..c5eae926 100644
--- a/src/xmlpatterns/expr/qtemplate_p.h
+++ b/src/xmlpatterns/expr/qtemplate_p.h
@@ -61,7 +61,6 @@
#include <private/qtemplateinvoker_p.h>
#include <private/qvariabledeclaration_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -141,6 +140,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h
index b2c3e1fa..8132fa9b 100644
--- a/src/xmlpatterns/expr/qtemplateinvoker_p.h
+++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h
@@ -55,7 +55,6 @@
#include <private/qcallsite_p.h>
#include <private/qwithparam_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -113,7 +112,6 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/expr/qtemplatemode_p.h b/src/xmlpatterns/expr/qtemplatemode_p.h
index b7e2af5c..dad3206c 100644
--- a/src/xmlpatterns/expr/qtemplatemode_p.h
+++ b/src/xmlpatterns/expr/qtemplatemode_p.h
@@ -57,7 +57,6 @@
#include <private/qtemplatepattern_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -123,6 +122,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
index 3ce91943..18b28a52 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h
+++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
@@ -55,7 +55,6 @@
#include <private/qvariabledeclaration_p.h>
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -100,6 +99,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/expr/qtemplatepattern_p.h b/src/xmlpatterns/expr/qtemplatepattern_p.h
index 9f79ac97..251e2473 100644
--- a/src/xmlpatterns/expr/qtemplatepattern_p.h
+++ b/src/xmlpatterns/expr/qtemplatepattern_p.h
@@ -54,7 +54,6 @@
#include <private/qtemplate_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -155,7 +154,5 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
index 86622137..a1f7020f 100644
--- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h
+++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -92,6 +90,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h
index 5ed5ae7a..e4b5e724 100644
--- a/src/xmlpatterns/expr/qtreatas_p.h
+++ b/src/xmlpatterns/expr/qtreatas_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -117,6 +115,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h
index 64eac776..79548568 100644
--- a/src/xmlpatterns/expr/qtriplecontainer_p.h
+++ b/src/xmlpatterns/expr/qtriplecontainer_p.h
@@ -54,8 +54,6 @@
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h
index 6b8a90c1..a10e99f9 100644
--- a/src/xmlpatterns/expr/qtruthpredicate_p.h
+++ b/src/xmlpatterns/expr/qtruthpredicate_p.h
@@ -54,8 +54,6 @@
#include <private/qgenericpredicate_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -107,6 +105,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h
index 66b4ceaf..7934cbca 100644
--- a/src/xmlpatterns/expr/qunaryexpression_p.h
+++ b/src/xmlpatterns/expr/qunaryexpression_p.h
@@ -52,8 +52,6 @@
#ifndef Patternist_UnaryExpression_H
#define Patternist_UnaryExpression_H
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
#include <private/qarithmeticexpression_p.h>
@@ -109,6 +107,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
index d514549f..0270f201 100644
--- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h
+++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
@@ -56,8 +56,6 @@
#include <private/qexpression_p.h>
#include <private/qgenericsequencetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -144,6 +142,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
index fbf612ba..9a09b489 100644
--- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
+++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
@@ -54,7 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -106,6 +105,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h
index f00f4b11..c0ccbaaa 100644
--- a/src/xmlpatterns/expr/quserfunction_p.h
+++ b/src/xmlpatterns/expr/quserfunction_p.h
@@ -58,8 +58,6 @@
#include <private/qfunctionsignature_p.h>
#include <private/qvariabledeclaration_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename T> class QList;
@@ -130,6 +128,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
index 3ec04d6b..936cede3 100644
--- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h
+++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
@@ -58,7 +58,6 @@
#include <private/quserfunction_p.h>
#include <private/qvariabledeclaration_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -177,6 +176,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qvalidate_p.h b/src/xmlpatterns/expr/qvalidate_p.h
index 1a4404ca..ecf05563 100644
--- a/src/xmlpatterns/expr/qvalidate_p.h
+++ b/src/xmlpatterns/expr/qvalidate_p.h
@@ -54,8 +54,6 @@
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -101,6 +99,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h
index 900f7f31..f00a7d52 100644
--- a/src/xmlpatterns/expr/qvaluecomparison_p.h
+++ b/src/xmlpatterns/expr/qvaluecomparison_p.h
@@ -56,8 +56,6 @@
#include <private/qpaircontainer_p.h>
#include <private/qcomparisonplatform_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -133,6 +131,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qvariabledeclaration_p.h b/src/xmlpatterns/expr/qvariabledeclaration_p.h
index 77f7b89e..8111318c 100644
--- a/src/xmlpatterns/expr/qvariabledeclaration_p.h
+++ b/src/xmlpatterns/expr/qvariabledeclaration_p.h
@@ -58,8 +58,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qvariablereference_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename T> class QStack;
@@ -198,6 +196,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h
index 972677e0..810dcab5 100644
--- a/src/xmlpatterns/expr/qvariablereference_p.h
+++ b/src/xmlpatterns/expr/qvariablereference_p.h
@@ -54,8 +54,6 @@
#include <private/qemptycontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename T> class QList;
@@ -116,6 +114,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qwithparam_p.h b/src/xmlpatterns/expr/qwithparam_p.h
index b5f808f1..a574fa34 100644
--- a/src/xmlpatterns/expr/qwithparam_p.h
+++ b/src/xmlpatterns/expr/qwithparam_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctionargument_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -118,6 +116,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
index dd71f0d0..00b910dd 100644
--- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
@@ -54,7 +54,6 @@
#include <private/qsimplecontentconstructor_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -84,6 +83,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
index 9d70d886..e160203b 100644
--- a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
@@ -56,8 +56,6 @@
#include <private/qfunctionfactory_p.h>
#include <private/qfunctionsignature_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -152,6 +150,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h
index f2bb3ea6..4f2ca634 100644
--- a/src/xmlpatterns/functions/qaccessorfns_p.h
+++ b/src/xmlpatterns/functions/qaccessorfns_p.h
@@ -62,8 +62,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -133,6 +131,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h
index 055a2e58..2fa186ab 100644
--- a/src/xmlpatterns/functions/qaggregatefns_p.h
+++ b/src/xmlpatterns/functions/qaggregatefns_p.h
@@ -68,8 +68,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -151,6 +149,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h
index 1d8f0794..bee11aae 100644
--- a/src/xmlpatterns/functions/qaggregator_p.h
+++ b/src/xmlpatterns/functions/qaggregator_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h
index 25fae152..4d23bb43 100644
--- a/src/xmlpatterns/functions/qassemblestringfns_p.h
+++ b/src/xmlpatterns/functions/qassemblestringfns_p.h
@@ -65,8 +65,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h
index 0a7ef68e..8635a82f 100644
--- a/src/xmlpatterns/functions/qbooleanfns_p.h
+++ b/src/xmlpatterns/functions/qbooleanfns_p.h
@@ -63,8 +63,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -114,6 +112,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h
index 06cdc937..4a1dc95e 100644
--- a/src/xmlpatterns/functions/qcomparescaseaware_p.h
+++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h
index 2e70fc79..effaa57a 100644
--- a/src/xmlpatterns/functions/qcomparestringfns_p.h
+++ b/src/xmlpatterns/functions/qcomparestringfns_p.h
@@ -63,8 +63,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -97,6 +95,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h
index 4c74024c..299fb1e1 100644
--- a/src/xmlpatterns/functions/qcomparingaggregator_p.h
+++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h
@@ -67,8 +67,6 @@
#include <private/quntypedatomicconverter_p.h>
#include <private/qpatternistlocale_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -141,6 +139,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
index 9ef757d4..092cf05a 100644
--- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
+++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
@@ -55,8 +55,6 @@
#include <private/qabstractfunctionfactory_p.h>
#include <private/qschematypefactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -90,6 +88,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h
index 6f7dd0db..8e91cb00 100644
--- a/src/xmlpatterns/functions/qcontextfns_p.h
+++ b/src/xmlpatterns/functions/qcontextfns_p.h
@@ -63,8 +63,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -190,6 +188,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qcontextnodechecker_p.h b/src/xmlpatterns/functions/qcontextnodechecker_p.h
index c6ceb379..2b29dfd6 100644
--- a/src/xmlpatterns/functions/qcontextnodechecker_p.h
+++ b/src/xmlpatterns/functions/qcontextnodechecker_p.h
@@ -54,7 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -80,6 +79,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h
index 3572a69d..b034f3dd 100644
--- a/src/xmlpatterns/functions/qcurrentfn_p.h
+++ b/src/xmlpatterns/functions/qcurrentfn_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -84,6 +82,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h
index 6616933f..053a0770 100644
--- a/src/xmlpatterns/functions/qdatetimefn_p.h
+++ b/src/xmlpatterns/functions/qdatetimefn_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -77,6 +75,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h
index dcf53396..22327f91 100644
--- a/src/xmlpatterns/functions/qdatetimefns_p.h
+++ b/src/xmlpatterns/functions/qdatetimefns_p.h
@@ -69,8 +69,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -300,6 +298,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h
index b4ee4dc7..7f6324db 100644
--- a/src/xmlpatterns/functions/qdeepequalfn_p.h
+++ b/src/xmlpatterns/functions/qdeepequalfn_p.h
@@ -56,8 +56,6 @@
#include <private/qcomparisonplatform_p.h>
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h
index c515f6d4..8a70a598 100644
--- a/src/xmlpatterns/functions/qdocumentfn_p.h
+++ b/src/xmlpatterns/functions/qdocumentfn_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -119,6 +117,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h
index a15e2277..9881ac3a 100644
--- a/src/xmlpatterns/functions/qelementavailablefn_p.h
+++ b/src/xmlpatterns/functions/qelementavailablefn_p.h
@@ -54,7 +54,6 @@
#include <private/qstaticnamespacescontainer_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -82,6 +81,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h
index d0c3fe7b..95dae585 100644
--- a/src/xmlpatterns/functions/qerrorfn_p.h
+++ b/src/xmlpatterns/functions/qerrorfn_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -86,6 +84,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qfunctionargument_p.h b/src/xmlpatterns/functions/qfunctionargument_p.h
index 5390cba3..0115166b 100644
--- a/src/xmlpatterns/functions/qfunctionargument_p.h
+++ b/src/xmlpatterns/functions/qfunctionargument_p.h
@@ -58,8 +58,6 @@
#include <QXmlName>
#include <private/qsequencetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
index a36fa928..b655b59e 100644
--- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h
+++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
@@ -55,8 +55,6 @@
#include <private/qstaticnamespacescontainer_p.h>
#include <private/qfunctionfactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
QT_END_NAMESPACE
}
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h
index a91d91ac..5a148521 100644
--- a/src/xmlpatterns/functions/qfunctioncall_p.h
+++ b/src/xmlpatterns/functions/qfunctioncall_p.h
@@ -56,8 +56,6 @@
#include <private/qfunctionsignature_p.h>
#include <private/qxpathhelper_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -97,6 +95,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qfunctionfactory_p.h b/src/xmlpatterns/functions/qfunctionfactory_p.h
index 4507b027..7961d873 100644
--- a/src/xmlpatterns/functions/qfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactory_p.h
@@ -61,8 +61,6 @@
#include <private/qprimitives_p.h>
#include <QXmlName>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -163,6 +161,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
index 014af6b7..dc7296d7 100644
--- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
@@ -55,8 +55,6 @@
#include <private/qfunctionfactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -113,6 +111,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h
index ee56c28f..acf60c7b 100644
--- a/src/xmlpatterns/functions/qfunctionsignature_p.h
+++ b/src/xmlpatterns/functions/qfunctionsignature_p.h
@@ -60,8 +60,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qprimitives_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename Key, typename Value> class QHash;
@@ -208,6 +206,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h
index 974bf6a9..9c4a0ced 100644
--- a/src/xmlpatterns/functions/qgenerateidfn_p.h
+++ b/src/xmlpatterns/functions/qgenerateidfn_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
{
@@ -78,6 +76,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h
index 88d3fb8f..c64f7f53 100644
--- a/src/xmlpatterns/functions/qnodefns_p.h
+++ b/src/xmlpatterns/functions/qnodefns_p.h
@@ -64,8 +64,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -171,6 +169,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h
index 2b86e8b5..38983784 100644
--- a/src/xmlpatterns/functions/qnumericfns_p.h
+++ b/src/xmlpatterns/functions/qnumericfns_p.h
@@ -63,8 +63,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -135,6 +133,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
index 0070485b..fc4ddb15 100644
--- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h
+++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
@@ -63,8 +63,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -134,6 +132,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h
index 35481118..d1d218a7 100644
--- a/src/xmlpatterns/functions/qpatternplatform_p.h
+++ b/src/xmlpatterns/functions/qpatternplatform_p.h
@@ -57,8 +57,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -190,6 +188,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h
index e9653857..e71c2742 100644
--- a/src/xmlpatterns/functions/qqnamefns_p.h
+++ b/src/xmlpatterns/functions/qqnamefns_p.h
@@ -63,8 +63,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -157,6 +155,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h
index 331d1bc8..722d9e6b 100644
--- a/src/xmlpatterns/functions/qresolveurifn_p.h
+++ b/src/xmlpatterns/functions/qresolveurifn_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -77,6 +75,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index c0382b78..913d9b37 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -68,8 +68,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -339,6 +337,4 @@ statEnv |- (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
index 3bd3394d..b46c8dea 100644
--- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
+++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
@@ -65,8 +65,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -162,6 +160,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
index d1c8ca7d..1e1323bd 100644
--- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
@@ -56,7 +56,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -103,5 +102,5 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
+
#endif
diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
index 1fda37a5..2a09d0a7 100644
--- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -110,6 +108,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h
index 18218dd7..4f0f247d 100644
--- a/src/xmlpatterns/functions/qstringvaluefns_p.h
+++ b/src/xmlpatterns/functions/qstringvaluefns_p.h
@@ -65,8 +65,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -288,6 +286,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h
index 9daae80d..9c67e305 100644
--- a/src/xmlpatterns/functions/qsubstringfns_p.h
+++ b/src/xmlpatterns/functions/qsubstringfns_p.h
@@ -62,8 +62,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h
index 755a96f2..f85f8632 100644
--- a/src/xmlpatterns/functions/qsystempropertyfn_p.h
+++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h
@@ -54,8 +54,6 @@
#include <private/qstaticnamespacescontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h
index 5570baa7..7d0c4ae0 100644
--- a/src/xmlpatterns/functions/qtimezonefns_p.h
+++ b/src/xmlpatterns/functions/qtimezonefns_p.h
@@ -63,8 +63,6 @@
* @ingroup Patternist_functions
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h
index 198528d8..7b307a34 100644
--- a/src/xmlpatterns/functions/qtracefn_p.h
+++ b/src/xmlpatterns/functions/qtracefn_p.h
@@ -54,8 +54,6 @@
#include <private/qfunctioncall_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ statEnv |- (FN-URI,"trace")(Type) : prime(Type) * quantifier(Type)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h
index 13a5cee6..64a36237 100644
--- a/src/xmlpatterns/functions/qtypeavailablefn_p.h
+++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h
@@ -55,8 +55,6 @@
#include <private/qschematypefactory_p.h>
#include <private/qstaticnamespacescontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
index ab742114..763619a0 100644
--- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
@@ -54,8 +54,6 @@
#include <private/qcontextnodechecker_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -77,6 +75,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
index 2b6c41a8..a5779932 100644
--- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
@@ -54,8 +54,6 @@
#include <private/qcontextnodechecker_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -77,6 +75,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
index 2f6a241b..e06ec991 100644
--- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
@@ -54,8 +54,6 @@
#include <private/qstaticbaseuricontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
{
@@ -78,6 +76,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h
index 37ae964a..6627b529 100644
--- a/src/xmlpatterns/functions/qunparsedtextfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h
@@ -54,8 +54,6 @@
#include <private/qstaticbaseuricontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
{
@@ -78,6 +76,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
index 0d910682..d3adc036 100644
--- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractfunctionfactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -88,6 +86,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
index d7228ae2..23913d11 100644
--- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractfunctionfactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
index fc390d8b..708d5afd 100644
--- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractfunctionfactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h
index 21c3ee72..380e97b0 100644
--- a/src/xmlpatterns/iterators/qcachingiterator_p.h
+++ b/src/xmlpatterns/iterators/qcachingiterator_p.h
@@ -58,8 +58,6 @@
#include <private/qdynamiccontext_p.h>
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -124,6 +122,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
index 0fc95e16..b94a5123 100644
--- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
+++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
@@ -60,8 +60,6 @@
#include <private/qcomparisonplatform_p.h>
#include <private/qsourcelocationreflection_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h
index 7e0b3eee..2fbff9d0 100644
--- a/src/xmlpatterns/iterators/qdistinctiterator_p.h
+++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h
@@ -60,8 +60,6 @@
#include <private/qcomparisonplatform_p.h>
#include <private/qsourcelocationreflection_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -123,6 +121,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h
index 8d99282e..2af3d139 100644
--- a/src/xmlpatterns/iterators/qemptyiterator_p.h
+++ b/src/xmlpatterns/iterators/qemptyiterator_p.h
@@ -55,8 +55,6 @@
#include <private/qabstractxmlforwarditerator_p.h>
#include <private/qprimitives_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -141,6 +139,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h
index 5d6a8ff7..942bc715 100644
--- a/src/xmlpatterns/iterators/qexceptiterator_p.h
+++ b/src/xmlpatterns/iterators/qexceptiterator_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h
index 88040e3d..4ed5c8b4 100644
--- a/src/xmlpatterns/iterators/qindexofiterator_p.h
+++ b/src/xmlpatterns/iterators/qindexofiterator_p.h
@@ -58,8 +58,6 @@
#include <private/qdynamiccontext_p.h>
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -124,6 +122,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h
index 21084524..2ff324ed 100644
--- a/src/xmlpatterns/iterators/qinsertioniterator_p.h
+++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h
@@ -55,8 +55,6 @@
#include <private/qabstractxmlforwarditerator_p.h>
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -115,6 +113,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h
index df80a24a..b0363efe 100644
--- a/src/xmlpatterns/iterators/qintersectiterator_p.h
+++ b/src/xmlpatterns/iterators/qintersectiterator_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -102,6 +100,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
index 8fba02d5..b9e40e06 100644
--- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
@@ -55,8 +55,6 @@
#include <private/qabstractxmlforwarditerator_p.h>
#include <private/qdynamiccontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -185,6 +183,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h
index b8bfec66..8079f55d 100644
--- a/src/xmlpatterns/iterators/qrangeiterator_p.h
+++ b/src/xmlpatterns/iterators/qrangeiterator_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -136,6 +134,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h
index 9476928a..12cef316 100644
--- a/src/xmlpatterns/iterators/qremovaliterator_p.h
+++ b/src/xmlpatterns/iterators/qremovaliterator_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -117,6 +115,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
index c4d0d0a5..253c4423 100644
--- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
@@ -55,8 +55,6 @@
#include <private/qabstractxmlforwarditerator_p.h>
#include <private/qdynamiccontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -232,6 +230,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qsingletoniterator_p.h b/src/xmlpatterns/iterators/qsingletoniterator_p.h
index c4ad83dd..18abb338 100644
--- a/src/xmlpatterns/iterators/qsingletoniterator_p.h
+++ b/src/xmlpatterns/iterators/qsingletoniterator_p.h
@@ -56,8 +56,6 @@
#include <QtXmlPatterns/private/qprimitives_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -172,6 +170,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
index 43338a06..db8b2e07 100644
--- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
+++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -113,6 +111,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
index 86b98698..05f5cfed 100644
--- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
+++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h
index a7532782..7fe1ed7a 100644
--- a/src/xmlpatterns/iterators/qunioniterator_p.h
+++ b/src/xmlpatterns/iterators/qunioniterator_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -102,6 +100,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h
index eafd4651..ec0cccdc 100644
--- a/src/xmlpatterns/janitors/qargumentconverter_p.h
+++ b/src/xmlpatterns/janitors/qargumentconverter_p.h
@@ -54,8 +54,6 @@
#include <private/quntypedatomicconverter_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h
index ea919284..1e463dde 100644
--- a/src/xmlpatterns/janitors/qatomizer_p.h
+++ b/src/xmlpatterns/janitors/qatomizer_p.h
@@ -55,8 +55,6 @@
#include <private/qitem_p.h>
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -105,6 +103,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
index c6de02fc..cfdae8b2 100644
--- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h
+++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -123,6 +121,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h
index 9e5ec79f..91ffcb74 100644
--- a/src/xmlpatterns/janitors/qebvextractor_p.h
+++ b/src/xmlpatterns/janitors/qebvextractor_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h
index fe433b1a..4459e317 100644
--- a/src/xmlpatterns/janitors/qitemverifier_p.h
+++ b/src/xmlpatterns/janitors/qitemverifier_p.h
@@ -54,8 +54,6 @@
#include <private/qsinglecontainer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
index 8f737192..87af5f41 100644
--- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
+++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
@@ -56,8 +56,6 @@
#include <private/qsinglecontainer_p.h>
#include <private/qcastingplatform_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h
index a4cdf77d..760777d3 100644
--- a/src/xmlpatterns/parser/qmaintainingreader_p.h
+++ b/src/xmlpatterns/parser/qmaintainingreader_p.h
@@ -61,7 +61,6 @@
#include <private/qxpathhelper_p.h>
#include <private/qxslttokenlookup_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QUrl;
@@ -228,7 +227,6 @@ namespace QPatternist
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
diff --git a/src/xmlpatterns/parser/qparsercontext_p.h b/src/xmlpatterns/parser/qparsercontext_p.h
index 894063c9..215908fe 100644
--- a/src/xmlpatterns/parser/qparsercontext_p.h
+++ b/src/xmlpatterns/parser/qparsercontext_p.h
@@ -67,8 +67,6 @@
#include <private/quserfunction_p.h>
#include <private/qvariabledeclaration_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -428,6 +426,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/parser/qtokenizer_p.h b/src/xmlpatterns/parser/qtokenizer_p.h
index c1b405e7..c6e1e56d 100644
--- a/src/xmlpatterns/parser/qtokenizer_p.h
+++ b/src/xmlpatterns/parser/qtokenizer_p.h
@@ -65,8 +65,6 @@
* @short Contains functions and classes used by the parser and tokenizer.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -211,6 +209,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/parser/qtokenrevealer_p.h b/src/xmlpatterns/parser/qtokenrevealer_p.h
index c0ad688d..08ad3ebb 100644
--- a/src/xmlpatterns/parser/qtokenrevealer_p.h
+++ b/src/xmlpatterns/parser/qtokenrevealer_p.h
@@ -56,7 +56,6 @@
#include <private/qtokenizer_p.h>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -91,7 +90,5 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/parser/qtokensource_p.h b/src/xmlpatterns/parser/qtokensource_p.h
index 475df77a..91aa99ab 100644
--- a/src/xmlpatterns/parser/qtokensource_p.h
+++ b/src/xmlpatterns/parser/qtokensource_p.h
@@ -63,8 +63,6 @@
#include <private/qquerytransformparser_p.h>
#include <private/qvalidate_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename T> class QQueue;
@@ -164,6 +162,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h
index 7701b80e..03f0310d 100644
--- a/src/xmlpatterns/parser/qxquerytokenizer_p.h
+++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h
@@ -59,8 +59,6 @@
#include <private/qtokenizer_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -327,6 +325,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/parser/qxslttokenizer_p.h b/src/xmlpatterns/parser/qxslttokenizer_p.h
index 5f3433ea..c4c5121e 100644
--- a/src/xmlpatterns/parser/qxslttokenizer_p.h
+++ b/src/xmlpatterns/parser/qxslttokenizer_p.h
@@ -61,8 +61,6 @@
#include <private/qtokenizer_p.h>
#include <private/qxslttokenlookup_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -476,6 +474,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/projection/qdocumentprojector_p.h b/src/xmlpatterns/projection/qdocumentprojector_p.h
index 2a5d411d..7e49669b 100644
--- a/src/xmlpatterns/projection/qdocumentprojector_p.h
+++ b/src/xmlpatterns/projection/qdocumentprojector_p.h
@@ -55,8 +55,6 @@
#include <private/qprojectedexpression_p.h>
#include "qabstractxmlreceiver.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -102,6 +100,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/projection/qprojectedexpression_p.h b/src/xmlpatterns/projection/qprojectedexpression_p.h
index 6a320fd5..31bcaa97 100644
--- a/src/xmlpatterns/projection/qprojectedexpression_p.h
+++ b/src/xmlpatterns/projection/qprojectedexpression_p.h
@@ -54,8 +54,6 @@
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -160,6 +158,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qnamespacesupport_p.h b/src/xmlpatterns/schema/qnamespacesupport_p.h
index 927d1221..2219748b 100644
--- a/src/xmlpatterns/schema/qnamespacesupport_p.h
+++ b/src/xmlpatterns/schema/qnamespacesupport_p.h
@@ -60,8 +60,6 @@
#include <QtCore/QStack>
#include <QtCore/QXmlStreamNamespaceDeclarations>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -168,6 +166,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdalternative_p.h b/src/xmlpatterns/schema/qxsdalternative_p.h
index 6bab5465..75076d5d 100644
--- a/src/xmlpatterns/schema/qxsdalternative_p.h
+++ b/src/xmlpatterns/schema/qxsdalternative_p.h
@@ -59,8 +59,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdannotated_p.h b/src/xmlpatterns/schema/qxsdannotated_p.h
index 2745d819..fe3ded23 100644
--- a/src/xmlpatterns/schema/qxsdannotated_p.h
+++ b/src/xmlpatterns/schema/qxsdannotated_p.h
@@ -54,8 +54,6 @@
#include <private/qxsdannotation_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdannotation_p.h b/src/xmlpatterns/schema/qxsdannotation_p.h
index 90d48c02..1912dddd 100644
--- a/src/xmlpatterns/schema/qxsdannotation_p.h
+++ b/src/xmlpatterns/schema/qxsdannotation_p.h
@@ -56,8 +56,6 @@
#include <private/qxsdapplicationinformation_p.h>
#include <private/qxsddocumentation_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
index acbadf04..051cb47e 100644
--- a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
+++ b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
@@ -56,8 +56,6 @@
#include <private/qanyuri_p.h>
#include <private/qnamedschemacomponent_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -110,6 +108,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdassertion_p.h b/src/xmlpatterns/schema/qxsdassertion_p.h
index 86a1c04f..d3bbabbd 100644
--- a/src/xmlpatterns/schema/qxsdassertion_p.h
+++ b/src/xmlpatterns/schema/qxsdassertion_p.h
@@ -58,8 +58,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdattribute_p.h b/src/xmlpatterns/schema/qxsdattribute_p.h
index c5f32952..935ae904 100644
--- a/src/xmlpatterns/schema/qxsdattribute_p.h
+++ b/src/xmlpatterns/schema/qxsdattribute_p.h
@@ -58,8 +58,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -241,6 +239,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdattributegroup_p.h b/src/xmlpatterns/schema/qxsdattributegroup_p.h
index ece17595..00b71224 100644
--- a/src/xmlpatterns/schema/qxsdattributegroup_p.h
+++ b/src/xmlpatterns/schema/qxsdattributegroup_p.h
@@ -58,8 +58,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -117,6 +115,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h
index a87378fa..f92f7f7f 100644
--- a/src/xmlpatterns/schema/qxsdattributereference_p.h
+++ b/src/xmlpatterns/schema/qxsdattributereference_p.h
@@ -56,8 +56,6 @@
#include <QtXmlPatterns/QSourceLocation>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -142,6 +140,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdattributeterm_p.h b/src/xmlpatterns/schema/qxsdattributeterm_p.h
index 6e0a60f3..3ddb1cf6 100644
--- a/src/xmlpatterns/schema/qxsdattributeterm_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeterm_p.h
@@ -55,8 +55,6 @@
#include <private/qnamedschemacomponent_p.h>
#include <private/qxsdannotated_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h
index 5472d477..03244077 100644
--- a/src/xmlpatterns/schema/qxsdattributeuse_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h
@@ -57,8 +57,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -219,6 +217,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h
index fcbb444a..bbeac900 100644
--- a/src/xmlpatterns/schema/qxsdcomplextype_p.h
+++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h
@@ -62,8 +62,6 @@
#include <QtCore/QSet>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -399,6 +397,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsddocumentation_p.h b/src/xmlpatterns/schema/qxsddocumentation_p.h
index 2b39b5db..74cd3f48 100644
--- a/src/xmlpatterns/schema/qxsddocumentation_p.h
+++ b/src/xmlpatterns/schema/qxsddocumentation_p.h
@@ -57,8 +57,6 @@
#include <private/qderivedstring_p.h>
#include <private/qnamedschemacomponent_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -132,6 +130,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h
index 00e4d7f8..3c7e7ead 100644
--- a/src/xmlpatterns/schema/qxsdelement_p.h
+++ b/src/xmlpatterns/schema/qxsdelement_p.h
@@ -61,8 +61,6 @@
#include <QtCore/QList>
#include <QtCore/QSet>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -398,6 +396,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdfacet_p.h b/src/xmlpatterns/schema/qxsdfacet_p.h
index 9b436223..58f2b260 100644
--- a/src/xmlpatterns/schema/qxsdfacet_p.h
+++ b/src/xmlpatterns/schema/qxsdfacet_p.h
@@ -59,8 +59,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -208,6 +206,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdidcache_p.h b/src/xmlpatterns/schema/qxsdidcache_p.h
index e56b46f8..6dc931a8 100644
--- a/src/xmlpatterns/schema/qxsdidcache_p.h
+++ b/src/xmlpatterns/schema/qxsdidcache_p.h
@@ -59,8 +59,6 @@
#include <QtCore/QSet>
#include <QtCore/QString>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -94,6 +92,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdidchelper_p.h b/src/xmlpatterns/schema/qxsdidchelper_p.h
index 8c0d075c..2dc99f8a 100644
--- a/src/xmlpatterns/schema/qxsdidchelper_p.h
+++ b/src/xmlpatterns/schema/qxsdidchelper_p.h
@@ -57,8 +57,6 @@
#include <QtXmlPatterns/QXmlItem>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -181,6 +179,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
index 7c7dcfa2..6cc8dd38 100644
--- a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
+++ b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
@@ -58,8 +58,6 @@
#include <QtCore/QStringList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -168,6 +166,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdinstancereader_p.h b/src/xmlpatterns/schema/qxsdinstancereader_p.h
index 642edbe4..d4f8d26f 100644
--- a/src/xmlpatterns/schema/qxsdinstancereader_p.h
+++ b/src/xmlpatterns/schema/qxsdinstancereader_p.h
@@ -56,8 +56,6 @@
#include <private/qpullbridge_p.h>
#include <private/qxsdschemacontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -184,6 +182,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
index 6a461027..04657254 100644
--- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h
+++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
@@ -55,8 +55,6 @@
#include <private/qxsdparticle_p.h>
#include <private/qxsdterm_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename N> class QList;
@@ -134,6 +132,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdnotation_p.h b/src/xmlpatterns/schema/qxsdnotation_p.h
index 91ced787..c5622eee 100644
--- a/src/xmlpatterns/schema/qxsdnotation_p.h
+++ b/src/xmlpatterns/schema/qxsdnotation_p.h
@@ -59,8 +59,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -114,6 +112,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdparticle_p.h b/src/xmlpatterns/schema/qxsdparticle_p.h
index 9356df57..8698d8a3 100644
--- a/src/xmlpatterns/schema/qxsdparticle_p.h
+++ b/src/xmlpatterns/schema/qxsdparticle_p.h
@@ -57,8 +57,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -149,6 +147,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdparticlechecker_p.h b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
index 7ba4f0b9..08b94e22 100644
--- a/src/xmlpatterns/schema/qxsdparticlechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
@@ -57,8 +57,6 @@
#include <private/qxsdschemacontext_p.h>
#include <private/qxsdwildcard_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -101,6 +99,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h
index f3a4fe2a..f2b72265 100644
--- a/src/xmlpatterns/schema/qxsdreference_p.h
+++ b/src/xmlpatterns/schema/qxsdreference_p.h
@@ -56,8 +56,6 @@
#include <QtXmlPatterns/QSourceLocation>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -140,6 +138,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschema_p.h b/src/xmlpatterns/schema/qxsdschema_p.h
index 69985cc4..ba679c82 100644
--- a/src/xmlpatterns/schema/qxsdschema_p.h
+++ b/src/xmlpatterns/schema/qxsdschema_p.h
@@ -70,8 +70,6 @@
* @defgroup Patternist_schema XML Schema Processing
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -296,6 +294,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschemachecker_p.h b/src/xmlpatterns/schema/qxsdschemachecker_p.h
index 0622f727..b92217ef 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker_p.h
+++ b/src/xmlpatterns/schema/qxsdschemachecker_p.h
@@ -63,8 +63,6 @@
#include <QtCore/QExplicitlySharedDataPointer>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -279,6 +277,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h
index 7b156465..79fa3863 100644
--- a/src/xmlpatterns/schema/qxsdschemacontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h
@@ -64,8 +64,6 @@
#include <QtNetwork/QNetworkAccessManager>
#include <QtXmlPatterns/QAbstractMessageHandler>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -182,6 +180,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschemadebugger_p.h b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
index 7ae185ee..946f7234 100644
--- a/src/xmlpatterns/schema/qxsdschemadebugger_p.h
+++ b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
@@ -54,8 +54,6 @@
#include <private/qxsdschema_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschemahelper_p.h b/src/xmlpatterns/schema/qxsdschemahelper_p.h
index 5ecd7f3e..dedcb0e7 100644
--- a/src/xmlpatterns/schema/qxsdschemahelper_p.h
+++ b/src/xmlpatterns/schema/qxsdschemahelper_p.h
@@ -60,8 +60,6 @@
#include <private/qxsdschemacontext_p.h>
#include <private/qxsdwildcard_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -212,6 +210,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschemamerger_p.h b/src/xmlpatterns/schema/qxsdschemamerger_p.h
index aef1bf76..cfbd588f 100644
--- a/src/xmlpatterns/schema/qxsdschemamerger_p.h
+++ b/src/xmlpatterns/schema/qxsdschemamerger_p.h
@@ -54,8 +54,6 @@
#include <private/qxsdschema_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -94,6 +92,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h
index 96c4c27e..00cd8512 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h
@@ -73,8 +73,6 @@
#include <QtCore/QXmlStreamReader>
#include <QtXmlPatterns/QXmlNamePool>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -734,6 +732,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
index b508940a..a34fe18f 100644
--- a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
@@ -61,8 +61,6 @@
#include <QtCore/QSharedData>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -226,6 +224,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver_p.h b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
index 60ac1585..ee841a95 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
@@ -68,8 +68,6 @@
#include <QtCore/QExplicitlySharedDataPointer>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -573,6 +571,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
index 3502ee6d..cd4f3a92 100644
--- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
+++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
@@ -55,8 +55,6 @@
#include <QtCore/QHash>
#include <private/qschematypefactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h
index d260dbf9..f4b2c4b1 100644
--- a/src/xmlpatterns/schema/qxsdsimpletype_p.h
+++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h
@@ -58,8 +58,6 @@
#include <QtCore/QSet>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -214,6 +212,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h
index fc73ffd1..ffddfe86 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h
@@ -58,8 +58,6 @@
#include <QtCore/QSet>
#include <QtCore/QTextStream>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QIODevice;
@@ -297,6 +295,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
index 7085e040..018273c9 100644
--- a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
@@ -59,8 +59,6 @@
#include <QtCore/QExplicitlySharedDataPointer>
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -136,6 +134,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdterm_p.h b/src/xmlpatterns/schema/qxsdterm_p.h
index 10430908..93f2d3c8 100644
--- a/src/xmlpatterns/schema/qxsdterm_p.h
+++ b/src/xmlpatterns/schema/qxsdterm_p.h
@@ -55,8 +55,6 @@
#include <private/qnamedschemacomponent_p.h>
#include <private/qxsdannotated_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h
index b69e7d99..735ffa99 100644
--- a/src/xmlpatterns/schema/qxsdtypechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h
@@ -58,8 +58,6 @@
#include <private/qsourcelocationreflection_p.h>
#include <private/qxsdschemacontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QXmlQuery;
@@ -184,6 +182,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h
index 9cd1c546..e792884b 100644
--- a/src/xmlpatterns/schema/qxsduserschematype_p.h
+++ b/src/xmlpatterns/schema/qxsduserschematype_p.h
@@ -56,8 +56,6 @@
#include <private/qschematype_p.h>
#include <private/qxsdannotated_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename N, typename M> class QHash;
@@ -119,6 +117,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
index e8ef9b06..22faa8f1 100644
--- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
@@ -59,8 +59,6 @@
#include <private/qschematype_p.h>
#include <private/qxsdelement_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -174,6 +172,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
index 38a15483..0c06f15d 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
@@ -59,8 +59,6 @@
#include <QtCore/QStack>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QXmlQuery;
@@ -291,6 +289,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h
index fcb7f56f..7e8d7e57 100644
--- a/src/xmlpatterns/schema/qxsdwildcard_p.h
+++ b/src/xmlpatterns/schema/qxsdwildcard_p.h
@@ -56,8 +56,6 @@
#include <QtCore/QSet>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -194,6 +192,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/schema/qxsdxpathexpression_p.h b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
index 3403f0ed..f49d7e77 100644
--- a/src/xmlpatterns/schema/qxsdxpathexpression_p.h
+++ b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
@@ -58,8 +58,6 @@
#include <QtCore/QList>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -138,6 +136,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qabstractnodetest_p.h b/src/xmlpatterns/type/qabstractnodetest_p.h
index 197745f9..d703ff58 100644
--- a/src/xmlpatterns/type/qabstractnodetest_p.h
+++ b/src/xmlpatterns/type/qabstractnodetest_p.h
@@ -54,8 +54,6 @@
#include <private/qanynodetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -82,6 +80,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qanyitemtype_p.h b/src/xmlpatterns/type/qanyitemtype_p.h
index 4d30a109..a5220007 100644
--- a/src/xmlpatterns/type/qanyitemtype_p.h
+++ b/src/xmlpatterns/type/qanyitemtype_p.h
@@ -54,8 +54,6 @@
#include <private/qatomictype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -114,6 +112,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qanynodetype_p.h b/src/xmlpatterns/type/qanynodetype_p.h
index 0c6c1cfe..ebc351a8 100644
--- a/src/xmlpatterns/type/qanynodetype_p.h
+++ b/src/xmlpatterns/type/qanynodetype_p.h
@@ -55,8 +55,6 @@
#include <private/qatomictype_p.h>
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -108,6 +106,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qanysimpletype_p.h b/src/xmlpatterns/type/qanysimpletype_p.h
index 55274e9c..2b4dcc39 100644
--- a/src/xmlpatterns/type/qanysimpletype_p.h
+++ b/src/xmlpatterns/type/qanysimpletype_p.h
@@ -54,8 +54,6 @@
#include <private/qanytype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -125,6 +123,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qanytype_p.h b/src/xmlpatterns/type/qanytype_p.h
index a0f4a768..fdb5aa9d 100644
--- a/src/xmlpatterns/type/qanytype_p.h
+++ b/src/xmlpatterns/type/qanytype_p.h
@@ -54,8 +54,6 @@
#include <private/qschematype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -137,6 +135,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qatomiccasterlocator_p.h b/src/xmlpatterns/type/qatomiccasterlocator_p.h
index 25227d4f..069e8707 100644
--- a/src/xmlpatterns/type/qatomiccasterlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocator_p.h
@@ -54,8 +54,6 @@
#include <private/qatomictypedispatch_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -121,6 +119,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qatomiccasterlocators_p.h b/src/xmlpatterns/type/qatomiccasterlocators_p.h
index 25d62f19..54e5975e 100644
--- a/src/xmlpatterns/type/qatomiccasterlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocators_p.h
@@ -62,8 +62,6 @@
* which can perform casting from one atomic value to another.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -904,6 +902,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
index c8bd52cd..c8ef100b 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
@@ -54,8 +54,6 @@
#include <private/qatomictypedispatch_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -127,6 +125,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
index 37fa194f..7e32b8c7 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
@@ -60,8 +60,6 @@
* which can compare atomic values.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -351,6 +349,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
index ada89bc3..870dde36 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
@@ -54,8 +54,6 @@
#include <private/qatomictypedispatch_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -153,6 +151,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
index 9055b2c1..4d067110 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
@@ -61,8 +61,6 @@
* which can perform arithmetics between atomic values.
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -244,6 +242,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qatomictype_p.h b/src/xmlpatterns/type/qatomictype_p.h
index d71e5e25..054192d8 100644
--- a/src/xmlpatterns/type/qatomictype_p.h
+++ b/src/xmlpatterns/type/qatomictype_p.h
@@ -59,8 +59,6 @@
#include <private/qatomictypedispatch_p.h>
#include <private/qitemtype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -155,6 +153,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qatomictypedispatch_p.h b/src/xmlpatterns/type/qatomictypedispatch_p.h
index 412902bc..483bd9fb 100644
--- a/src/xmlpatterns/type/qatomictypedispatch_p.h
+++ b/src/xmlpatterns/type/qatomictypedispatch_p.h
@@ -55,8 +55,6 @@
#include <QSharedData>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -272,6 +270,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qbasictypesfactory_p.h b/src/xmlpatterns/type/qbasictypesfactory_p.h
index e7fb7cc7..a3db54bf 100644
--- a/src/xmlpatterns/type/qbasictypesfactory_p.h
+++ b/src/xmlpatterns/type/qbasictypesfactory_p.h
@@ -55,8 +55,6 @@
#include <QHash>
#include <private/qschematypefactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -116,6 +114,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qbuiltinatomictype_p.h b/src/xmlpatterns/type/qbuiltinatomictype_p.h
index 208fcb2b..c7cb2460 100644
--- a/src/xmlpatterns/type/qbuiltinatomictype_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictype_p.h
@@ -54,8 +54,6 @@
#include <private/qatomictype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -125,6 +123,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qbuiltinatomictypes_p.h b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
index f17450fe..eec8fc88 100644
--- a/src/xmlpatterns/type/qbuiltinatomictypes_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
@@ -56,8 +56,6 @@
#include <private/qatomiccomparatorlocators_p.h>
#include <private/qbuiltinatomictype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -784,6 +782,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qbuiltinnodetype_p.h b/src/xmlpatterns/type/qbuiltinnodetype_p.h
index 9831e878..cf34ce87 100644
--- a/src/xmlpatterns/type/qbuiltinnodetype_p.h
+++ b/src/xmlpatterns/type/qbuiltinnodetype_p.h
@@ -56,8 +56,6 @@
#include <private/qanynodetype_p.h>
#include <private/qbuiltintypes_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -105,6 +103,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qbuiltintypes_p.h b/src/xmlpatterns/type/qbuiltintypes_p.h
index 62f25de4..ac8c422b 100644
--- a/src/xmlpatterns/type/qbuiltintypes_p.h
+++ b/src/xmlpatterns/type/qbuiltintypes_p.h
@@ -60,8 +60,6 @@
#include <private/qnumerictype_p.h>
#include <private/quntyped_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -168,7 +166,5 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qcardinality_p.h b/src/xmlpatterns/type/qcardinality_p.h
index 51449fd3..ecd65a6d 100644
--- a/src/xmlpatterns/type/qcardinality_p.h
+++ b/src/xmlpatterns/type/qcardinality_p.h
@@ -54,8 +54,6 @@
#include <QtCore/QtGlobal>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QString;
@@ -539,6 +537,4 @@ Q_DECLARE_TYPEINFO(QPatternist::Cardinality, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qcommonsequencetypes_p.h b/src/xmlpatterns/type/qcommonsequencetypes_p.h
index 7361f3d5..c085323c 100644
--- a/src/xmlpatterns/type/qcommonsequencetypes_p.h
+++ b/src/xmlpatterns/type/qcommonsequencetypes_p.h
@@ -55,8 +55,6 @@
#include <private/qemptysequencetype_p.h>
#include <private/qnonetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -408,7 +406,5 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qebvtype_p.h b/src/xmlpatterns/type/qebvtype_p.h
index d5f54cf4..df3cbf8b 100644
--- a/src/xmlpatterns/type/qebvtype_p.h
+++ b/src/xmlpatterns/type/qebvtype_p.h
@@ -55,8 +55,6 @@
#include <private/qatomictype_p.h>
#include <private/qsequencetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -130,6 +128,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qemptysequencetype_p.h b/src/xmlpatterns/type/qemptysequencetype_p.h
index 54065835..75523675 100644
--- a/src/xmlpatterns/type/qemptysequencetype_p.h
+++ b/src/xmlpatterns/type/qemptysequencetype_p.h
@@ -55,8 +55,6 @@
#include <private/qatomictype_p.h>
#include <private/qsequencetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -119,6 +117,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qgenericsequencetype_p.h b/src/xmlpatterns/type/qgenericsequencetype_p.h
index 155c63f2..1f5dcdb1 100644
--- a/src/xmlpatterns/type/qgenericsequencetype_p.h
+++ b/src/xmlpatterns/type/qgenericsequencetype_p.h
@@ -55,8 +55,6 @@
#include <private/qcommonsequencetypes_p.h>
#include <private/qsequencetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -110,6 +108,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qitemtype_p.h b/src/xmlpatterns/type/qitemtype_p.h
index d28d19dc..62580a9e 100644
--- a/src/xmlpatterns/type/qitemtype_p.h
+++ b/src/xmlpatterns/type/qitemtype_p.h
@@ -56,8 +56,6 @@
#include <QtXmlPatterns/private/qnamepool_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename T> class QList;
@@ -281,6 +279,4 @@ Q_DECLARE_TYPEINFO(QPatternist::ItemType::Ptr, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h
index dad89139..79abb184 100644
--- a/src/xmlpatterns/type/qlocalnametest_p.h
+++ b/src/xmlpatterns/type/qlocalnametest_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractnodetest_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename Key, typename Value> class QHash;
@@ -97,6 +95,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qmultiitemtype_p.h b/src/xmlpatterns/type/qmultiitemtype_p.h
index 06970640..4d1f5b9e 100644
--- a/src/xmlpatterns/type/qmultiitemtype_p.h
+++ b/src/xmlpatterns/type/qmultiitemtype_p.h
@@ -56,8 +56,6 @@
#include <private/qitemtype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -141,6 +139,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qnamedschemacomponent_p.h b/src/xmlpatterns/type/qnamedschemacomponent_p.h
index 3f20eaf0..88c19cb4 100644
--- a/src/xmlpatterns/type/qnamedschemacomponent_p.h
+++ b/src/xmlpatterns/type/qnamedschemacomponent_p.h
@@ -56,8 +56,6 @@
#include <private/qschemacomponent_p.h>
#include <QXmlName>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h
index af95f2d7..820fc455 100644
--- a/src/xmlpatterns/type/qnamespacenametest_p.h
+++ b/src/xmlpatterns/type/qnamespacenametest_p.h
@@ -54,8 +54,6 @@
#include <private/qabstractnodetest_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename Key, typename Value> class QHash;
@@ -96,6 +94,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qnonetype_p.h b/src/xmlpatterns/type/qnonetype_p.h
index 1352fb84..3a26ff60 100644
--- a/src/xmlpatterns/type/qnonetype_p.h
+++ b/src/xmlpatterns/type/qnonetype_p.h
@@ -55,8 +55,6 @@
#include <private/qatomictype_p.h>
#include <private/qsequencetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -150,6 +148,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qnumerictype_p.h b/src/xmlpatterns/type/qnumerictype_p.h
index c18fa244..80836d4e 100644
--- a/src/xmlpatterns/type/qnumerictype_p.h
+++ b/src/xmlpatterns/type/qnumerictype_p.h
@@ -54,8 +54,6 @@
#include <private/qatomictype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -169,6 +167,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h
index 475cd5df..13f3d435 100644
--- a/src/xmlpatterns/type/qprimitives_p.h
+++ b/src/xmlpatterns/type/qprimitives_p.h
@@ -67,8 +67,6 @@
*
* @author Frans Englich <frans.englich@nokia.com>
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QString;
@@ -198,6 +196,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qqnametest_p.h b/src/xmlpatterns/type/qqnametest_p.h
index 3f96b396..4e2c4d7f 100644
--- a/src/xmlpatterns/type/qqnametest_p.h
+++ b/src/xmlpatterns/type/qqnametest_p.h
@@ -56,8 +56,6 @@
template<typename Key, typename Value> class QHash;
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qschemacomponent_p.h b/src/xmlpatterns/type/qschemacomponent_p.h
index a99bc263..deefc8bf 100644
--- a/src/xmlpatterns/type/qschemacomponent_p.h
+++ b/src/xmlpatterns/type/qschemacomponent_p.h
@@ -55,8 +55,6 @@
#include <QSharedData>
#include <QtGlobal>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -80,6 +78,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h
index cf0bf8e5..0f3ea0bb 100644
--- a/src/xmlpatterns/type/qschematype_p.h
+++ b/src/xmlpatterns/type/qschematype_p.h
@@ -59,8 +59,6 @@
template<typename N, typename M> class QHash;
template<typename N> class QList;
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -243,6 +241,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qschematypefactory_p.h b/src/xmlpatterns/type/qschematypefactory_p.h
index bdf0d3f0..7119c7e9 100644
--- a/src/xmlpatterns/type/qschematypefactory_p.h
+++ b/src/xmlpatterns/type/qschematypefactory_p.h
@@ -58,8 +58,6 @@
#include <private/qitemtype_p.h>
#include <private/qschematype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -97,6 +95,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qsequencetype_p.h b/src/xmlpatterns/type/qsequencetype_p.h
index 8ae8d442..6bdcfb9d 100644
--- a/src/xmlpatterns/type/qsequencetype_p.h
+++ b/src/xmlpatterns/type/qsequencetype_p.h
@@ -59,8 +59,6 @@ template<typename T> class QList;
#include <private/qcardinality_p.h>
#include <private/qitemtype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -133,6 +131,4 @@ Q_DECLARE_TYPEINFO(QPatternist::SequenceType::Ptr, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qtypechecker_p.h b/src/xmlpatterns/type/qtypechecker_p.h
index 085370f7..87dcaa26 100644
--- a/src/xmlpatterns/type/qtypechecker_p.h
+++ b/src/xmlpatterns/type/qtypechecker_p.h
@@ -55,8 +55,6 @@
#include <private/qstaticcontext_p.h>
#include <private/qexpression_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -180,6 +178,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/quntyped_p.h b/src/xmlpatterns/type/quntyped_p.h
index aebdd95a..f3675422 100644
--- a/src/xmlpatterns/type/quntyped_p.h
+++ b/src/xmlpatterns/type/quntyped_p.h
@@ -54,8 +54,6 @@
#include <private/qanytype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -107,6 +105,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/type/qxsltnodetest_p.h b/src/xmlpatterns/type/qxsltnodetest_p.h
index 33ac3e30..60c929b1 100644
--- a/src/xmlpatterns/type/qxsltnodetest_p.h
+++ b/src/xmlpatterns/type/qxsltnodetest_p.h
@@ -54,8 +54,6 @@
#include <private/qanynodetype_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -95,6 +93,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qcommonnamespaces_p.h b/src/xmlpatterns/utils/qcommonnamespaces_p.h
index b53ad6ac..babccebb 100644
--- a/src/xmlpatterns/utils/qcommonnamespaces_p.h
+++ b/src/xmlpatterns/utils/qcommonnamespaces_p.h
@@ -54,8 +54,6 @@
#include <QLatin1String>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -147,6 +145,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qcppcastinghelper_p.h b/src/xmlpatterns/utils/qcppcastinghelper_p.h
index 74fae077..5a4e029b 100644
--- a/src/xmlpatterns/utils/qcppcastinghelper_p.h
+++ b/src/xmlpatterns/utils/qcppcastinghelper_p.h
@@ -54,8 +54,6 @@
#include <QtCore/QtGlobal>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -156,6 +154,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
index bb07a6b4..422b0c4b 100644
--- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
@@ -56,8 +56,6 @@
#include <private/qnamespaceresolver_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
index d65cbb11..b59fb606 100644
--- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
@@ -56,8 +56,6 @@
#include <private/qnamespaceresolver_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -108,6 +106,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qnamepool_p.h b/src/xmlpatterns/utils/qnamepool_p.h
index 6d1394f6..9a2e9679 100644
--- a/src/xmlpatterns/utils/qnamepool_p.h
+++ b/src/xmlpatterns/utils/qnamepool_p.h
@@ -62,8 +62,6 @@
#include <QtXmlPatterns/private/qprimitives_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -551,6 +549,4 @@ Q_DECLARE_TYPEINFO(QPatternist::NamePool::Ptr, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h
index 2753de23..3886d3c8 100644
--- a/src/xmlpatterns/utils/qnamespacebinding_p.h
+++ b/src/xmlpatterns/utils/qnamespacebinding_p.h
@@ -56,8 +56,6 @@ template<typename T> class QVector;
#include <QXmlName>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -138,6 +136,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qnamespaceresolver_p.h b/src/xmlpatterns/utils/qnamespaceresolver_p.h
index e7592ecb..e3ea7be3 100644
--- a/src/xmlpatterns/utils/qnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qnamespaceresolver_p.h
@@ -56,8 +56,6 @@
#include <QXmlName>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename A, typename B> class QHash;
@@ -114,6 +112,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
index b996032b..ae186813 100644
--- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
@@ -57,8 +57,6 @@
#include <private/qnamespaceresolver_p.h>
#include <private/qitem_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -86,6 +84,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h
index d0d36ace..849751f0 100644
--- a/src/xmlpatterns/utils/qoutputvalidator_p.h
+++ b/src/xmlpatterns/utils/qoutputvalidator_p.h
@@ -58,8 +58,6 @@
#include "qabstractxmlreceiver.h"
#include <private/qsourcelocationreflection_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/src/xmlpatterns/utils/qxpathhelper_p.h b/src/xmlpatterns/utils/qxpathhelper_p.h
index d3597355..b65ef0d1 100644
--- a/src/xmlpatterns/utils/qxpathhelper_p.h
+++ b/src/xmlpatterns/utils/qxpathhelper_p.h
@@ -57,8 +57,6 @@
#include <private/qpatternistlocale_p.h>
#include <private/qreportcontext_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternist
@@ -174,6 +172,4 @@ namespace QPatternist
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
diff --git a/tests/auto/xmlpatternssdk/ASTItem.h b/tests/auto/xmlpatternssdk/ASTItem.h
index 66c857a0..855e9ec9 100644
--- a/tests/auto/xmlpatternssdk/ASTItem.h
+++ b/tests/auto/xmlpatternssdk/ASTItem.h
@@ -48,8 +48,6 @@
#include "TreeItem.h"
#include "Global.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -109,7 +107,5 @@ ValueComparison(eq)
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
index 32a05621..8033a487 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
@@ -46,8 +46,6 @@
#include <private/qexpressionfactory_p.h>
#include <private/qfunctionfactory_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -122,7 +120,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.h b/tests/auto/xmlpatternssdk/ErrorHandler.h
index 070bf08f..424deb3b 100644
--- a/tests/auto/xmlpatternssdk/ErrorHandler.h
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.h
@@ -46,8 +46,6 @@
#include "qabstractmessagehandler.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename T> class QList;
@@ -143,7 +141,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ErrorItem.h b/tests/auto/xmlpatternssdk/ErrorItem.h
index 52832332..aece6eab 100644
--- a/tests/auto/xmlpatternssdk/ErrorItem.h
+++ b/tests/auto/xmlpatternssdk/ErrorItem.h
@@ -48,8 +48,6 @@
#include "Global.h"
#include "TreeItem.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -88,7 +86,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ExitCode.h b/tests/auto/xmlpatternssdk/ExitCode.h
index 583980bc..a86327c8 100644
--- a/tests/auto/xmlpatternssdk/ExitCode.h
+++ b/tests/auto/xmlpatternssdk/ExitCode.h
@@ -44,8 +44,6 @@
#include "Global.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -99,7 +97,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index 20157f04..5934eccb 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.h
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h
@@ -48,8 +48,6 @@
#include <QPair>
#include <QString>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -74,7 +72,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.h b/tests/auto/xmlpatternssdk/ExpressionNamer.h
index 9c1f5e5d..5f04e54d 100644
--- a/tests/auto/xmlpatternssdk/ExpressionNamer.h
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.h
@@ -45,8 +45,6 @@
#include "Global.h"
#include <private/qexpressiondispatch_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -275,7 +273,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
index 8247c904..cfbf620c 100644
--- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
@@ -50,8 +50,6 @@
#include <private/qresourceloader_p.h>
#include <private/qexternalvariableloader_p.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -131,7 +129,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/Global.h b/tests/auto/xmlpatternssdk/Global.h
index 4979ae61..9f36ad66 100644
--- a/tests/auto/xmlpatternssdk/Global.h
+++ b/tests/auto/xmlpatternssdk/Global.h
@@ -63,8 +63,6 @@
* @see <a href="http://www.w3.org/XML/Query/test-suite/">XML Query Test Suite</a>
* @author Frans Englich <frans.englich@nokia.com>
*/
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -122,7 +120,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ResultThreader.h b/tests/auto/xmlpatternssdk/ResultThreader.h
index ebe6c2fe..c756dc80 100644
--- a/tests/auto/xmlpatternssdk/ResultThreader.h
+++ b/tests/auto/xmlpatternssdk/ResultThreader.h
@@ -48,8 +48,6 @@
#include "TestResultHandler.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QEventLoop;
@@ -104,7 +102,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.h b/tests/auto/xmlpatternssdk/TestBaseLine.h
index 5f102026..df6d4774 100644
--- a/tests/auto/xmlpatternssdk/TestBaseLine.h
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.h
@@ -47,8 +47,6 @@
#include "Global.h"
#include "TestResult.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDomNamedNodeMap;
@@ -206,7 +204,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestCase.h b/tests/auto/xmlpatternssdk/TestCase.h
index 89a23de9..51c7895c 100644
--- a/tests/auto/xmlpatternssdk/TestCase.h
+++ b/tests/auto/xmlpatternssdk/TestCase.h
@@ -52,8 +52,6 @@
#include "TestItem.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QDate;
@@ -250,7 +248,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestContainer.h b/tests/auto/xmlpatternssdk/TestContainer.h
index f51a766c..18b80abc 100644
--- a/tests/auto/xmlpatternssdk/TestContainer.h
+++ b/tests/auto/xmlpatternssdk/TestContainer.h
@@ -45,8 +45,6 @@
#include "Global.h"
#include "TestItem.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -117,7 +115,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestGroup.h b/tests/auto/xmlpatternssdk/TestGroup.h
index 3c7a0a5d..3a0deb45 100644
--- a/tests/auto/xmlpatternssdk/TestGroup.h
+++ b/tests/auto/xmlpatternssdk/TestGroup.h
@@ -46,8 +46,6 @@
#include "TestContainer.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -87,7 +85,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestItem.h b/tests/auto/xmlpatternssdk/TestItem.h
index fd857772..dcd57bdf 100644
--- a/tests/auto/xmlpatternssdk/TestItem.h
+++ b/tests/auto/xmlpatternssdk/TestItem.h
@@ -45,8 +45,6 @@
#include "TestResult.h"
#include "TreeItem.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
template<typename A, typename B> struct QPair;
@@ -127,7 +125,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestResult.h b/tests/auto/xmlpatternssdk/TestResult.h
index b36f41f7..c1f8f3cb 100644
--- a/tests/auto/xmlpatternssdk/TestResult.h
+++ b/tests/auto/xmlpatternssdk/TestResult.h
@@ -53,8 +53,6 @@
#include "ASTItem.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -173,7 +171,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestResultHandler.h b/tests/auto/xmlpatternssdk/TestResultHandler.h
index 1d5cfcf9..7c83d61d 100644
--- a/tests/auto/xmlpatternssdk/TestResultHandler.h
+++ b/tests/auto/xmlpatternssdk/TestResultHandler.h
@@ -48,8 +48,6 @@
#include "TestResult.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -109,7 +107,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestSuite.h b/tests/auto/xmlpatternssdk/TestSuite.h
index efd628a4..0ab0fdfe 100644
--- a/tests/auto/xmlpatternssdk/TestSuite.h
+++ b/tests/auto/xmlpatternssdk/TestSuite.h
@@ -47,8 +47,6 @@
#include "TestContainer.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QIODevice;
@@ -154,7 +152,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.h b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
index 710f59d7..0efc6721 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
@@ -50,8 +50,6 @@
#include "TestSuite.h"
#include "XQTSTestCase.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -163,7 +161,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestSuiteResult.h b/tests/auto/xmlpatternssdk/TestSuiteResult.h
index 50fc4ac5..08a3e7bd 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteResult.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteResult.h
@@ -47,8 +47,6 @@
#include "TestResult.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -87,7 +85,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TreeItem.h b/tests/auto/xmlpatternssdk/TreeItem.h
index 6f5e1b40..e00b0546 100644
--- a/tests/auto/xmlpatternssdk/TreeItem.h
+++ b/tests/auto/xmlpatternssdk/TreeItem.h
@@ -46,8 +46,6 @@
#include "Global.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QVariant;
@@ -108,7 +106,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TreeModel.h b/tests/auto/xmlpatternssdk/TreeModel.h
index b8eda040..b393be23 100644
--- a/tests/auto/xmlpatternssdk/TreeModel.h
+++ b/tests/auto/xmlpatternssdk/TreeModel.h
@@ -49,8 +49,6 @@
#include "Global.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -104,7 +102,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/Worker.h b/tests/auto/xmlpatternssdk/Worker.h
index 45329b4b..60879eff 100644
--- a/tests/auto/xmlpatternssdk/Worker.h
+++ b/tests/auto/xmlpatternssdk/Worker.h
@@ -49,8 +49,6 @@
#include "ResultThreader.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QEventLoop;
@@ -94,7 +92,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XMLWriter.h b/tests/auto/xmlpatternssdk/XMLWriter.h
index c05709dc..2d9c05fb 100644
--- a/tests/auto/xmlpatternssdk/XMLWriter.h
+++ b/tests/auto/xmlpatternssdk/XMLWriter.h
@@ -47,8 +47,6 @@
#include <QtXml/QXmlContentHandler>
#include <QtXml/QXmlLexicalHandler>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QIODevice;
@@ -397,7 +395,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XQTSTestCase.h b/tests/auto/xmlpatternssdk/XQTSTestCase.h
index c0cc8c34..bdfdfc62 100644
--- a/tests/auto/xmlpatternssdk/XQTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XQTSTestCase.h
@@ -51,8 +51,6 @@
#include "TestBaseLine.h"
#include "TestCase.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -143,7 +141,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XSDTSTestCase.h b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
index 1902d937..5e16c2ef 100644
--- a/tests/auto/xmlpatternssdk/XSDTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
@@ -49,7 +49,6 @@
#include "TestBaseLine.h"
#include "TestCase.h"
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -155,7 +154,6 @@ namespace QPatternistSDK
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
index 02adf1e5..c456cc63 100644
--- a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
@@ -49,7 +49,6 @@
#include "TestSuite.h"
#include "XQTSTestCase.h"
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -115,7 +114,6 @@ namespace QPatternistSDK
}
QT_END_NAMESPACE
-QT_END_HEADER
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
index 7f7b4220..ee003f44 100644
--- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
@@ -50,8 +50,6 @@
#include "TestSuite.h"
#include "XQTSTestCase.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -152,7 +150,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
index bf0ef704..c5b0fb36 100644
--- a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
+++ b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
@@ -44,8 +44,6 @@
#include <QObject>
-QT_BEGIN_HEADER
-
namespace QPatternistSDK
{
/**
@@ -71,7 +69,5 @@ namespace QPatternistSDK
};
}
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
index 55c58a4b..cd6e3973 100644
--- a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
+++ b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
@@ -46,8 +46,6 @@
#include "ui_ui_FunctionSignaturesView.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -69,7 +67,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/MainWindow.h b/tests/auto/xmlpatternsview/view/MainWindow.h
index 45bd0e05..74317029 100644
--- a/tests/auto/xmlpatternsview/view/MainWindow.h
+++ b/tests/auto/xmlpatternsview/view/MainWindow.h
@@ -49,8 +49,6 @@
#include "DebugExpressionFactory.h"
#include "TestSuite.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -172,7 +170,5 @@ namespace QPatternistSDK
}
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/TestCaseView.h b/tests/auto/xmlpatternsview/view/TestCaseView.h
index 155ae8d1..c9243ab6 100644
--- a/tests/auto/xmlpatternsview/view/TestCaseView.h
+++ b/tests/auto/xmlpatternsview/view/TestCaseView.h
@@ -46,8 +46,6 @@
#include "ui_ui_TestCaseView.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -85,7 +83,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/TestResultView.h b/tests/auto/xmlpatternsview/view/TestResultView.h
index f5cae159..ed8ef704 100644
--- a/tests/auto/xmlpatternsview/view/TestResultView.h
+++ b/tests/auto/xmlpatternsview/view/TestResultView.h
@@ -46,8 +46,6 @@
#include "ui_ui_TestResultView.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -80,7 +78,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/TreeSortFilter.h b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
index 33a87a49..77bd669b 100644
--- a/tests/auto/xmlpatternsview/view/TreeSortFilter.h
+++ b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
@@ -44,8 +44,6 @@
#include <QSortFilterProxyModel>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -92,7 +90,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/UserTestCase.h b/tests/auto/xmlpatternsview/view/UserTestCase.h
index 0d2ca863..dc6eaced 100644
--- a/tests/auto/xmlpatternsview/view/UserTestCase.h
+++ b/tests/auto/xmlpatternsview/view/UserTestCase.h
@@ -46,8 +46,6 @@
#include "TestCase.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -120,7 +118,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/XDTItemItem.h b/tests/auto/xmlpatternsview/view/XDTItemItem.h
index 63e719a5..4a4c93d3 100644
--- a/tests/auto/xmlpatternsview/view/XDTItemItem.h
+++ b/tests/auto/xmlpatternsview/view/XDTItemItem.h
@@ -47,8 +47,6 @@
#include "TreeItem.h"
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QPatternistSDK
@@ -86,7 +84,5 @@ namespace QPatternistSDK
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif
// vim: et:ts=4:sw=4:sts=4
diff --git a/tools/xmlpatterns/qapplicationargument_p.h b/tools/xmlpatterns/qapplicationargument_p.h
index 0fa03438..ec763078 100644
--- a/tools/xmlpatterns/qapplicationargument_p.h
+++ b/tools/xmlpatterns/qapplicationargument_p.h
@@ -54,7 +54,6 @@
#include <QtCore/QVariant>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QString;
@@ -96,6 +95,6 @@ private:
uint qHash(const QApplicationArgument &argument);
QT_END_NAMESPACE
-QT_END_HEADER
+
#endif
diff --git a/tools/xmlpatterns/qapplicationargumentparser_p.h b/tools/xmlpatterns/qapplicationargumentparser_p.h
index 0d9bf086..c7cf2f0e 100644
--- a/tools/xmlpatterns/qapplicationargumentparser_p.h
+++ b/tools/xmlpatterns/qapplicationargumentparser_p.h
@@ -54,7 +54,6 @@
#include <QtCore/QVariant> /* Needed, because we can't forward declare QVariantList. */
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QApplicationArgument;
@@ -108,5 +107,5 @@ private:
};
QT_END_NAMESPACE
-QT_END_HEADER
+
#endif
diff --git a/tools/xmlpatternsvalidator/main.h b/tools/xmlpatternsvalidator/main.h
index 99a9871a..a9ea4c47 100644
--- a/tools/xmlpatternsvalidator/main.h
+++ b/tools/xmlpatternsvalidator/main.h
@@ -54,8 +54,6 @@
#include <QtCore/QCoreApplication>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QXmlPatternistCLI
@@ -69,6 +67,5 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
#endif
--
GitLab