diff options
Diffstat (limited to 'src/xmlpatterns/api')
32 files changed, 1 insertions, 111 deletions
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 |