diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:54:41 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:55:15 +0100 |
| commit | 9c97fb67430b16392343ccbf6d2ef3b45d7614b2 (patch) | |
| tree | 6a7c1b48a63e0288f35246bd594a7b7ff4621ee0 | |
| parent | 4dde2b75a3ff9896b1ffb503a4929c65b273c048 (diff) | |
| parent | d8608214913963aa209978d9fbbc5d3c041dcff2 (diff) | |
| download | qtxmlpatterns-9c97fb67430b16392343ccbf6d2ef3b45d7614b2.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I521b815a7f8c7ae439186c842f01efcdee744b0d
399 files changed, 5 insertions, 1528 deletions
diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h index f29179c..d0fca18 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 e65d0aa..eabdaa6 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 1544f72..69e618e 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 b7dc455..7a5666c 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 3e1abfc..a375730 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 9e81db2..cf62754 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 a19d7f0..f12e631 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 5e3eff1..b99e82a 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 b33f313..0bdf9c4 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 963682d..50e1349 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 5db4435..23f4085 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 1090d33..1f9a500 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 07d7c27..52fab1f 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 960aee4..1db8c13 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 7ead9a9..f6de5a4 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 @@ -70,6 +68,7 @@ namespace QPatternist ForegroundShift = 10, BackgroundShift = 20, SpecialShift = 20, +// ### FIXME: this looks very suspicious. Make ForegroundShift = 0x10 etc? ForegroundMask = 0x1f << ForegroundShift, BackgroundMask = 0x7 << BackgroundShift }; @@ -128,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 ea86ead..3754589 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 66d5e9d..6badb0d 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 5fe77f7..6b4ca3d 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 843a476..f9d10f3 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 f2c2945..8c7c38e 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 8b6d671..ba20c36 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 b5d3625..9bfbc87 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 0795d0b..b69ace8 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 0bc655f..14eab84 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 0629b79..8fa0a90 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 9c52b87..1dbb568 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 b3156f9..a709e10 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 eac73f7..87f1d43 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 5aa7782..ae8add5 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 fc0a3da..80cc5e7 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 6cd3033..87543af 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 b027e11..dedabfb 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 61ea022..395ed1f 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 a8b8e1b..a360857 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 2485841..c2153a5 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 d09b99f..6e93f26 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 218f5b2..5cfbd0d 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 f739f7d..f16d5fd 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 d6ad7eb..abb2855 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 b366701..6621755 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 c1c09ea..81b792b 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 2f58624..983f2b0 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 63cc44a..8252fca 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 c7b3780..c3e3d23 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 85e75cd..1468a2d 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 a3945bf..f51ab11 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 39d3ece..d18e320 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 c0230a3..dadf029 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 4c9d362..4583603 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 0a0edb4..41af85e 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 2fc1cb7..f328aea 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 9f6b7a9..c0f2315 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 4e8cec3..9934a09 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 df143e7..12e1ad9 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 a528e58..0604b2a 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 94e0aef..a535e54 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 e286d69..00ea4e9 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 f642af8..621f061 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 5f2dc5f..c769248 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 52132b0..4acc4ca 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 04ab691..b5ef893 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 3a15449..e215368 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 4387442..c726944 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 49da456..c5b2490 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 c3636cf..c779ee7 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 ea8a512..f5442d6 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 28b8fb0..750a517 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 597c6ec..0cdeec6 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 a6de83d..b7d275f 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 c6eb7b1..7aa190a 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 9706d41..f9c3c3b 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 67e9bf2..4f4ae49 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 a93dd79..0e35e3b 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 7d302f6..e282772 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 ddb5061..888e46b 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 1334564..000456b 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 f5baf35..20fff90 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 8336236..7de70e8 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 148c0ee..ca0aa54 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 03022bc..6a34912 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 fd7a776..d2bfd0b 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 40098fb..6a3bd5f 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 142a9d4..cbc040c 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 cb265ba..0fa0d8b 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 4b2feca..ae3fe7b 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 ce51cba..65684c2 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 675114c..fd0ce5c 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 fd918cd..be7cc04 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 fe6d028..b7b0420 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 127ead8..1c56d17 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 3339854..2fa9f42 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 a2693df..824c528 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 b634737..1e1da09 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 eb13a30..c4cc386 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 c1223fa..6d486d1 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 5ebe24d..3be5437 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 a1510f0..cf51ef1 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 2af6b2c..bfb9854 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 cb956e6..a6d4e70 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 e4b2a29..4ff3231 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 a4b2ce0..8b2f357 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 54de982..c3b3052 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 83ee2e2..ec0137a 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 91b2fd5..6e98464 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 7a55e27..2f6402e 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 e109b3f..9e6fb90 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 f2d08fd..0f2e6dd 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 2ad36c9..ae31612 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 9df5471..1afce90 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 ad8b7eb..d076d6c 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 ada5d3c..6dff7df 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 f9806ca..d79b069 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 b9ba305..94c28c8 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 3c89b94..eb5ef68 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 a089d2e..62d6f3c 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 2d14f67..2547532 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 e10e77a..851d12d 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 32a0e0f..a7ec1bf 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 016d457..771ab47 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 424bab9..92b3fdd 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 4ee071c..05ed196 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 1d61905..a1cddc1 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 7be9a87..67f6926 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 91fc78c..e38f7ba 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 b974b8b..26db1a5 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 aefc2f2..7a37a36 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 f9a14c9..a45e303 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 bd6c443..7ded7bc 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 2ae619d..5b58ad5 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 c94c4f2..95bc307 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 f068231..e441e49 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 43d5fed..22eccfc 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 5648b6b..beca024 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 3ea9c27..ae1b21d 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 2f3a68e..f92b6f8 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 9fef957..8ed8ff8 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 8dd9ab2..88459e4 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 9a1bf5a..3f038f9 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 9c646c7..1d247a1 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 f132509..334021d 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 d2e8023..5ad0040 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 e7c01ad..eb315fa 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 4c3f98e..8a907d5 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 d66bf2d..d8a3ba0 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 18720a0..3f02054 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 14bd84a..76e065d 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 be1c0de..cab084a 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 5f450fd..3e8676d 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 0e975d6..0f3a97d 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 50a43cf..772f5ec 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 ec2a325..50002c3 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 147b365..b8e3dcc 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 f94a70d..b264cdf 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 55a8f13..7bcd3b7 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 e9cb0b7..ab00350 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 833ee83..86cb268 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 31e3207..9f1593d 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 315b3f5..874d59a 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 0f5f63d..21c36aa 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 ea3eae3..f3d85a2 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 b4dd6f5..01b634e 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 ffd80f7..0ef52ea 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 a69cfdf..13956e8 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 e4756b1..94e19c1 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 6693455..80696d8 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 b47461c..0d76daf 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 eaa278d..738df7e 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 41d8ba5..46a572d 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 08de59e..4d483a9 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 a7e3940..37452a7 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 15cd857..db877f7 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 e1e2ae3..257ccd2 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 2884794..240e63e 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 d04eab4..811215b 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 c756d11..90ac17a 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 4fa86f5..428b0c3 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 92163bb..f67c03e 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 f5ba93b..612d7b6 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 efc7b61..df9dfdd 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 aed2229..70aa213 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 65b054e..4758b64 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 f380f64..cd7757f 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 72f5eaa..3d37e79 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 c09532a..d9c7847 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 709042e..130e6af 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 8a797ad..075a3d5 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 093a71d..f7d4aa8 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 e277476..1d4b5fb 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 434d2cb..a94d80b 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 5ce4daa..353c647 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 a65133a..f7e3af8 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 353ef2b..0fd9769 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 d982a68..6742c84 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 d115d2b..ce2496e 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 5d92e67..7ff379d 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 40578ea..9b58826 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 4bfe048..03780ee 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 21b83e4..c7c0788 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 4693f94..76dd467 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 37ec35d..6e5ff71 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 22ccb1f..8c88dc5 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 08770b0..4ce2d36 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 5516c4a..ff18343 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 675cd1c..d9db1ce 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 72d8eb4..e826736 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 7cf3b35..90e713f 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 6b31757..6c81d14 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 47f616c..138d2cb 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 b15cdc6..d25bb81 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 a2018dd..17a83b0 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 6050fb6..b24453a 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 884a33b..f6f3d0d 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 b051e71..204d807 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 a5d3912..e666326 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 fac7765..89958aa 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 d971443..5e73327 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 3c29d4f..69e19d0 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 6808417..5e5f832 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 cc25841..22ce9b3 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 0b6c4f2..6ffff92 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 24b42ad..e774c01 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 55617a3..3eadd9c 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 92d93f6..1f1fb4c 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 4d83df3..7baa900 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 50cf5b8..ba22830 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 a115201..c611df4 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 5d0c59a..7ccbf02 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 12ba75d..6d98307 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 5b397c1..9fd5e63 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 d76b71b..4a568d5 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 f5a08ea..3e5d0ae 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 6cc01cf..45fbcd4 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 09f6e2d..7a3488b 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 f8fcf7a..df787b4 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 3ff5219..1762657 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 f5af63b..2901f97 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 b96be4d..7c08c38 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 af323fc..0538ba8 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 8636cf5..d7f689b 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 ef7977f..104b4fe 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 1b5f8dd..218cb7f 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 8bd3c12..2198e14 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 43e539d..9eb8f2d 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 7ee5acd..9dc3b45 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 a47bee2..27cdbfc 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 08bea11..f84b3d8 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 198ff59..eb5c782 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 f9947b5..8da45c8 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 4928379..9c4eebb 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 f054c16..f3ceb00 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 770714c..af8515f 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 f8d53a6..ded57f5 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 dc23a90..af70180 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 5ce9b75..1ffc97f 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 0f7084b..4ba62cd 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 ef4498a..a331372 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 86c1638..0b8288d 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 fae6449..3cff41a 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 44e109e..4f02674 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 41b5f48..a615ead 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 f478a28..9198e20 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 6d51ab2..9d128ce 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 ced3117..62386d3 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 9779805..280cb63 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 2d382f8..e5454fc 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 1ac4e27..2d36df8 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 3ee0440..e0144a5 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 8f2daa6..7cc18db 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 be70545..11b4cc0 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 fbb1a76..d9a32ca 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 620e69e..95e4537 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 d00eb43..e57c0d5 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 1ed0786..d7a4bd6 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 4e239c1..488f863 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 86ecadf..cb86934 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 2535262..3acbfb9 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 04dac08..ed2822c 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 88e30d1..4cfecd4 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 b26ce01..f6eae5e 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 261d58d..9269020 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 91e9d5f..37789d1 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 178eecc..fbe6940 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 897c092..c74190b 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 b2a4084..0d4cc30 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 3cd3638..c6fe195 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 5389b18..b5b1a59 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 d28eaae..421853d 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 7b257e6..e58cc12 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 96249ca..e45afee 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 e50b79c..9ced42a 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 df2debc..bd62a80 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 4f4d2e2..258f7db 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 c3b5e46..2f8f2b1 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 bf39cc3..f42632e 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 5aee907..aeb4c48 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 c702a24..4368dc1 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 802ee6c..5836a36 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 766df48..3934ba2 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 49dc427..a92862b 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 4d879bd..ed1ece7 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 2be7ae6..2b5faa3 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 7c48236..a9407a9 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/qxsdstatemachine_tpl_p.h b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h index f4bf66c..ad042c6 100644 --- a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h +++ b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h @@ -187,6 +187,7 @@ bool XsdStateMachine<TransitionType>::inputEqualsTransition(InputType input, Tra { Q_UNUSED(input); Q_UNUSED(transition); + return false; } diff --git a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h index 1aba446..7d7ee4d 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 4f987b3..ebd9202 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 459a28c..63502a4 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 247cb8a..7f34579 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 482a9cb..cdcf06d 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 a0fba3b..03c1843 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 84cca23..85a07dc 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 12e12db..dd8162d 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 3b2b9f8..f97fa53 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 8e60102..782b972 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 bfa3956..75678a9 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 5a81aee..c7c0b76 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 1654c7f..404c7eb 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 9dbeeb1..0b67182 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 658f235..49d1423 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 b845c8f..915b4c2 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 334b984..817c3fb 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 2bacb47..e5e8313 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 47014f2..f78ef18 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 158a7ce..56bcfe9 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 dbc5a5a..41c4594 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 4997e94..280ed54 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 b8e25f1..e9603cd 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 4965cbd..9a8d283 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 2263e4b..f90183d 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 b11010a..3b9e5c9 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 b1e1b98..b985ef8 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 15c933c..18a72d4 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 ee2ce8e..9e952f1 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 330d3ea..b6ceef2 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 64ceae7..3b4236e 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 071fa84..b1adc9d 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 67495ae..46654b1 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 9b7ff75..9e53ef4 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 b012440..ac231e8 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 c2827fc..1398fdc 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 58b85c9..e45f57a 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 c894d77..ce047aa 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 c196a04..0877d2d 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 be3ee3a..65a29d2 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 1b4e108..e92d2ed 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 95c80e3..0b5610e 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 b2d9293..0766702 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 c65a83b..b18ebca 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 b35badd..4522274 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 a69bc8a..09016fa 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 ee83511..bd458ef 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 3f7e58b..a2caa0b 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 5605322..ea2c066 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 ff64c40..e43b1a9 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 9462369..56e8d60 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 004790e..0f378f8 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 52861ca..67549bc 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 a385f3d..ca2f33a 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 b9d7a53..8fa5278 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 4e1fc65..f18e2e0 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 2aaab5c..9026846 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 1764111..6c437dc 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 c861f60..ca79dcc 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 014b459..b4d6864 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 537c72f..ee6b933 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 6931b9d..16db3a3 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 656b7ae..9bd012c 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 8b711fa..5c236db 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 f29b714..6e94f2b 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 62283db..a8a085c 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 25e154e..2158961 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 fa3bcc0..772d942 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 83f6f80..cc65c06 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 2051c82..d667722 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 5491405..f29f439 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 2b4346d..7b9eb56 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 e7851e2..1b73080 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 f298024..4ca7e52 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 15577d1..8bc3077 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 37f2d04..17f893e 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 0e93d50..3ff73f3 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 c185eb8..2940df6 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 362115c..454dd32 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 91734d3..5b6c4cc 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 952fc87..4b257b3 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 330d110..df61843 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 5633a1b..9f7d4fd 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 d7ca2c1..b5bedda 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 ffacfa4..fcebf6d 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 056d3b8..6d7c6c0 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 b5dc580..035e7b6 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 195a9c5..9810c14 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 d6b9451..6c99e45 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 4f85b46..4d112ae 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 13cf76d..64998d6 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 4e646a4..831863a 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 9997f15..fc89996 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 22b0a53..640f3df 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 b3d9b92..274f80b 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 78e2cfd..1bbeb34 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 |