diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-03 10:57:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-11 06:51:03 +0100 |
| commit | ede75fb49c9ed59304976b8ba1523874771f7c87 (patch) | |
| tree | 174c73cd464a81aa3d41cf664f537255852db3d7 | |
| parent | b483ca39bde8af3f325d65c767c9445a6c152c5c (diff) | |
| download | qtxmlpatterns-ede75fb49c9ed59304976b8ba1523874771f7c87.tar.gz | |
Make private headers usable, and use them in the tests.
The xmlpatterns private headers were not including each other correctly,
making them unusable unless the source directory was available and in
INCLUDEPATH.
Fix it so that the private headers include each other by <private/...>,
allowing them to work for an installed Qt.
Change-Id: I9c7cbad219ed141c356d9ea097e67e0fb2fa550c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
346 files changed, 936 insertions, 952 deletions
diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h index c35223e..2674712 100644 --- a/src/xmlpatterns/acceltree/qacceliterators_p.h +++ b/src/xmlpatterns/acceltree/qacceliterators_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_AccelIterators_H #define Patternist_AccelIterators_H -#include "qacceltree_p.h" -#include "qitem_p.h" +#include <private/qacceltree_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h index f2c4d36..023d27e 100644 --- a/src/xmlpatterns/acceltree/qacceltree_p.h +++ b/src/xmlpatterns/acceltree/qacceltree_p.h @@ -57,8 +57,8 @@ #include <QVector> #include <QXmlName> -#include "qitem_p.h" -#include "qnamepool_p.h" +#include <private/qitem_p.h> +#include <private/qnamepool_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h index 58c6781..977998d 100644 --- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h +++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h @@ -55,15 +55,15 @@ #include <QSet> #include <QStack> -#include "private/qxmlutils_p.h" -#include "qacceltree_p.h" -#include "qbuiltintypes_p.h" -#include "qcompressedwhitespace_p.h" -#include "qnamepool_p.h" -#include "qnodebuilder_p.h" -#include "qreportcontext_p.h" -#include "qsourcelocationreflection_p.h" -#include "qpatternistlocale_p.h" +#include <private/qxmlutils_p.h> +#include <private/qacceltree_p.h> +#include <private/qbuiltintypes_p.h> +#include <private/qcompressedwhitespace_p.h> +#include <private/qnamepool_p.h> +#include <private/qnodebuilder_p.h> +#include <private/qreportcontext_p.h> +#include <private/qsourcelocationreflection_p.h> +#include <private/qpatternistlocale_p.h> #include <QtDebug> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h index 6d04dea..f5bce24 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h @@ -55,13 +55,13 @@ #include <QtCore/QEventLoop> #include <QtNetwork/QNetworkReply> -#include "qabstractxmlreceiver.h" -#include "qacceltree_p.h" -#include "qacceltreebuilder_p.h" -#include "qdeviceresourceloader_p.h" -#include "qnamepool_p.h" -#include "qnetworkaccessdelegator_p.h" -#include "qreportcontext_p.h" +#include <QAbstractXmlReceiver> +#include <private/qacceltree_p.h> +#include <private/qacceltreebuilder_p.h> +#include <private/qdeviceresourceloader_p.h> +#include <private/qnamepool_p.h> +#include <private/qnetworkaccessdelegator_p.h> +#include <private/qreportcontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/api/qcoloringmessagehandler_p.h b/src/xmlpatterns/api/qcoloringmessagehandler_p.h index de97fbb..58d89c6 100644 --- a/src/xmlpatterns/api/qcoloringmessagehandler_p.h +++ b/src/xmlpatterns/api/qcoloringmessagehandler_p.h @@ -54,8 +54,8 @@ #include <QHash> -#include "qcoloroutput_p.h" -#include "qabstractmessagehandler.h" +#include <private/qcoloroutput_p.h> +#include <QAbstractMessageHandler> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/api/qdeviceresourceloader_p.h b/src/xmlpatterns/api/qdeviceresourceloader_p.h index a875c22..2347e71 100644 --- a/src/xmlpatterns/api/qdeviceresourceloader_p.h +++ b/src/xmlpatterns/api/qdeviceresourceloader_p.h @@ -55,7 +55,7 @@ template<typename T> class QSet; class QUrl; -#include "qresourceloader_p.h" +#include <private/qresourceloader_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qpullbridge_p.h b/src/xmlpatterns/api/qpullbridge_p.h index a4d6785..953d5f1 100644 --- a/src/xmlpatterns/api/qpullbridge_p.h +++ b/src/xmlpatterns/api/qpullbridge_p.h @@ -55,9 +55,9 @@ #include <QtCore/QPair> #include <QtCore/QStack> -#include "qabstractxmlforwarditerator_p.h" -#include "qabstractxmlpullprovider_p.h" -#include "qitem_p.h" +#include <private/qabstractxmlforwarditerator_p.h> +#include <private/qabstractxmlpullprovider_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/api/qresourcedelegator_p.h b/src/xmlpatterns/api/qresourcedelegator_p.h index 08d07c4..f7443c6 100644 --- a/src/xmlpatterns/api/qresourcedelegator_p.h +++ b/src/xmlpatterns/api/qresourcedelegator_p.h @@ -55,7 +55,7 @@ #include <QSet> #include <QUrl> -#include "qdeviceresourceloader_p.h" +#include <private/qdeviceresourceloader_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/quriloader_p.h b/src/xmlpatterns/api/quriloader_p.h index b80966e..6643bcd 100644 --- a/src/xmlpatterns/api/quriloader_p.h +++ b/src/xmlpatterns/api/quriloader_p.h @@ -55,8 +55,8 @@ #include <QtNetwork/QNetworkAccessManager> #include <QtXmlPatterns/QXmlName> -#include "qnamepool_p.h" -#include "qvariableloader_p.h" +#include <private/qnamepool_p.h> +#include <private/qvariableloader_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qvariableloader_p.h b/src/xmlpatterns/api/qvariableloader_p.h index 2e581fa..ceba9b2 100644 --- a/src/xmlpatterns/api/qvariableloader_p.h +++ b/src/xmlpatterns/api/qvariableloader_p.h @@ -56,8 +56,8 @@ #include <QtXmlPatterns/QXmlQuery> #include <QtDebug> -#include "qdynamiccontext_p.h" -#include "qexternalvariableloader_p.h" +#include <private/qdynamiccontext_p.h> +#include <private/qexternalvariableloader_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/api/qxmlquery_p.h b/src/xmlpatterns/api/qxmlquery_p.h index e980501..127751f 100644 --- a/src/xmlpatterns/api/qxmlquery_p.h +++ b/src/xmlpatterns/api/qxmlquery_p.h @@ -62,22 +62,22 @@ #include <QXmlNamePool> #include <QXmlQuery> -#include "qacceltreebuilder_p.h" -#include "qacceltreeresourceloader_p.h" -#include "qcoloringmessagehandler_p.h" -#include "qcommonsequencetypes_p.h" -#include "qexpressionfactory_p.h" -#include "qfocus_p.h" -#include "qfunctionfactorycollection_p.h" -#include "qgenericdynamiccontext_p.h" -#include "qgenericstaticcontext_p.h" -#include "qnamepool_p.h" -#include "qnetworkaccessdelegator_p.h" -#include "qreferencecountedvalue_p.h" -#include "qresourcedelegator_p.h" -#include "qstaticfocuscontext_p.h" -#include "quriloader_p.h" -#include "qvariableloader_p.h" +#include <private/qacceltreebuilder_p.h> +#include <private/qacceltreeresourceloader_p.h> +#include <private/qcoloringmessagehandler_p.h> +#include <private/qcommonsequencetypes_p.h> +#include <private/qexpressionfactory_p.h> +#include <private/qfocus_p.h> +#include <private/qfunctionfactorycollection_p.h> +#include <private/qgenericdynamiccontext_p.h> +#include <private/qgenericstaticcontext_p.h> +#include <private/qnamepool_p.h> +#include <private/qnetworkaccessdelegator_p.h> +#include <private/qreferencecountedvalue_p.h> +#include <private/qresourcedelegator_p.h> +#include <private/qstaticfocuscontext_p.h> +#include <private/quriloader_p.h> +#include <private/qvariableloader_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qxmlresultitems_p.h b/src/xmlpatterns/api/qxmlresultitems_p.h index d1d6962..ec1e879 100644 --- a/src/xmlpatterns/api/qxmlresultitems_p.h +++ b/src/xmlpatterns/api/qxmlresultitems_p.h @@ -52,9 +52,9 @@ #ifndef QXMLRESULTITEMS_P_H #define QXMLRESULTITEMS_P_H -#include "qcommonvalues_p.h" -#include "qdynamiccontext_p.h" -#include "qitem_p.h" +#include <private/qcommonvalues_p.h> +#include <private/qdynamiccontext_p.h> +#include <private/qitem_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qxmlschema_p.h b/src/xmlpatterns/api/qxmlschema_p.h index 94887ad..ffe5820 100644 --- a/src/xmlpatterns/api/qxmlschema_p.h +++ b/src/xmlpatterns/api/qxmlschema_p.h @@ -52,15 +52,15 @@ #ifndef QXMLSCHEMA_P_H #define QXMLSCHEMA_P_H -#include "qabstractmessagehandler.h" -#include "qabstracturiresolver.h" -#include "qautoptr_p.h" -#include "qcoloringmessagehandler_p.h" -#include "qreferencecountedvalue_p.h" +#include <QAbstractMessageHandler> +#include <QAbstractUriResolver> +#include <private/qautoptr_p.h> +#include <private/qcoloringmessagehandler_p.h> +#include <private/qreferencecountedvalue_p.h> -#include "qxsdschemacontext_p.h" -#include "qxsdschemaparser_p.h" -#include "qxsdschemaparsercontext_p.h" +#include <private/qxsdschemacontext_p.h> +#include <private/qxsdschemaparser_p.h> +#include <private/qxsdschemaparsercontext_p.h> #include <QtCore/QSharedData> #include <QtNetwork/QNetworkAccessManager> diff --git a/src/xmlpatterns/api/qxmlschemavalidator_p.h b/src/xmlpatterns/api/qxmlschemavalidator_p.h index 4b545f9..62077c3 100644 --- a/src/xmlpatterns/api/qxmlschemavalidator_p.h +++ b/src/xmlpatterns/api/qxmlschemavalidator_p.h @@ -54,13 +54,13 @@ #include "qabstractmessagehandler.h" #include "qabstracturiresolver.h" -#include "qautoptr_p.h" -#include "qcoloringmessagehandler_p.h" +#include <private/qautoptr_p.h> +#include <private/qcoloringmessagehandler_p.h> #include "qxmlschema.h" -#include "qxmlschema_p.h" +#include <private/qxmlschema_p.h> -#include "qxsdschemacontext_p.h" -#include "qxsdschema_p.h" +#include <private/qxsdschemacontext_p.h> +#include <private/qxsdschema_p.h> #include <QtNetwork/QNetworkAccessManager> diff --git a/src/xmlpatterns/api/qxmlserializer_p.h b/src/xmlpatterns/api/qxmlserializer_p.h index 802a2f0..93bc013 100644 --- a/src/xmlpatterns/api/qxmlserializer_p.h +++ b/src/xmlpatterns/api/qxmlserializer_p.h @@ -59,8 +59,8 @@ #include <QtXmlPatterns/QXmlNamePool> #include <QtXmlPatterns/QXmlSerializer> -#include "qnamepool_p.h" -#include "qabstractxmlreceiver_p.h" +#include <private/qnamepool_p.h> +#include <private/qabstractxmlreceiver_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qabstractdatetime_p.h b/src/xmlpatterns/data/qabstractdatetime_p.h index 985270e..bbc5a30 100644 --- a/src/xmlpatterns/data/qabstractdatetime_p.h +++ b/src/xmlpatterns/data/qabstractdatetime_p.h @@ -55,7 +55,7 @@ #include <QDateTime> #include <QRegExp> -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qabstractduration_p.h b/src/xmlpatterns/data/qabstractduration_p.h index 4e6429f..3d7cf6f 100644 --- a/src/xmlpatterns/data/qabstractduration_p.h +++ b/src/xmlpatterns/data/qabstractduration_p.h @@ -54,7 +54,7 @@ #include <QRegExp> -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h index 4a0e709..53e3549 100644 --- a/src/xmlpatterns/data/qabstractfloat_p.h +++ b/src/xmlpatterns/data/qabstractfloat_p.h @@ -56,11 +56,11 @@ #include <qnumeric.h> -#include "qcommonvalues_p.h" -#include "qdecimal_p.h" -#include "qschemanumeric_p.h" -#include "qvalidationerror_p.h" -#include "qbuiltintypes_p.h" +#include <private/qcommonvalues_p.h> +#include <private/qdecimal_p.h> +#include <private/qschemanumeric_p.h> +#include <private/qvalidationerror_p.h> +#include <private/qbuiltintypes_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h index ffbef40..0f6ab74 100644 --- a/src/xmlpatterns/data/qabstractfloatcasters_p.h +++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_AbstractFloatCasters_H #define Patternist_AbstractFloatCasters_H -#include "qabstractfloat_p.h" -#include "qatomiccaster_p.h" -#include "qschemanumeric_p.h" +#include <private/qabstractfloat_p.h> +#include <private/qatomiccaster_p.h> +#include <private/qschemanumeric_p.h> /** * @file diff --git a/src/xmlpatterns/data/qabstractfloatmathematician_p.h b/src/xmlpatterns/data/qabstractfloatmathematician_p.h index f263c4d..e170172 100644 --- a/src/xmlpatterns/data/qabstractfloatmathematician_p.h +++ b/src/xmlpatterns/data/qabstractfloatmathematician_p.h @@ -52,12 +52,12 @@ #ifndef Patternist_AbstractFloatMathematician_H #define Patternist_AbstractFloatMathematician_H -#include "qabstractfloat_p.h" -#include "qatomicmathematician_p.h" -#include "qinteger_p.h" -#include "qschemanumeric_p.h" -#include "qpatternistlocale_p.h" -#include "qsourcelocationreflection_p.h" +#include <private/qabstractfloat_p.h> +#include <private/qatomicmathematician_p.h> +#include <private/qinteger_p.h> +#include <private/qschemanumeric_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qsourcelocationreflection_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h index 855c377..2b7b61e 100644 --- a/src/xmlpatterns/data/qanyuri_p.h +++ b/src/xmlpatterns/data/qanyuri_p.h @@ -55,10 +55,10 @@ #include <QUrl> #include <QtDebug> -#include "qatomicstring_p.h" -#include "qbuiltintypes_p.h" -#include "qpatternistlocale_p.h" -#include "qreportcontext_p.h" +#include <private/qatomicstring_p.h> +#include <private/qbuiltintypes_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qreportcontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qatomiccaster_p.h b/src/xmlpatterns/data/qatomiccaster_p.h index f322f07..94423bb 100644 --- a/src/xmlpatterns/data/qatomiccaster_p.h +++ b/src/xmlpatterns/data/qatomiccaster_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_AtomicCaster_H #define Patternist_AtomicCaster_H -#include "qdynamiccontext_p.h" -#include "qitem_p.h" -#include "qatomictypedispatch_p.h" +#include <private/qdynamiccontext_p.h> +#include <private/qitem_p.h> +#include <private/qatomictypedispatch_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h index df2f15b..f7b1537 100644 --- a/src/xmlpatterns/data/qatomiccasters_p.h +++ b/src/xmlpatterns/data/qatomiccasters_p.h @@ -52,12 +52,12 @@ #ifndef Patternist_AtomicCasters_H #define Patternist_AtomicCasters_H -#include "qatomiccaster_p.h" -#include "qdecimal_p.h" -#include "qderivedinteger_p.h" -#include "qderivedstring_p.h" -#include "qinteger_p.h" -#include "qvalidationerror_p.h" +#include <private/qatomiccaster_p.h> +#include <private/qdecimal_p.h> +#include <private/qderivedinteger_p.h> +#include <private/qderivedstring_p.h> +#include <private/qinteger_p.h> +#include <private/qvalidationerror_p.h> /** * @file diff --git a/src/xmlpatterns/data/qatomiccomparator_p.h b/src/xmlpatterns/data/qatomiccomparator_p.h index a317a65..8765057 100644 --- a/src/xmlpatterns/data/qatomiccomparator_p.h +++ b/src/xmlpatterns/data/qatomiccomparator_p.h @@ -54,8 +54,8 @@ #include <QFlags> -#include "qitem_p.h" -#include "qatomictypedispatch_p.h" +#include <private/qitem_p.h> +#include <private/qatomictypedispatch_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h index a70f4d7..035b45e 100644 --- a/src/xmlpatterns/data/qatomiccomparators_p.h +++ b/src/xmlpatterns/data/qatomiccomparators_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_AtomicComparators_H #define Patternist_AtomicComparators_H -#include "qabstractfloat_p.h" -#include "qatomiccomparator_p.h" -#include "qprimitives_p.h" +#include <private/qabstractfloat_p.h> +#include <private/qatomiccomparator_p.h> +#include <private/qprimitives_p.h> /** * @file diff --git a/src/xmlpatterns/data/qatomicmathematician_p.h b/src/xmlpatterns/data/qatomicmathematician_p.h index eccc9f9..70c52fb 100644 --- a/src/xmlpatterns/data/qatomicmathematician_p.h +++ b/src/xmlpatterns/data/qatomicmathematician_p.h @@ -54,9 +54,9 @@ #include <QFlags> -#include "qdynamiccontext_p.h" -#include "qitem_p.h" -#include "qatomictypedispatch_p.h" +#include <private/qdynamiccontext_p.h> +#include <private/qitem_p.h> +#include <private/qatomictypedispatch_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h index fb91a6f..2b00bbe 100644 --- a/src/xmlpatterns/data/qatomicmathematicians_p.h +++ b/src/xmlpatterns/data/qatomicmathematicians_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_AtomicMathematicians_H #define Patternist_AtomicMathematicians_H -#include "qatomicmathematician_p.h" -#include "qsourcelocationreflection_p.h" +#include <private/qatomicmathematician_p.h> +#include <private/qsourcelocationreflection_p.h> /** * @file diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h index 3b7fe2b..f10de77 100644 --- a/src/xmlpatterns/data/qatomicstring_p.h +++ b/src/xmlpatterns/data/qatomicstring_p.h @@ -54,7 +54,7 @@ #include <QUrl> -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h index 44b7d64..39c67a1 100644 --- a/src/xmlpatterns/data/qbase64binary_p.h +++ b/src/xmlpatterns/data/qbase64binary_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Base64Binary_H #define Patternist_Base64Binary_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h index 74a9ed0..d502418 100644 --- a/src/xmlpatterns/data/qboolean_p.h +++ b/src/xmlpatterns/data/qboolean_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Boolean_H #define Patternist_Boolean_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qcommonvalues_p.h b/src/xmlpatterns/data/qcommonvalues_p.h index aba0e20..05e1e48 100644 --- a/src/xmlpatterns/data/qcommonvalues_p.h +++ b/src/xmlpatterns/data/qcommonvalues_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_CommonValues_H #define Patternist_CommonValues_H -#include "qdaytimeduration_p.h" -#include "qyearmonthduration_p.h" -#include "qemptyiterator_p.h" +#include <private/qdaytimeduration_p.h> +#include <private/qyearmonthduration_p.h> +#include <private/qemptyiterator_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qcomparisonfactory_p.h b/src/xmlpatterns/data/qcomparisonfactory_p.h index aad99e9..993fc97 100644 --- a/src/xmlpatterns/data/qcomparisonfactory_p.h +++ b/src/xmlpatterns/data/qcomparisonfactory_p.h @@ -52,11 +52,11 @@ #ifndef Patternist_ComparisonFactory_H #define Patternist_ComparisonFactory_H -#include "qatomiccomparator_p.h" -#include "qderivedstring_p.h" -#include "qitem_p.h" -#include "qreportcontext_p.h" -#include "qschematype_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qderivedstring_p.h> +#include <private/qitem_p.h> +#include <private/qreportcontext_p.h> +#include <private/qschematype_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h index 0a57789..35311e1 100644 --- a/src/xmlpatterns/data/qdate_p.h +++ b/src/xmlpatterns/data/qdate_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Date_H #define Patternist_Date_H -#include "qabstractdatetime_p.h" +#include <private/qabstractdatetime_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h index d2dd5cb..e5a9eb9 100644 --- a/src/xmlpatterns/data/qdaytimeduration_p.h +++ b/src/xmlpatterns/data/qdaytimeduration_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_DayTimeDuration_H #define Patternist_DayTimeDuration_H -#include "qabstractduration_p.h" -#include "qitem_p.h" +#include <private/qabstractduration_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h index d1eb098..97a09d8 100644 --- a/src/xmlpatterns/data/qdecimal_p.h +++ b/src/xmlpatterns/data/qdecimal_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Decimal_H #define Patternist_Decimal_H -#include "qschemanumeric_p.h" +#include <private/qschemanumeric_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h index 4e68dc5..05783e3 100644 --- a/src/xmlpatterns/data/qderivedinteger_p.h +++ b/src/xmlpatterns/data/qderivedinteger_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_DerivedInteger_H #define Patternist_DerivedInteger_H -#include "qbuiltintypes_p.h" -#include "qinteger_p.h" -#include "qpatternistlocale_p.h" -#include "qvalidationerror_p.h" +#include <private/qbuiltintypes_p.h> +#include <private/qinteger_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qvalidationerror_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h index 2c13fef..51766ca 100644 --- a/src/xmlpatterns/data/qderivedstring_p.h +++ b/src/xmlpatterns/data/qderivedstring_p.h @@ -54,10 +54,10 @@ #include <QRegExp> -#include "private/qxmlutils_p.h" -#include "qbuiltintypes_p.h" -#include "qpatternistlocale_p.h" -#include "qvalidationerror_p.h" +#include <private/qxmlutils_p.h> +#include <private/qbuiltintypes_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qvalidationerror_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h index 3c88a5e..d2f6ccc 100644 --- a/src/xmlpatterns/data/qduration_p.h +++ b/src/xmlpatterns/data/qduration_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Duration_H #define Patternist_Duration_H -#include "qabstractduration_p.h" +#include <private/qabstractduration_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h index 3a52bc6..b2b8073 100644 --- a/src/xmlpatterns/data/qgday_p.h +++ b/src/xmlpatterns/data/qgday_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_GDay_H #define Patternist_GDay_H -#include "qabstractdatetime_p.h" +#include <private/qabstractdatetime_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h index 2c6ff42..e722ef0 100644 --- a/src/xmlpatterns/data/qgmonth_p.h +++ b/src/xmlpatterns/data/qgmonth_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_GMonth_H #define Patternist_GMonth_H -#include "qabstractdatetime_p.h" +#include <private/qabstractdatetime_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h index 4456fbf..3ea9232 100644 --- a/src/xmlpatterns/data/qgmonthday_p.h +++ b/src/xmlpatterns/data/qgmonthday_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_GMonthDay_H #define Patternist_GMonthDay_H -#include "qabstractdatetime_p.h" +#include <private/qabstractdatetime_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h index 3fc59ae..61c0536 100644 --- a/src/xmlpatterns/data/qgyear_p.h +++ b/src/xmlpatterns/data/qgyear_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_GYear_H #define Patternist_GYear_H -#include "qabstractdatetime_p.h" +#include <private/qabstractdatetime_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h index c83a43f..13ab4ed 100644 --- a/src/xmlpatterns/data/qgyearmonth_p.h +++ b/src/xmlpatterns/data/qgyearmonth_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_GYearMonth_H #define Patternist_GYearMonth_H -#include "qabstractdatetime_p.h" +#include <private/qabstractdatetime_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h index 45117da..91eaca3 100644 --- a/src/xmlpatterns/data/qhexbinary_p.h +++ b/src/xmlpatterns/data/qhexbinary_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_HexBinary_H #define Patternist_HexBinary_H -#include "qbase64binary_p.h" +#include <private/qbase64binary_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h index 880653a..5d2eaf4 100644 --- a/src/xmlpatterns/data/qinteger_p.h +++ b/src/xmlpatterns/data/qinteger_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Integer_H #define Patternist_Integer_H -#include "qschemanumeric_p.h" +#include <private/qschemanumeric_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qnodebuilder_p.h b/src/xmlpatterns/data/qnodebuilder_p.h index d4ba939..9618c20 100644 --- a/src/xmlpatterns/data/qnodebuilder_p.h +++ b/src/xmlpatterns/data/qnodebuilder_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_NodeBuilder_H #define Patternist_NodeBuilder_H -#include "qitem_p.h" +#include <private/qitem_p.h> #include "qabstractxmlreceiver.h" -#include "qautoptr_p.h" +#include <private/qautoptr_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h index d38b6fa..6a71026 100644 --- a/src/xmlpatterns/data/qqnamevalue_p.h +++ b/src/xmlpatterns/data/qqnamevalue_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_QNameValue_H #define Patternist_QNameValue_H -#include "qitem_p.h" -#include "qxmlname.h" +#include <private/qitem_p.h> +#include <QXmlName> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qresourceloader_p.h b/src/xmlpatterns/data/qresourceloader_p.h index 5562307..ca14ab0 100644 --- a/src/xmlpatterns/data/qresourceloader_p.h +++ b/src/xmlpatterns/data/qresourceloader_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_ResourceLoader_H #define Patternist_ResourceLoader_H -#include "qitem_p.h" -#include "qreportcontext_p.h" -#include "qsequencetype_p.h" -#include "qsourcelocationreflection_p.h" +#include <private/qitem_p.h> +#include <private/qreportcontext_p.h> +#include <private/qsequencetype_p.h> +#include <private/qsourcelocationreflection_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h index dfd91cf..344c4c4 100644 --- a/src/xmlpatterns/data/qschemadatetime_p.h +++ b/src/xmlpatterns/data/qschemadatetime_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_DateTime_H #define Patternist_DateTime_H -#include "qabstractdatetime_p.h" +#include <private/qabstractdatetime_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qschemanumeric_p.h b/src/xmlpatterns/data/qschemanumeric_p.h index c0d94b5..9369b0c 100644 --- a/src/xmlpatterns/data/qschemanumeric_p.h +++ b/src/xmlpatterns/data/qschemanumeric_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_Numeric_H #define Patternist_Numeric_H -#include "qitem_p.h" -#include "qprimitives_p.h" +#include <private/qitem_p.h> +#include <private/qprimitives_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h index 57b0109..6f47b5c 100644 --- a/src/xmlpatterns/data/qschematime_p.h +++ b/src/xmlpatterns/data/qschematime_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Time_H #define Patternist_Time_H -#include "qabstractdatetime_p.h" +#include <private/qabstractdatetime_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qsequencereceiver_p.h b/src/xmlpatterns/data/qsequencereceiver_p.h index 2416160..8de6865 100644 --- a/src/xmlpatterns/data/qsequencereceiver_p.h +++ b/src/xmlpatterns/data/qsequencereceiver_p.h @@ -54,7 +54,7 @@ #include <QSharedData> -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h index 56e6ed4..585b56e 100644 --- a/src/xmlpatterns/data/qsorttuple_p.h +++ b/src/xmlpatterns/data/qsorttuple_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_SortTuple_H #define Patternist_SortTuple_H -#include "qitem_p.h" -#include "qitem_p.h" -#include "qitemtype_p.h" +#include <private/qitem_p.h> +#include <private/qitem_p.h> +#include <private/qitemtype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h index d25d0b5..187e539 100644 --- a/src/xmlpatterns/data/quntypedatomic_p.h +++ b/src/xmlpatterns/data/quntypedatomic_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_UntypedAtomic_H #define Patternist_UntypedAtomic_H -#include "qatomicstring_p.h" +#include <private/qatomicstring_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h index 85ff2a6..5a489df 100644 --- a/src/xmlpatterns/data/qvalidationerror_p.h +++ b/src/xmlpatterns/data/qvalidationerror_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_ValidationError_H #define Patternist_ValidationError_H -#include "qitem_p.h" -#include "qreportcontext_p.h" +#include <private/qitem_p.h> +#include <private/qreportcontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/data/qvaluefactory_p.h b/src/xmlpatterns/data/qvaluefactory_p.h index b7d351e..124448a 100644 --- a/src/xmlpatterns/data/qvaluefactory_p.h +++ b/src/xmlpatterns/data/qvaluefactory_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_ValueFactory_H #define Patternist_ValueFactory_H -#include "qitem_p.h" -#include "qreportcontext_p.h" -#include "qschematype_p.h" +#include <private/qitem_p.h> +#include <private/qreportcontext_p.h> +#include <private/qschematype_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h index ffffdf4..02b6916 100644 --- a/src/xmlpatterns/data/qyearmonthduration_p.h +++ b/src/xmlpatterns/data/qyearmonthduration_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_YearMonthDuration_H #define Patternist_YearMonthDuration_H -#include "qabstractduration_p.h" +#include <private/qabstractduration_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h index 6562f70..5d91df4 100644 --- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h +++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CurrentItemContext_H #define Patternist_CurrentItemContext_H -#include "qdelegatingdynamiccontext_p.h" +#include <private/qdelegatingdynamiccontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h index f668c91..00bd6c0 100644 --- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_DelegatingDynamicContext_H #define Patternist_DelegatingDynamicContext_H -#include "qdynamiccontext_p.h" -#include "qexpression_p.h" +#include <private/qdynamiccontext_p.h> +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h index 35f3e12..ce303d0 100644 --- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h +++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h @@ -54,9 +54,9 @@ #include <QUrl> -#include "qstaticcontext_p.h" -#include "qfunctionfactory_p.h" -#include "qschematypefactory_p.h" +#include <private/qstaticcontext_p.h> +#include <private/qfunctionfactory_p.h> +#include <private/qschematypefactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h index 155f6aa..20d2707 100644 --- a/src/xmlpatterns/environment/qdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qdynamiccontext_p.h @@ -52,15 +52,15 @@ #ifndef Patternist_DynamicContext_H #define Patternist_DynamicContext_H -#include "qautoptr_p.h" -#include "qcachecells_p.h" -#include "qexternalvariableloader_p.h" -#include "qitem_p.h" -#include "qnamepool_p.h" -#include "qnodebuilder_p.h" -#include "qprimitives_p.h" -#include "qreportcontext_p.h" -#include "qresourceloader_p.h" +#include <private/qautoptr_p.h> +#include <private/qcachecells_p.h> +#include <private/qexternalvariableloader_p.h> +#include <private/qitem_p.h> +#include <private/qnamepool_p.h> +#include <private/qnodebuilder_p.h> +#include <private/qprimitives_p.h> +#include <private/qreportcontext_p.h> +#include <private/qresourceloader_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h index 2f3196d..b9963e6 100644 --- a/src/xmlpatterns/environment/qfocus_p.h +++ b/src/xmlpatterns/environment/qfocus_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Focus_H #define Patternist_Focus_H -#include "qdelegatingdynamiccontext_p.h" +#include <private/qdelegatingdynamiccontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h index d1e8dff..4d0145c 100644 --- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h @@ -55,9 +55,9 @@ #include <QDateTime> #include <QVector> -#include "qdaytimeduration_p.h" -#include "qstackcontextbase_p.h" -#include "qexpression_p.h" +#include <private/qdaytimeduration_p.h> +#include <private/qstackcontextbase_p.h> +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h index 311880f..af0ab6f 100644 --- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h +++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h @@ -55,9 +55,9 @@ #include <QUrl> #include <QXmlQuery> -#include "qstaticcontext_p.h" -#include "qfunctionfactory_p.h" -#include "qschematypefactory_p.h" +#include <private/qstaticcontext_p.h> +#include <private/qfunctionfactory_p.h> +#include <private/qschematypefactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h index 8c9fd48..51aa6f1 100644 --- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ReceiverDynamicContext_H #define Patternist_ReceiverDynamicContext_H -#include "qdelegatingdynamiccontext_p.h" +#include <private/qdelegatingdynamiccontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qreportcontext_p.h b/src/xmlpatterns/environment/qreportcontext_p.h index e2871fa..ecae020 100644 --- a/src/xmlpatterns/environment/qreportcontext_p.h +++ b/src/xmlpatterns/environment/qreportcontext_p.h @@ -56,8 +56,8 @@ #include <QAbstractUriResolver> #include <QSourceLocation> -#include "qnamepool_p.h" -#include "qxmlname.h" +#include <private/qnamepool_p.h> +#include <QXmlName> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h index 8604373..414c9b8 100644 --- a/src/xmlpatterns/environment/qstackcontextbase_p.h +++ b/src/xmlpatterns/environment/qstackcontextbase_p.h @@ -54,9 +54,9 @@ #include <QVector> -#include "qdaytimeduration_p.h" -#include "qdelegatingdynamiccontext_p.h" -#include "qexpression_p.h" +#include <private/qdaytimeduration_p.h> +#include <private/qdelegatingdynamiccontext_p.h> +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h index dc2a89c..20111e2 100644 --- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h +++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_StaticBaseURIContext_H #define Patternist_StaticBaseURIContext_H -#include "qdelegatingstaticcontext_p.h" +#include <private/qdelegatingstaticcontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h index f9515c7..0f9ef4b 100644 --- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h +++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_StaticCompatibilityContext_H #define Patternist_StaticCompatibilityContext_H -#include "qdelegatingstaticcontext_p.h" +#include <private/qdelegatingstaticcontext_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h index c3b20c0..0a8e43e 100644 --- a/src/xmlpatterns/environment/qstaticcontext_p.h +++ b/src/xmlpatterns/environment/qstaticcontext_p.h @@ -52,12 +52,12 @@ #ifndef Patternist_StaticContext_H #define Patternist_StaticContext_H -#include "qexternalvariableloader_p.h" -#include "qitemtype_p.h" -#include "qnamepool_p.h" -#include "qnamespaceresolver_p.h" -#include "qreportcontext_p.h" -#include "qresourceloader_p.h" +#include <private/qexternalvariableloader_p.h> +#include <private/qitemtype_p.h> +#include <private/qnamepool_p.h> +#include <private/qnamespaceresolver_p.h> +#include <private/qreportcontext_p.h> +#include <private/qresourceloader_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h index 6a60e87..89d6f4f 100644 --- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h +++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_StaticCurrentContext_H #define Patternist_StaticCurrentContext_H -#include "qdelegatingstaticcontext_p.h" +#include <private/qdelegatingstaticcontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h index 0f92c37..4c5ee4f 100644 --- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h +++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_StaticFocusContext_H #define Patternist_StaticFocusContext_H -#include "qdelegatingstaticcontext_p.h" +#include <private/qdelegatingstaticcontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h index 771421b..e046154 100644 --- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h +++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_StaticNamespaceContext_H #define Patternist_StaticNamespaceContext_H -#include "qdelegatingstaticcontext_p.h" +#include <private/qdelegatingstaticcontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h index d3237ea..95e5195 100644 --- a/src/xmlpatterns/expr/qandexpression_p.h +++ b/src/xmlpatterns/expr/qandexpression_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AndExpression_H #define Patternist_AndExpression_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h index 4985f27..0971d93 100644 --- a/src/xmlpatterns/expr/qapplytemplate_p.h +++ b/src/xmlpatterns/expr/qapplytemplate_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ApplyTemplate_H #define Patternist_ApplyTemplate_H -#include "qtemplatemode_p.h" +#include <private/qtemplatemode_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h index dda913f..827ee3a 100644 --- a/src/xmlpatterns/expr/qargumentreference_p.h +++ b/src/xmlpatterns/expr/qargumentreference_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ArgumentReference_H #define Patternist_ArgumentReference_H -#include "qvariablereference_p.h" +#include <private/qvariablereference_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h index ed0c3cc..16b27b9 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression_p.h +++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_ArithmeticExpression_H #define Patternist_ArithmeticExpression_H -#include "qatomicmathematician_p.h" -#include "qpaircontainer_p.h" +#include <private/qatomicmathematician_p.h> +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h index 52cfb6e..076d064 100644 --- a/src/xmlpatterns/expr/qattributeconstructor_p.h +++ b/src/xmlpatterns/expr/qattributeconstructor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AttributeConstructor_H #define Patternist_AttributeConstructor_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h index f723459..5965f02 100644 --- a/src/xmlpatterns/expr/qattributenamevalidator_p.h +++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AttributeNameValidator_H #define Patternist_AttributeNameValidator_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h index 2a1428a..7267e87 100644 --- a/src/xmlpatterns/expr/qaxisstep_p.h +++ b/src/xmlpatterns/expr/qaxisstep_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_AxisStep_H #define Patternist_AxisStep_H -#include "qemptycontainer_p.h" -#include "qitem_p.h" +#include <private/qemptycontainer_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcachecells_p.h b/src/xmlpatterns/expr/qcachecells_p.h index 3c1916d..48f1693 100644 --- a/src/xmlpatterns/expr/qcachecells_p.h +++ b/src/xmlpatterns/expr/qcachecells_p.h @@ -55,7 +55,7 @@ #include <QList> #include <QVector> -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcallsite_p.h b/src/xmlpatterns/expr/qcallsite_p.h index 92b20e0..064532e 100644 --- a/src/xmlpatterns/expr/qcallsite_p.h +++ b/src/xmlpatterns/expr/qcallsite_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_CallSite_H #define Patternist_CallSite_H -#include "qunlimitedcontainer_p.h" -#include "qcalltargetdescription_p.h" -#include "qxmlname.h" +#include <private/qunlimitedcontainer_p.h> +#include <private/qcalltargetdescription_p.h> +#include <QXmlName> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h index f2b23d7..06a54da 100644 --- a/src/xmlpatterns/expr/qcalltargetdescription_p.h +++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h @@ -57,7 +57,7 @@ template<typename T> class QList; #include <QSharedData> -#include "qexpression_p.h" +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h index 06d268b..017c1ab 100644 --- a/src/xmlpatterns/expr/qcalltemplate_p.h +++ b/src/xmlpatterns/expr/qcalltemplate_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_CallTemplate_H #define Patternist_CallTemplate_H -#include "qcallsite_p.h" -#include "qtemplateinvoker_p.h" -#include "qtemplate_p.h" +#include <private/qcallsite_p.h> +#include <private/qtemplateinvoker_p.h> +#include <private/qtemplate_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h index f54d334..b5b7905 100644 --- a/src/xmlpatterns/expr/qcastableas_p.h +++ b/src/xmlpatterns/expr/qcastableas_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_CastableAs_H #define Patternist_CastableAs_H -#include "qsinglecontainer_p.h" -#include "qcastingplatform_p.h" +#include <private/qsinglecontainer_p.h> +#include <private/qcastingplatform_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h index 90463cb..c77caa6 100644 --- a/src/xmlpatterns/expr/qcastas_p.h +++ b/src/xmlpatterns/expr/qcastas_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_CastAs_H #define Patternist_CastAs_H -#include "qsinglecontainer_p.h" -#include "qcastingplatform_p.h" +#include <private/qsinglecontainer_p.h> +#include <private/qcastingplatform_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcastingplatform_p.h b/src/xmlpatterns/expr/qcastingplatform_p.h index 6d7a0aa..aafa681 100644 --- a/src/xmlpatterns/expr/qcastingplatform_p.h +++ b/src/xmlpatterns/expr/qcastingplatform_p.h @@ -52,17 +52,17 @@ #ifndef Patternist_CastingPlatform_H #define Patternist_CastingPlatform_H -#include "qatomiccasterlocator_p.h" -#include "qatomiccaster_p.h" -#include "qatomicstring_p.h" -#include "qatomictype_p.h" -#include "qbuiltintypes_p.h" -#include "qcommonsequencetypes_p.h" -#include "qpatternistlocale_p.h" -#include "qqnamevalue_p.h" -#include "qschematypefactory_p.h" -#include "qstaticcontext_p.h" -#include "qvalidationerror_p.h" +#include <private/qatomiccasterlocator_p.h> +#include <private/qatomiccaster_p.h> +#include <private/qatomicstring_p.h> +#include <private/qatomictype_p.h> +#include <private/qbuiltintypes_p.h> +#include <private/qcommonsequencetypes_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qqnamevalue_p.h> +#include <private/qschematypefactory_p.h> +#include <private/qstaticcontext_p.h> +#include <private/qvalidationerror_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h index 8d62c33..5cdf485 100644 --- a/src/xmlpatterns/expr/qcollationchecker_p.h +++ b/src/xmlpatterns/expr/qcollationchecker_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CollationChecker_H #define Patternist_CollationChecker_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h index c586929..75b9e28 100644 --- a/src/xmlpatterns/expr/qcombinenodes_p.h +++ b/src/xmlpatterns/expr/qcombinenodes_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CombineNodes_H #define Patternist_CombineNodes_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h index 4799bb1..ceb6688 100644 --- a/src/xmlpatterns/expr/qcommentconstructor_p.h +++ b/src/xmlpatterns/expr/qcommentconstructor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CommentConstructor_H #define Patternist_CommentConstructor_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcomparisonplatform_p.h b/src/xmlpatterns/expr/qcomparisonplatform_p.h index 49fc181..6037f74 100644 --- a/src/xmlpatterns/expr/qcomparisonplatform_p.h +++ b/src/xmlpatterns/expr/qcomparisonplatform_p.h @@ -52,13 +52,13 @@ #ifndef Patternist_ComparisonPlatform_H #define Patternist_ComparisonPlatform_H -#include "qatomiccomparators_p.h" -#include "qitem_p.h" -#include "qcommonsequencetypes_p.h" -#include "qdynamiccontext_p.h" -#include "qbuiltintypes_p.h" -#include "qitemtype_p.h" -#include "qpatternistlocale_p.h" +#include <private/qatomiccomparators_p.h> +#include <private/qitem_p.h> +#include <private/qcommonsequencetypes_p.h> +#include <private/qdynamiccontext_p.h> +#include <private/qbuiltintypes_p.h> +#include <private/qitemtype_p.h> +#include <private/qpatternistlocale_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h index d76942c..da9d400 100644 --- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ComputedNamespaceConstructor_H #define Patternist_ComputedNamespaceConstructor_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h index 78b988c..48df32a 100644 --- a/src/xmlpatterns/expr/qcontextitem_p.h +++ b/src/xmlpatterns/expr/qcontextitem_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ContextItem_H #define Patternist_ContextItem_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h index a68911c..722462f 100644 --- a/src/xmlpatterns/expr/qcopyof_p.h +++ b/src/xmlpatterns/expr/qcopyof_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CopyOf_H #define Patternist_CopyOf_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h index c67d77b..30a2248 100644 --- a/src/xmlpatterns/expr/qcurrentitemstore_p.h +++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CurrentItemStore_H #define Patternist_CurrentItemStore_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h index 6340d59..af271b6 100644 --- a/src/xmlpatterns/expr/qdocumentconstructor_p.h +++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h @@ -54,7 +54,7 @@ #include <QUrl> -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h index 368db4d..41f3ed7 100644 --- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h +++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_DocumentContentValidator_H #define Patternist_DocumentContentValidator_H -#include "qdynamiccontext_p.h" -#include "qexpression_p.h" +#include <private/qdynamiccontext_p.h> +#include <private/qexpression_p.h> #include "qabstractxmlreceiver.h" QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h index f1416ad..5145403 100644 --- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h +++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_DynamicContextStore_H #define Patternist_DynamicContextStore_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h index 3a21462..6e51474 100644 --- a/src/xmlpatterns/expr/qelementconstructor_p.h +++ b/src/xmlpatterns/expr/qelementconstructor_p.h @@ -54,7 +54,7 @@ #include <QUrl> -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h index 70dd243..ce36d23 100644 --- a/src/xmlpatterns/expr/qemptycontainer_p.h +++ b/src/xmlpatterns/expr/qemptycontainer_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_EmptyContainer_H #define Patternist_EmptyContainer_H -#include "qexpression_p.h" +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h index 30f225b..196a4c6 100644 --- a/src/xmlpatterns/expr/qemptysequence_p.h +++ b/src/xmlpatterns/expr/qemptysequence_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_EmptySequence_H #define Patternist_EmptySequence_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h index e58c7cd..3b47ba5 100644 --- a/src/xmlpatterns/expr/qevaluationcache_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_p.h @@ -52,12 +52,12 @@ #ifndef Patternist_EvaluationCache_H #define Patternist_EvaluationCache_H -#include "qcachingiterator_p.h" -#include "qcommonsequencetypes_p.h" -#include "qnodebuilder_p.h" -#include "qoperandsiterator_p.h" -#include "qsinglecontainer_p.h" -#include "qvariabledeclaration_p.h" +#include <private/qcachingiterator_p.h> +#include <private/qcommonsequencetypes_p.h> +#include <private/qnodebuilder_p.h> +#include <private/qoperandsiterator_p.h> +#include <private/qsinglecontainer_p.h> +#include <private/qvariabledeclaration_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h index 695b7c6..73a2d40 100644 --- a/src/xmlpatterns/expr/qexpression_p.h +++ b/src/xmlpatterns/expr/qexpression_p.h @@ -55,14 +55,14 @@ #include <QFlags> #include <QSharedData> -#include "qcppcastinghelper_p.h" -#include "qdebug_p.h" -#include "qdynamiccontext_p.h" -#include "qexpressiondispatch_p.h" -#include "qitem_p.h" -#include "qsequencetype_p.h" -#include "qsourcelocationreflection_p.h" -#include "qstaticcontext_p.h" +#include <private/qcppcastinghelper_p.h> +#include <private/qdebug_p.h> +#include <private/qdynamiccontext_p.h> +#include <private/qexpressiondispatch_p.h> +#include <private/qitem_p.h> +#include <private/qsequencetype_p.h> +#include <private/qsourcelocationreflection_p.h> +#include <private/qstaticcontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qexpressionfactory_p.h b/src/xmlpatterns/expr/qexpressionfactory_p.h index 6a9d744..8ad7b9f 100644 --- a/src/xmlpatterns/expr/qexpressionfactory_p.h +++ b/src/xmlpatterns/expr/qexpressionfactory_p.h @@ -54,8 +54,8 @@ #include <QXmlQuery> -#include "qexpression_p.h" -#include "qtokenizer_p.h" +#include <private/qexpression_p.h> +#include <private/qtokenizer_p.h> #include <QSharedData> #include <QUrl> diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h index 5df7ee8..61728ec 100644 --- a/src/xmlpatterns/expr/qexpressionsequence_p.h +++ b/src/xmlpatterns/expr/qexpressionsequence_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ExpressionSequence_H #define Patternist_ExpressionSequence_H -#include "qunlimitedcontainer_p.h" +#include <private/qunlimitedcontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h index 9f80684..7d3338a 100644 --- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h +++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_ExpressionVariableReference_H #define Patternist_ExpressionVariableReference_H -#include "qvariabledeclaration_p.h" -#include "qvariablereference_p.h" +#include <private/qvariabledeclaration_p.h> +#include <private/qvariablereference_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qexternalvariableloader_p.h b/src/xmlpatterns/expr/qexternalvariableloader_p.h index 7d97eb0..3a45cef 100644 --- a/src/xmlpatterns/expr/qexternalvariableloader_p.h +++ b/src/xmlpatterns/expr/qexternalvariableloader_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_ExternalVariableLoader_H #define Patternist_ExternalVariableLoader_H -#include "qitem_p.h" -#include "qsequencetype_p.h" -#include "qxmlname.h" +#include <private/qitem_p.h> +#include <private/qsequencetype_p.h> +#include <QXmlName> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h index 78314f6..a73d7ae 100644 --- a/src/xmlpatterns/expr/qexternalvariablereference_p.h +++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ExternalVariableReference_H #define Patternist_ExternalVariableReference_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h index d3d8a6d..787ba55 100644 --- a/src/xmlpatterns/expr/qfirstitempredicate_p.h +++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_FirstItemPredicate_H #define Patternist_FirstItemPredicate_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h index 2ad5e2f..f9a9447 100644 --- a/src/xmlpatterns/expr/qforclause_p.h +++ b/src/xmlpatterns/expr/qforclause_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ForClause_H #define Patternist_ForClause_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h index 9321dc7..264cc04 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison_p.h +++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_GeneralComparison_H #define Patternist_GeneralComparison_H -#include "qatomiccomparator_p.h" -#include "qpaircontainer_p.h" -#include "qcomparisonplatform_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qpaircontainer_p.h> +#include <private/qcomparisonplatform_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h index 533745a..05040e3 100644 --- a/src/xmlpatterns/expr/qgenericpredicate_p.h +++ b/src/xmlpatterns/expr/qgenericpredicate_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_GenericPredicate_H #define Patternist_GenericPredicate_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h index c5a533c..0cce71a 100644 --- a/src/xmlpatterns/expr/qifthenclause_p.h +++ b/src/xmlpatterns/expr/qifthenclause_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_IfThenClause_H #define Patternist_IfThenClause_H -#include "qtriplecontainer_p.h" +#include <private/qtriplecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h index 62f4625..8d2d0a3 100644 --- a/src/xmlpatterns/expr/qinstanceof_p.h +++ b/src/xmlpatterns/expr/qinstanceof_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_InstanceOf_H #define Patternist_InstanceOf_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h index cd5f5da..ef884e7 100644 --- a/src/xmlpatterns/expr/qletclause_p.h +++ b/src/xmlpatterns/expr/qletclause_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_LetClause_H #define Patternist_LetClause_H -#include "qpaircontainer_p.h" -#include "qvariabledeclaration_p.h" +#include <private/qpaircontainer_p.h> +#include <private/qvariabledeclaration_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h index 42f8ec3..14eae28 100644 --- a/src/xmlpatterns/expr/qliteral_p.h +++ b/src/xmlpatterns/expr/qliteral_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Literal_H #define Patternist_Literal_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h index f809f6d..b126fd3 100644 --- a/src/xmlpatterns/expr/qliteralsequence_p.h +++ b/src/xmlpatterns/expr/qliteralsequence_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_LiteralSequence_H #define Patternist_LiteralSequence_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h index bd2b784..ceeaec6 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_NamespaceConstructor_H #define Patternist_NamespaceConstructor_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h index 8c5f265..9479e8a 100644 --- a/src/xmlpatterns/expr/qncnameconstructor_p.h +++ b/src/xmlpatterns/expr/qncnameconstructor_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_NCNameConstructor_H #define Patternist_NCNameConstructor_H -#include "qsinglecontainer_p.h" -#include "qpatternistlocale_p.h" -#include "private/qxmlutils_p.h" +#include <private/qsinglecontainer_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qxmlutils_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h index 2b1ba09..b3bbb48 100644 --- a/src/xmlpatterns/expr/qnodecomparison_p.h +++ b/src/xmlpatterns/expr/qnodecomparison_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_NodeComparison_H #define Patternist_NodeComparison_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h index c666b75..f5be80e 100644 --- a/src/xmlpatterns/expr/qnodesort_p.h +++ b/src/xmlpatterns/expr/qnodesort_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_NodeSortExpression_H #define Patternist_NodeSortExpression_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qoperandsiterator_p.h b/src/xmlpatterns/expr/qoperandsiterator_p.h index 075feb6..2a7fb19 100644 --- a/src/xmlpatterns/expr/qoperandsiterator_p.h +++ b/src/xmlpatterns/expr/qoperandsiterator_p.h @@ -55,7 +55,7 @@ #include <QPair> #include <QStack> -#include "qexpression_p.h" +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qoptimizationpasses_p.h b/src/xmlpatterns/expr/qoptimizationpasses_p.h index 6d6d339..32116d2 100644 --- a/src/xmlpatterns/expr/qoptimizationpasses_p.h +++ b/src/xmlpatterns/expr/qoptimizationpasses_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_OptimizationBlocks_H #define Patternist_OptimizationBlocks_H -#include "qatomiccomparator_p.h" -#include "qexpression_p.h" -#include "qoptimizerframework_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qexpression_p.h> +#include <private/qoptimizerframework_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h index 054b50f..99f18d7 100644 --- a/src/xmlpatterns/expr/qoptimizerblocks_p.h +++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_OptimizerBlocks_H #define Patternist_OptimizerBlocks_H -#include "qatomiccomparator_p.h" -#include "qexpression_p.h" -#include "qoptimizerframework_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qexpression_p.h> +#include <private/qoptimizerframework_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qoptimizerframework_p.h b/src/xmlpatterns/expr/qoptimizerframework_p.h index 87fe4ab..c26f982 100644 --- a/src/xmlpatterns/expr/qoptimizerframework_p.h +++ b/src/xmlpatterns/expr/qoptimizerframework_p.h @@ -54,7 +54,7 @@ #include <QSharedData> -#include "qexpression_p.h" +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h index 7d7a22d..800ec28 100644 --- a/src/xmlpatterns/expr/qorderby_p.h +++ b/src/xmlpatterns/expr/qorderby_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_OrderBy_H #define Patternist_OrderBy_H -#include "qatomiccomparator_p.h" -#include "qcomparisonplatform_p.h" -#include "qsinglecontainer_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qcomparisonplatform_p.h> +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h index dbc1da9..62c04bc 100644 --- a/src/xmlpatterns/expr/qorexpression_p.h +++ b/src/xmlpatterns/expr/qorexpression_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_OrExpression_H #define Patternist_OrExpression_H -#include "qandexpression_p.h" +#include <private/qandexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h index 1fb85e2..6a80e04 100644 --- a/src/xmlpatterns/expr/qpaircontainer_p.h +++ b/src/xmlpatterns/expr/qpaircontainer_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_PairContainer_H #define Patternist_PairContainer_H -#include "qexpression_p.h" -#include "qatomictype_p.h" +#include <private/qexpression_p.h> +#include <private/qatomictype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h index e6932a3..1d390f8 100644 --- a/src/xmlpatterns/expr/qparentnodeaxis_p.h +++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ParentNodeAxis_H #define Patternist_ParentNodeAxis_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h index 37ce2a1..aeddb91 100644 --- a/src/xmlpatterns/expr/qpath_p.h +++ b/src/xmlpatterns/expr/qpath_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Path_H #define Patternist_Path_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h index 54f6805..342a473 100644 --- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h +++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_PositionVariableReference_H #define Patternist_PositionVariableReference_H -#include "qvariablereference_p.h" +#include <private/qvariablereference_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h index 52d4064..7ef06b2 100644 --- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h +++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ProcessingInstructionConstructor_H #define Patternist_ProcessingInstructionConstructor_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h index d59a992..7e7a7c8 100644 --- a/src/xmlpatterns/expr/qqnameconstructor_p.h +++ b/src/xmlpatterns/expr/qqnameconstructor_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_QNameConstructor_H #define Patternist_QNameConstructor_H -#include "qsinglecontainer_p.h" -#include "qbuiltintypes_p.h" -#include "qpatternistlocale_p.h" -#include "qxpathhelper_p.h" +#include <private/qsinglecontainer_p.h> +#include <private/qbuiltintypes_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qxpathhelper_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h index 48924ae..fdf8645 100644 --- a/src/xmlpatterns/expr/qquantifiedexpression_p.h +++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_QuantifiedExpression_H #define Patternist_QuantifiedExpression_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h index 2b59385..c0ad660 100644 --- a/src/xmlpatterns/expr/qrangeexpression_p.h +++ b/src/xmlpatterns/expr/qrangeexpression_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_RangeExpression_H #define Patternist_RangeExpression_H -#include "qpaircontainer_p.h" +#include <private/qpaircontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h index 73d0cfb..187bcdc 100644 --- a/src/xmlpatterns/expr/qrangevariablereference_p.h +++ b/src/xmlpatterns/expr/qrangevariablereference_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_RangeVariableReference_H #define Patternist_RangeVariableReference_H -#include "qvariablereference_p.h" +#include <private/qvariablereference_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h index fdc441a..e3678d1 100644 --- a/src/xmlpatterns/expr/qreturnorderby_p.h +++ b/src/xmlpatterns/expr/qreturnorderby_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_ReturnOrderBy_H #define Patternist_ReturnOrderBy_H -#include "qorderby_p.h" -#include "qunlimitedcontainer_p.h" +#include <private/qorderby_p.h> +#include <private/qunlimitedcontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h index 0082d23..f636567 100644 --- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_SimpleContentConstructor_H #define Patternist_SimpleContentConstructor_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h index b4d9ae4..834fcbf 100644 --- a/src/xmlpatterns/expr/qsinglecontainer_p.h +++ b/src/xmlpatterns/expr/qsinglecontainer_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_SingleContainer_H #define Patternist_SingleContainer_H -#include "qexpression_p.h" +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h index 462f463..bcacd26 100644 --- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h +++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_StaticBaseURIStore_H #define Patternist_StaticBaseURIStore_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h index d520984..5a5aea5 100644 --- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h +++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_StaticCompatibilityStore_H #define Patternist_StaticCompatibilityStore_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h index ae1ca08..14f86be 100644 --- a/src/xmlpatterns/expr/qtemplate_p.h +++ b/src/xmlpatterns/expr/qtemplate_p.h @@ -55,11 +55,11 @@ #include <QSharedData> #include <QVector> -#include "qdynamiccontext_p.h" -#include "qexpression_p.h" -#include "qsourcelocationreflection_p.h" -#include "qtemplateinvoker_p.h" -#include "qvariabledeclaration_p.h" +#include <private/qdynamiccontext_p.h> +#include <private/qexpression_p.h> +#include <private/qsourcelocationreflection_p.h> +#include <private/qtemplateinvoker_p.h> +#include <private/qvariabledeclaration_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h index b1362fb..6aff77b 100644 --- a/src/xmlpatterns/expr/qtemplateinvoker_p.h +++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_TemplateInvoker_H #define Patternist_TemplateInvoker_H -#include "qcallsite_p.h" -#include "qwithparam_p.h" +#include <private/qcallsite_p.h> +#include <private/qwithparam_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qtemplatemode_p.h b/src/xmlpatterns/expr/qtemplatemode_p.h index c05ed06..d0e5dcf 100644 --- a/src/xmlpatterns/expr/qtemplatemode_p.h +++ b/src/xmlpatterns/expr/qtemplatemode_p.h @@ -55,7 +55,7 @@ #include <QtCore/QSharedData> #include <QXmlName> -#include "qtemplatepattern_p.h" +#include <private/qtemplatepattern_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h index c7d3d62..8510006 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h +++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_TemplateParameterReference_H #define Patternist_TemplateParameterReference_H -#include "qvariabledeclaration_p.h" -#include "qemptycontainer_p.h" +#include <private/qvariabledeclaration_p.h> +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qtemplatepattern_p.h b/src/xmlpatterns/expr/qtemplatepattern_p.h index 0b656be..97b2b8e 100644 --- a/src/xmlpatterns/expr/qtemplatepattern_p.h +++ b/src/xmlpatterns/expr/qtemplatepattern_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_TemplatePattern_H #define Patternist_TemplatePattern_H -#include "qtemplate_p.h" +#include <private/qtemplate_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h index 8862e6f..fb53bc1 100644 --- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h +++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_TextNodeConstructor_H #define Patternist_TextNodeConstructor_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h index 341b226..0e9a98e 100644 --- a/src/xmlpatterns/expr/qtreatas_p.h +++ b/src/xmlpatterns/expr/qtreatas_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_TreatAs_H #define Patternist_TreatAs_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h index c2f0dfc..caed4c1 100644 --- a/src/xmlpatterns/expr/qtriplecontainer_p.h +++ b/src/xmlpatterns/expr/qtriplecontainer_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_TripleContainer_H #define Patternist_TripleContainer_H -#include "qexpression_p.h" +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h index 7e9bdeb..c450551 100644 --- a/src/xmlpatterns/expr/qtruthpredicate_p.h +++ b/src/xmlpatterns/expr/qtruthpredicate_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_TruthPredicate_H #define Patternist_TruthPredicate_H -#include "qgenericpredicate_p.h" +#include <private/qgenericpredicate_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h index fb50563..b5fcdbc 100644 --- a/src/xmlpatterns/expr/qunaryexpression_p.h +++ b/src/xmlpatterns/expr/qunaryexpression_p.h @@ -56,7 +56,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#include "qarithmeticexpression_p.h" +#include <private/qarithmeticexpression_p.h> namespace QPatternist { diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h index ab0e64c..8148627 100644 --- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h +++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h @@ -53,8 +53,8 @@ #define Patternist_UnlimitedContainer_H #include <QList> -#include "qexpression_p.h" -#include "qgenericsequencetype_p.h" +#include <private/qexpression_p.h> +#include <private/qgenericsequencetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h index 3c9e365..1d8ebaa 100644 --- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h +++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_UnresolvedVariableReference_H #define Patternist_UnresolvedVariableReference_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h index 84b7e41..f58681d 100644 --- a/src/xmlpatterns/expr/quserfunction_p.h +++ b/src/xmlpatterns/expr/quserfunction_p.h @@ -56,9 +56,9 @@ template<typename T> class QList; #include <QSharedData> -#include "qexpression_p.h" -#include "qfunctionsignature_p.h" -#include "qvariabledeclaration_p.h" +#include <private/qexpression_p.h> +#include <private/qfunctionsignature_p.h> +#include <private/qvariabledeclaration_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h index 87ca242..9b6ae7d 100644 --- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h +++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h @@ -52,11 +52,11 @@ #ifndef Patternist_UserFunctionCallsite_H #define Patternist_UserFunctionCallsite_H -#include "qcallsite_p.h" -#include "qfunctionsignature_p.h" -#include "qunlimitedcontainer_p.h" -#include "quserfunction_p.h" -#include "qvariabledeclaration_p.h" +#include <private/qcallsite_p.h> +#include <private/qfunctionsignature_p.h> +#include <private/qunlimitedcontainer_p.h> +#include <private/quserfunction_p.h> +#include <private/qvariabledeclaration_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qvalidate_p.h b/src/xmlpatterns/expr/qvalidate_p.h index 4fa9ef7..a7f36e9 100644 --- a/src/xmlpatterns/expr/qvalidate_p.h +++ b/src/xmlpatterns/expr/qvalidate_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Validate_H #define Patternist_Validate_H -#include "qexpression_p.h" +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h index 0c67998..77d9382 100644 --- a/src/xmlpatterns/expr/qvaluecomparison_p.h +++ b/src/xmlpatterns/expr/qvaluecomparison_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_ValueComparison_H #define Patternist_ValueComparison_H -#include "qatomiccomparator_p.h" -#include "qpaircontainer_p.h" -#include "qcomparisonplatform_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qpaircontainer_p.h> +#include <private/qcomparisonplatform_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qvariabledeclaration_p.h b/src/xmlpatterns/expr/qvariabledeclaration_p.h index 3801db8..5eba0ec 100644 --- a/src/xmlpatterns/expr/qvariabledeclaration_p.h +++ b/src/xmlpatterns/expr/qvariabledeclaration_p.h @@ -54,9 +54,9 @@ #include <QSharedData> -#include "qexpression_p.h" -#include "qpatternistlocale_p.h" -#include "qvariablereference_p.h" +#include <private/qexpression_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qvariablereference_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h index 97f447c..b5a50f0 100644 --- a/src/xmlpatterns/expr/qvariablereference_p.h +++ b/src/xmlpatterns/expr/qvariablereference_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_VariableReference_H #define Patternist_VariableReference_H -#include "qemptycontainer_p.h" +#include <private/qemptycontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qwithparam_p.h b/src/xmlpatterns/expr/qwithparam_p.h index 9a1da63..54a66d9 100644 --- a/src/xmlpatterns/expr/qwithparam_p.h +++ b/src/xmlpatterns/expr/qwithparam_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_TemplateParam_H #define Patternist_TemplateParam_H -#include "qfunctionargument_p.h" +#include <private/qfunctionargument_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h index 56d0027..dde3d33 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XSLTSimpleContentConstructor_H #define Patternist_XSLTSimpleContentConstructor_H -#include "qsimplecontentconstructor_p.h" +#include <private/qsimplecontentconstructor_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h index fd558d7..63fe415 100644 --- a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h +++ b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_AbstractFunctionFactory_H #define Patternist_AbstractFunctionFactory_H -#include "qcommonnamespaces_p.h" -#include "qfunctionfactory_p.h" -#include "qfunctionsignature_p.h" +#include <private/qcommonnamespaces_p.h> +#include <private/qfunctionfactory_p.h> +#include <private/qfunctionsignature_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h index 34df197..95a0ed9 100644 --- a/src/xmlpatterns/functions/qaccessorfns_p.h +++ b/src/xmlpatterns/functions/qaccessorfns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AccessorFNs_H #define Patternist_AccessorFNs_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h index 08a2efd..ee53aba 100644 --- a/src/xmlpatterns/functions/qaggregatefns_p.h +++ b/src/xmlpatterns/functions/qaggregatefns_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_AggregateFNs_H #define Patternist_AggregateFNs_H -#include "qaggregator_p.h" -#include "qatomiccomparator_p.h" -#include "qatomicmathematician_p.h" -#include "qcomparisonplatform_p.h" +#include <private/qaggregator_p.h> +#include <private/qatomiccomparator_p.h> +#include <private/qatomicmathematician_p.h> +#include <private/qcomparisonplatform_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h index fc74452..30f54a3 100644 --- a/src/xmlpatterns/functions/qaggregator_p.h +++ b/src/xmlpatterns/functions/qaggregator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Aggregator_H #define Patternist_Aggregator_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h index defc460..490ea26 100644 --- a/src/xmlpatterns/functions/qassemblestringfns_p.h +++ b/src/xmlpatterns/functions/qassemblestringfns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AssembleStringFNs_H #define Patternist_AssembleStringFNs_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h index 740dbbb..6dd2e61 100644 --- a/src/xmlpatterns/functions/qbooleanfns_p.h +++ b/src/xmlpatterns/functions/qbooleanfns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_BooleanFNs_H #define Patternist_BooleanFNs_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h index 76f0e1f..867d037 100644 --- a/src/xmlpatterns/functions/qcomparescaseaware_p.h +++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ComparesCaseAware_H #define Patternist_ComparesCaseAware_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h index 75a5b36..ef87099 100644 --- a/src/xmlpatterns/functions/qcomparestringfns_p.h +++ b/src/xmlpatterns/functions/qcomparestringfns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CompareStringFNs_H #define Patternist_CompareStringFNs_H -#include "qcomparescaseaware_p.h" +#include <private/qcomparescaseaware_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h index 3a8b7f4..1684aab 100644 --- a/src/xmlpatterns/functions/qcomparingaggregator_p.h +++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h @@ -58,14 +58,14 @@ * and <tt>fn:min()</tt>, MinFN, and the class ComparingAggregator. */ -#include "qabstractfloat_p.h" -#include "qdecimal_p.h" -#include "qcastingplatform_p.h" -#include "qcomparisonplatform_p.h" -#include "qliteral_p.h" -#include "qaggregator_p.h" -#include "quntypedatomicconverter_p.h" -#include "qpatternistlocale_p.h" +#include <private/qabstractfloat_p.h> +#include <private/qdecimal_p.h> +#include <private/qcastingplatform_p.h> +#include <private/qcomparisonplatform_p.h> +#include <private/qliteral_p.h> +#include <private/qaggregator_p.h> +#include <private/quntypedatomicconverter_p.h> +#include <private/qpatternistlocale_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h index 390c4ae..42a6ebf 100644 --- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h +++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_ConstructorFunctionsFactory_H #define Patternist_ConstructorFunctionsFactory_H -#include "qabstractfunctionfactory_p.h" -#include "qschematypefactory_p.h" +#include <private/qabstractfunctionfactory_p.h> +#include <private/qschematypefactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h index 8485d3d..094a06f 100644 --- a/src/xmlpatterns/functions/qcontextfns_p.h +++ b/src/xmlpatterns/functions/qcontextfns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ContextFNs_H #define Patternist_ContextFNs_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qcontextnodechecker_p.h b/src/xmlpatterns/functions/qcontextnodechecker_p.h index b1933f5..0353a56 100644 --- a/src/xmlpatterns/functions/qcontextnodechecker_p.h +++ b/src/xmlpatterns/functions/qcontextnodechecker_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ContextNodeChecker_H #define Patternist_ContextNodeChecker_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h index d873e8a..7b29ad6 100644 --- a/src/xmlpatterns/functions/qcurrentfn_p.h +++ b/src/xmlpatterns/functions/qcurrentfn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CurrentFN_H #define Patternist_CurrentFN_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h index 9583515..1214428 100644 --- a/src/xmlpatterns/functions/qdatetimefn_p.h +++ b/src/xmlpatterns/functions/qdatetimefn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_DateTimeFN_H #define Patternist_DateTimeFN_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h index d786ae7..a933426 100644 --- a/src/xmlpatterns/functions/qdatetimefns_p.h +++ b/src/xmlpatterns/functions/qdatetimefns_p.h @@ -52,13 +52,13 @@ #ifndef Patternist_DateTimeFNs_H #define Patternist_DateTimeFNs_H -#include "qatomiccomparator_p.h" -#include "qcommonvalues_p.h" -#include "qschemadatetime_p.h" -#include "qdaytimeduration_p.h" -#include "qdecimal_p.h" -#include "qinteger_p.h" -#include "qfunctioncall_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qcommonvalues_p.h> +#include <private/qschemadatetime_p.h> +#include <private/qdaytimeduration_p.h> +#include <private/qdecimal_p.h> +#include <private/qinteger_p.h> +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h index 31c876d..1208c0c 100644 --- a/src/xmlpatterns/functions/qdeepequalfn_p.h +++ b/src/xmlpatterns/functions/qdeepequalfn_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_DeepEqualFN_H #define Patternist_DeepEqualFN_H -#include "qatomiccomparator_p.h" -#include "qcomparisonplatform_p.h" -#include "qfunctioncall_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qcomparisonplatform_p.h> +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h index cfffd27..7de2f91 100644 --- a/src/xmlpatterns/functions/qdocumentfn_p.h +++ b/src/xmlpatterns/functions/qdocumentfn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_DocumentFN_H #define Patternist_DocumentFN_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h index cfec21c..f8c09c7 100644 --- a/src/xmlpatterns/functions/qelementavailablefn_p.h +++ b/src/xmlpatterns/functions/qelementavailablefn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ElementAvailableFN_H #define Patternist_ElementAvailableFN_H -#include "qstaticnamespacescontainer_p.h" +#include <private/qstaticnamespacescontainer_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h index e08e43a..af7d415 100644 --- a/src/xmlpatterns/functions/qerrorfn_p.h +++ b/src/xmlpatterns/functions/qerrorfn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ErrorFN_H #define Patternist_ErrorFN_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qfunctionargument_p.h b/src/xmlpatterns/functions/qfunctionargument_p.h index fc00f0f..d1ff151 100644 --- a/src/xmlpatterns/functions/qfunctionargument_p.h +++ b/src/xmlpatterns/functions/qfunctionargument_p.h @@ -55,8 +55,8 @@ #include <QList> #include <QSharedData> -#include "qxmlname.h" -#include "qsequencetype_p.h" +#include <QXmlName> +#include <private/qsequencetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h index 72cade8..0f588d4 100644 --- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h +++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_FunctionAvailableFN_H #define Patternist_FunctionAvailableFN_H -#include "qstaticnamespacescontainer_p.h" -#include "qfunctionfactory_p.h" +#include <private/qstaticnamespacescontainer_p.h> +#include <private/qfunctionfactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h index ab72628..82bfa39 100644 --- a/src/xmlpatterns/functions/qfunctioncall_p.h +++ b/src/xmlpatterns/functions/qfunctioncall_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_FunctionCall_H #define Patternist_FunctionCall_H -#include "qunlimitedcontainer_p.h" -#include "qfunctionsignature_p.h" -#include "qxpathhelper_p.h" +#include <private/qunlimitedcontainer_p.h> +#include <private/qfunctionsignature_p.h> +#include <private/qxpathhelper_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qfunctionfactory_p.h b/src/xmlpatterns/functions/qfunctionfactory_p.h index 334152e..45a238f 100644 --- a/src/xmlpatterns/functions/qfunctionfactory_p.h +++ b/src/xmlpatterns/functions/qfunctionfactory_p.h @@ -56,10 +56,10 @@ #include <QHash> #include <QSharedData> -#include "qexpression_p.h" -#include "qfunctionsignature_p.h" -#include "qprimitives_p.h" -#include "qxmlname.h" +#include <private/qexpression_p.h> +#include <private/qfunctionsignature_p.h> +#include <private/qprimitives_p.h> +#include <QXmlName> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h index f5de567..dba50f0 100644 --- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h +++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h @@ -53,7 +53,7 @@ #ifndef Patternist_FunctionFactoryCollection_H #define Patternist_FunctionFactoryCollection_H -#include "qfunctionfactory_p.h" +#include <private/qfunctionfactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h index 80e786c..5a14379 100644 --- a/src/xmlpatterns/functions/qfunctionsignature_p.h +++ b/src/xmlpatterns/functions/qfunctionsignature_p.h @@ -57,11 +57,11 @@ template<typename T> class QList; #include <QSharedData> -#include "qcalltargetdescription_p.h" -#include "qexpression_p.h" -#include "qfunctionargument_p.h" -#include "qpatternistlocale_p.h" -#include "qprimitives_p.h" +#include <private/qcalltargetdescription_p.h> +#include <private/qexpression_p.h> +#include <private/qfunctionargument_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qprimitives_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h index 3b5aacd..cd343a5 100644 --- a/src/xmlpatterns/functions/qgenerateidfn_p.h +++ b/src/xmlpatterns/functions/qgenerateidfn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_GenerateIDFN_H #define Patternist_GenerateIDFN_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h index 8ca4a10..38d13b2 100644 --- a/src/xmlpatterns/functions/qnodefns_p.h +++ b/src/xmlpatterns/functions/qnodefns_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_NodeFNs_H #define Patternist_NodeFNs_H -#include "qfunctioncall_p.h" -#include "qcastingplatform_p.h" +#include <private/qfunctioncall_p.h> +#include <private/qcastingplatform_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h index 2b73ed3..8f89879 100644 --- a/src/xmlpatterns/functions/qnumericfns_p.h +++ b/src/xmlpatterns/functions/qnumericfns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_NumericFNs_H #define Patternist_NumericFNs_H -#include "qaggregator_p.h" +#include <private/qaggregator_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h index 1fad10d..c1a8949 100644 --- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h +++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_PatternMatchingFNs_H #define Patternist_PatternMatchingFNs_H -#include "qpatternplatform_p.h" +#include <private/qpatternplatform_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h index a7f3fc6..51c7465 100644 --- a/src/xmlpatterns/functions/qpatternplatform_p.h +++ b/src/xmlpatterns/functions/qpatternplatform_p.h @@ -55,7 +55,7 @@ #include <QFlags> #include <QRegExp> -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h index 335389c..cbf1286 100644 --- a/src/xmlpatterns/functions/qqnamefns_p.h +++ b/src/xmlpatterns/functions/qqnamefns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_QNameFNs_H #define Patternist_QNameFNs_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h index cafc8c7..d41cc3a 100644 --- a/src/xmlpatterns/functions/qresolveurifn_p.h +++ b/src/xmlpatterns/functions/qresolveurifn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ResolveURIFN_H #define Patternist_ResolveURIFN_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h index fd9921d..5c41be1 100644 --- a/src/xmlpatterns/functions/qsequencefns_p.h +++ b/src/xmlpatterns/functions/qsequencefns_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_SequenceFNs_H #define Patternist_SequenceFNs_H -#include "qatomiccomparator_p.h" -#include "qcomparisonplatform_p.h" -#include "qliteral_p.h" -#include "qfunctioncall_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qcomparisonplatform_p.h> +#include <private/qliteral_p.h> +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h index d7d22e2..7581281 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h +++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_SequenceGeneratingFNs_H #define Patternist_SequenceGeneratingFNs_H -#include "qanyuri_p.h" -#include "qcontextnodechecker_p.h" -#include "qstaticbaseuricontainer_p.h" +#include <private/qanyuri_p.h> +#include <private/qcontextnodechecker_p.h> +#include <private/qstaticbaseuricontainer_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h index 9e81fb3..c110133 100644 --- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h +++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h @@ -54,7 +54,7 @@ #include <QUrl> -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h index 5463e5d..6deac9e 100644 --- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h +++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_StaticNamespacesContainer_H #define Patternist_StaticNamespacesContainer_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h index 6947763..f15045e 100644 --- a/src/xmlpatterns/functions/qstringvaluefns_p.h +++ b/src/xmlpatterns/functions/qstringvaluefns_p.h @@ -54,7 +54,7 @@ #include <QByteArray> -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h index 86fceab..2ec6338 100644 --- a/src/xmlpatterns/functions/qsubstringfns_p.h +++ b/src/xmlpatterns/functions/qsubstringfns_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_SubStringFNs_H #define Patternist_SubStringFNs_H -#include "qcomparescaseaware_p.h" +#include <private/qcomparescaseaware_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h index 052e8e6..d719b7c 100644 --- a/src/xmlpatterns/functions/qsystempropertyfn_p.h +++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_SystemPropertyFN_H #define Patternist_SystemPropertyFN_H -#include "qstaticnamespacescontainer_p.h" +#include <private/qstaticnamespacescontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h index 53530a2..2bbd01a 100644 --- a/src/xmlpatterns/functions/qtimezonefns_p.h +++ b/src/xmlpatterns/functions/qtimezonefns_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_TimezoneFNs_H #define Patternist_TimezoneFNs_H -#include "qatomiccomparator_p.h" -#include "qfunctioncall_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qfunctioncall_p.h> /** * @file diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h index 66a2f31..23588a7 100644 --- a/src/xmlpatterns/functions/qtracefn_p.h +++ b/src/xmlpatterns/functions/qtracefn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_TraceFN_H #define Patternist_TraceFN_H -#include "qfunctioncall_p.h" +#include <private/qfunctioncall_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h index 51ed928..40d1e37 100644 --- a/src/xmlpatterns/functions/qtypeavailablefn_p.h +++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_TypeAvailableFN_H #define Patternist_TypeAvailableFN_H -#include "qschematypefactory_p.h" -#include "qstaticnamespacescontainer_p.h" +#include <private/qschematypefactory_p.h> +#include <private/qstaticnamespacescontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h index ff5ade2..614748d 100644 --- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h +++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_UnparsedEntityPublicID_H #define Patternist_UnparsedEntityPublicID_H -#include "qcontextnodechecker_p.h" +#include <private/qcontextnodechecker_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h index 9df24a7..f977814 100644 --- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h +++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_UnparsedEntityURIFN_H #define Patternist_UnparsedEntityURIFN_H -#include "qcontextnodechecker_p.h" +#include <private/qcontextnodechecker_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h index 5ac72ba..83d214a 100644 --- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h +++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_UnparsedTextAvailableFN_H #define Patternist_UnparsedTextAvailableFN_H -#include "qstaticbaseuricontainer_p.h" +#include <private/qstaticbaseuricontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h index c53cb46..6ea8a84 100644 --- a/src/xmlpatterns/functions/qunparsedtextfn_p.h +++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_UnparsedTextFN_H #define Patternist_UnparsedTextFN_H -#include "qstaticbaseuricontainer_p.h" +#include <private/qstaticbaseuricontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h index d094a89..2e2894e 100644 --- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h +++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XPath10CoreFunctions_H #define Patternist_XPath10CoreFunctions_H -#include "qabstractfunctionfactory_p.h" +#include <private/qabstractfunctionfactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h index 164b57a..cccd94f 100644 --- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h +++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XPath20CoreFunctions_H #define Patternist_XPath20CoreFunctions_H -#include "qabstractfunctionfactory_p.h" +#include <private/qabstractfunctionfactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h index 1a5fb28..a78c3a9 100644 --- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h +++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XSLT20CoreFunctions_H #define Patternist_XSLT20CoreFunctions_H -#include "qabstractfunctionfactory_p.h" +#include <private/qabstractfunctionfactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h index db606df..1f9d779 100644 --- a/src/xmlpatterns/iterators/qcachingiterator_p.h +++ b/src/xmlpatterns/iterators/qcachingiterator_p.h @@ -55,8 +55,8 @@ #include <QList> #include <QVector> -#include "qdynamiccontext_p.h" -#include "qitem_p.h" +#include <private/qdynamiccontext_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h index 7d1a5eb..28356fe 100644 --- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h +++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h @@ -54,11 +54,11 @@ #include <QList> -#include "qexpression_p.h" -#include "qitem_p.h" -#include "qatomiccomparator_p.h" -#include "qcomparisonplatform_p.h" -#include "qsourcelocationreflection_p.h" +#include <private/qexpression_p.h> +#include <private/qitem_p.h> +#include <private/qatomiccomparator_p.h> +#include <private/qcomparisonplatform_p.h> +#include <private/qsourcelocationreflection_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h index 7f39d94..cc6eaed 100644 --- a/src/xmlpatterns/iterators/qdistinctiterator_p.h +++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h @@ -54,11 +54,11 @@ #include <QList> -#include "qexpression_p.h" -#include "qitem_p.h" -#include "qatomiccomparator_p.h" -#include "qcomparisonplatform_p.h" -#include "qsourcelocationreflection_p.h" +#include <private/qexpression_p.h> +#include <private/qitem_p.h> +#include <private/qatomiccomparator_p.h> +#include <private/qcomparisonplatform_p.h> +#include <private/qsourcelocationreflection_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h index a759ec3..03ea324 100644 --- a/src/xmlpatterns/iterators/qemptyiterator_p.h +++ b/src/xmlpatterns/iterators/qemptyiterator_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_EmptyIterator_H #define Patternist_EmptyIterator_H -#include "qabstractxmlforwarditerator_p.h" -#include "qprimitives_p.h" +#include <private/qabstractxmlforwarditerator_p.h> +#include <private/qprimitives_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h index cbd8221..d6c2d1c 100644 --- a/src/xmlpatterns/iterators/qexceptiterator_p.h +++ b/src/xmlpatterns/iterators/qexceptiterator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ExceptIterator_H #define Patternist_ExceptIterator_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h index 37eb672..3e4c054 100644 --- a/src/xmlpatterns/iterators/qindexofiterator_p.h +++ b/src/xmlpatterns/iterators/qindexofiterator_p.h @@ -52,11 +52,11 @@ #ifndef Patternist_IndexOfIterator_H #define Patternist_IndexOfIterator_H -#include "qitem_p.h" -#include "qatomiccomparator_p.h" -#include "qcomparisonplatform_p.h" -#include "qdynamiccontext_p.h" -#include "qexpression_p.h" +#include <private/qitem_p.h> +#include <private/qatomiccomparator_p.h> +#include <private/qcomparisonplatform_p.h> +#include <private/qdynamiccontext_p.h> +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h index 6c1c702..98197ff 100644 --- a/src/xmlpatterns/iterators/qinsertioniterator_p.h +++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_InsertionIterator_H #define Patternist_InsertionIterator_H -#include "qabstractxmlforwarditerator_p.h" -#include "qitem_p.h" +#include <private/qabstractxmlforwarditerator_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h index 9e7e834..526b4a9 100644 --- a/src/xmlpatterns/iterators/qintersectiterator_p.h +++ b/src/xmlpatterns/iterators/qintersectiterator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_IntersectIterator_H #define Patternist_IntersectIterator_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h index 1798bd7..8f9169f 100644 --- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h +++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_ItemMappingIterator_H #define Patternist_ItemMappingIterator_H -#include "qabstractxmlforwarditerator_p.h" -#include "qdynamiccontext_p.h" +#include <private/qabstractxmlforwarditerator_p.h> +#include <private/qdynamiccontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h index f449108..e325226 100644 --- a/src/xmlpatterns/iterators/qrangeiterator_p.h +++ b/src/xmlpatterns/iterators/qrangeiterator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_RangeIterator_H #define Patternist_RangeIterator_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h index a40c758..c45f280 100644 --- a/src/xmlpatterns/iterators/qremovaliterator_p.h +++ b/src/xmlpatterns/iterators/qremovaliterator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_RemovalIterator_H #define Patternist_RemovalIterator_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h index e12a0aa..00ba5bf 100644 --- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h +++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_SequenceMappingIterator_H #define Patternist_SequenceMappingIterator_H -#include "qabstractxmlforwarditerator_p.h" -#include "qdynamiccontext_p.h" +#include <private/qabstractxmlforwarditerator_p.h> +#include <private/qdynamiccontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h index 5fff0b6..6b28fb3 100644 --- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h +++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_SubsequenceIterator_H #define Patternist_SubsequenceIterator_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h index 4810cff..16e22de 100644 --- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h +++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ToCodepointsIterator_H #define Patternist_ToCodepointsIterator_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h index 9b85fc3..2f7caff 100644 --- a/src/xmlpatterns/iterators/qunioniterator_p.h +++ b/src/xmlpatterns/iterators/qunioniterator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_UnionIterator_H #define Patternist_UnionIterator_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h index a22fc96..62c5ac9 100644 --- a/src/xmlpatterns/janitors/qargumentconverter_p.h +++ b/src/xmlpatterns/janitors/qargumentconverter_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ArgumentConverter_H #define Patternist_ArgumentConverter_H -#include "quntypedatomicconverter_p.h" +#include <private/quntypedatomicconverter_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h index 206bb8f..ab8524b 100644 --- a/src/xmlpatterns/janitors/qatomizer_p.h +++ b/src/xmlpatterns/janitors/qatomizer_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_Atomizer_H #define Patternist_Atomizer_H -#include "qitem_p.h" -#include "qsinglecontainer_p.h" +#include <private/qitem_p.h> +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h index e89ebb9..c83b1ab 100644 --- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h +++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_CardinalityVerifier_H #define Patternist_CardinalityVerifier_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h index e1d9853..6984f82 100644 --- a/src/xmlpatterns/janitors/qebvextractor_p.h +++ b/src/xmlpatterns/janitors/qebvextractor_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_EBVExtractor_H #define Patternist_EBVExtractor_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h index b2af94f..285414b 100644 --- a/src/xmlpatterns/janitors/qitemverifier_p.h +++ b/src/xmlpatterns/janitors/qitemverifier_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ItemVerifier_H #define Patternist_ItemVerifier_H -#include "qsinglecontainer_p.h" +#include <private/qsinglecontainer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h index 159fbb0..bddc98f 100644 --- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h +++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_UntypedAtomicConverter_H #define Patternist_UntypedAtomicConverter_H -#include "qitem_p.h" -#include "qsinglecontainer_p.h" -#include "qcastingplatform_p.h" +#include <private/qitem_p.h> +#include <private/qsinglecontainer_p.h> +#include <private/qcastingplatform_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h index 17a67c3..e0031d4 100644 --- a/src/xmlpatterns/parser/qmaintainingreader_p.h +++ b/src/xmlpatterns/parser/qmaintainingreader_p.h @@ -58,8 +58,8 @@ #include <QStringList> #include <QXmlStreamReader> -#include "qxpathhelper_p.h" -#include "qxslttokenlookup_p.h" +#include <private/qxpathhelper_p.h> +#include <private/qxslttokenlookup_p.h> class QUrl; diff --git a/src/xmlpatterns/parser/qparsercontext_p.h b/src/xmlpatterns/parser/qparsercontext_p.h index f8109f9..976e588 100644 --- a/src/xmlpatterns/parser/qparsercontext_p.h +++ b/src/xmlpatterns/parser/qparsercontext_p.h @@ -59,13 +59,13 @@ #include <QtGlobal> #include <QXmlQuery> -#include "qbuiltintypes_p.h" -#include "qfunctionsignature_p.h" -#include "qorderby_p.h" -#include "qtemplatemode_p.h" -#include "quserfunctioncallsite_p.h" -#include "quserfunction_p.h" -#include "qvariabledeclaration_p.h" +#include <private/qbuiltintypes_p.h> +#include <private/qfunctionsignature_p.h> +#include <private/qorderby_p.h> +#include <private/qtemplatemode_p.h> +#include <private/quserfunctioncallsite_p.h> +#include <private/quserfunction_p.h> +#include <private/qvariabledeclaration_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/parser/qtokenizer_p.h b/src/xmlpatterns/parser/qtokenizer_p.h index 055fa3a..d8ea60b 100644 --- a/src/xmlpatterns/parser/qtokenizer_p.h +++ b/src/xmlpatterns/parser/qtokenizer_p.h @@ -57,8 +57,8 @@ #include <QString> #include <QUrl> -#include "qparsercontext_p.h" -#include "qtokensource_p.h" +#include <private/qparsercontext_p.h> +#include <private/qtokensource_p.h> /** * @file @@ -136,7 +136,7 @@ QT_END_NAMESPACE */ #define YYSTYPE QPatternist::TokenValue -#include "qquerytransformparser_p.h" /* This inclusion must be after TokenValue. */ +#include <private/qquerytransformparser_p.h> /* This inclusion must be after TokenValue. */ QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/parser/qtokenrevealer_p.h b/src/xmlpatterns/parser/qtokenrevealer_p.h index bcaaaab..f9695e9 100644 --- a/src/xmlpatterns/parser/qtokenrevealer_p.h +++ b/src/xmlpatterns/parser/qtokenrevealer_p.h @@ -54,7 +54,7 @@ #include <QSet> -#include "qtokenizer_p.h" +#include <private/qtokenizer_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/parser/qtokensource_p.h b/src/xmlpatterns/parser/qtokensource_p.h index 96daa17..244c132 100644 --- a/src/xmlpatterns/parser/qtokensource_p.h +++ b/src/xmlpatterns/parser/qtokensource_p.h @@ -52,16 +52,16 @@ #ifndef Patternist_TokenSource_H #define Patternist_TokenSource_H -#include "qatomiccomparator_p.h" -#include "qatomicmathematician_p.h" -#include "qcombinenodes_p.h" -#include "qfunctionargument_p.h" -#include "qitem_p.h" -#include "qitemtype_p.h" -#include "qorderby_p.h" -#include "qpath_p.h" -#include "qquerytransformparser_p.h" -#include "qvalidate_p.h" +#include <private/qatomiccomparator_p.h> +#include <private/qatomicmathematician_p.h> +#include <private/qcombinenodes_p.h> +#include <private/qfunctionargument_p.h> +#include <private/qitem_p.h> +#include <private/qitemtype_p.h> +#include <private/qorderby_p.h> +#include <private/qpath_p.h> +#include <private/qquerytransformparser_p.h> +#include <private/qvalidate_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp index d08d58d..47c0ad1 100644 --- a/src/xmlpatterns/parser/querytransformparser.ypp +++ b/src/xmlpatterns/parser/querytransformparser.ypp @@ -105,88 +105,88 @@ #include <QUrl> -#include "qabstractfloat_p.h" -#include "qandexpression_p.h" -#include "qanyuri_p.h" -#include "qapplytemplate_p.h" -#include "qargumentreference_p.h" -#include "qarithmeticexpression_p.h" -#include "qatomicstring_p.h" -#include "qattributeconstructor_p.h" -#include "qattributenamevalidator_p.h" -#include "qaxisstep_p.h" -#include "qbuiltintypes_p.h" -#include "qcalltemplate_p.h" -#include "qcastableas_p.h" -#include "qcastas_p.h" -#include "qcombinenodes_p.h" -#include "qcommentconstructor_p.h" -#include "qcommonnamespaces_p.h" -#include "qcommonsequencetypes_p.h" -#include "qcommonvalues_p.h" -#include "qcomputednamespaceconstructor_p.h" -#include "qcontextitem_p.h" -#include "qcopyof_p.h" -#include "qcurrentitemstore_p.h" -#include "qdebug_p.h" -#include "qdelegatingnamespaceresolver_p.h" -#include "qdocumentconstructor_p.h" -#include "qelementconstructor_p.h" -#include "qemptysequence_p.h" -#include "qemptysequencetype_p.h" -#include "qevaluationcache_p.h" -#include "qexpressionfactory_p.h" -#include "qexpressionsequence_p.h" -#include "qexpressionvariablereference_p.h" -#include "qexternalvariablereference_p.h" -#include "qforclause_p.h" -#include "qfunctioncall_p.h" -#include "qfunctionfactory_p.h" -#include "qfunctionsignature_p.h" -#include "qgeneralcomparison_p.h" -#include "qgenericpredicate_p.h" -#include "qgenericsequencetype_p.h" -#include "qifthenclause_p.h" -#include "qinstanceof_p.h" -#include "qletclause_p.h" -#include "qliteral_p.h" -#include "qlocalnametest_p.h" -#include "qnamespaceconstructor_p.h" -#include "qnamespacenametest_p.h" -#include "qncnameconstructor_p.h" -#include "qnodecomparison_p.h" -#include "qnodesort_p.h" -#include "qorderby_p.h" -#include "qorexpression_p.h" -#include "qparsercontext_p.h" -#include "qpath_p.h" -#include "qpatternistlocale_p.h" -#include "qpositionalvariablereference_p.h" -#include "qprocessinginstructionconstructor_p.h" -#include "qqnameconstructor_p.h" -#include "qqnametest_p.h" -#include "qqnamevalue_p.h" -#include "qquantifiedexpression_p.h" -#include "qrangeexpression_p.h" -#include "qrangevariablereference_p.h" -#include "qreturnorderby_p.h" -#include "qschemanumeric_p.h" -#include "qschematypefactory_p.h" -#include "qsimplecontentconstructor_p.h" -#include "qstaticbaseuristore_p.h" -#include "qstaticcompatibilitystore_p.h" -#include "qtemplateparameterreference_p.h" -#include "qtemplate_p.h" -#include "qtextnodeconstructor_p.h" -#include "qtokenizer_p.h" -#include "qtreatas_p.h" -#include "qtypechecker_p.h" -#include "qunaryexpression_p.h" -#include "qunresolvedvariablereference_p.h" -#include "quserfunctioncallsite_p.h" -#include "qvaluecomparison_p.h" -#include "qxpathhelper_p.h" -#include "qxsltsimplecontentconstructor_p.h" +#include <private/qabstractfloat_p.h> +#include <private/qandexpression_p.h> +#include <private/qanyuri_p.h> +#include <private/qapplytemplate_p.h> +#include <private/qargumentreference_p.h> +#include <private/qarithmeticexpression_p.h> +#include <private/qatomicstring_p.h> +#include <private/qattributeconstructor_p.h> +#include <private/qattributenamevalidator_p.h> +#include <private/qaxisstep_p.h> +#include <private/qbuiltintypes_p.h> +#include <private/qcalltemplate_p.h> +#include <private/qcastableas_p.h> +#include <private/qcastas_p.h> +#include <private/qcombinenodes_p.h> +#include <private/qcommentconstructor_p.h> +#include <private/qcommonnamespaces_p.h> +#include <private/qcommonsequencetypes_p.h> +#include <private/qcommonvalues_p.h> +#include <private/qcomputednamespaceconstructor_p.h> +#include <private/qcontextitem_p.h> +#include <private/qcopyof_p.h> +#include <private/qcurrentitemstore_p.h> +#include <private/qdebug_p.h> +#include <private/qdelegatingnamespaceresolver_p.h> +#include <private/qdocumentconstructor_p.h> +#include <private/qelementconstructor_p.h> +#include <private/qemptysequence_p.h> +#include <private/qemptysequencetype_p.h> +#include <private/qevaluationcache_p.h> +#include <private/qexpressionfactory_p.h> +#include <private/qexpressionsequence_p.h> +#include <private/qexpressionvariablereference_p.h> +#include <private/qexternalvariablereference_p.h> +#include <private/qforclause_p.h> +#include <private/qfunctioncall_p.h> +#include <private/qfunctionfactory_p.h> +#include <private/qfunctionsignature_p.h> +#include <private/qgeneralcomparison_p.h> +#include <private/qgenericpredicate_p.h> +#include <private/qgenericsequencetype_p.h> +#include <private/qifthenclause_p.h> +#include <private/qinstanceof_p.h> +#include <private/qletclause_p.h> +#include <private/qliteral_p.h> +#include <private/qlocalnametest_p.h> +#include <private/qnamespaceconstructor_p.h> +#include <private/qnamespacenametest_p.h> +#include <private/qncnameconstructor_p.h> +#include <private/qnodecomparison_p.h> +#include <private/qnodesort_p.h> +#include <private/qorderby_p.h> +#include <private/qorexpression_p.h> +#include <private/qparsercontext_p.h> +#include <private/qpath_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qpositionalvariablereference_p.h> +#include <private/qprocessinginstructionconstructor_p.h> +#include <private/qqnameconstructor_p.h> +#include <private/qqnametest_p.h> +#include <private/qqnamevalue_p.h> +#include <private/qquantifiedexpression_p.h> +#include <private/qrangeexpression_p.h> +#include <private/qrangevariablereference_p.h> +#include <private/qreturnorderby_p.h> +#include <private/qschemanumeric_p.h> +#include <private/qschematypefactory_p.h> +#include <private/qsimplecontentconstructor_p.h> +#include <private/qstaticbaseuristore_p.h> +#include <private/qstaticcompatibilitystore_p.h> +#include <private/qtemplateparameterreference_p.h> +#include <private/qtemplate_p.h> +#include <private/qtextnodeconstructor_p.h> +#include <private/qtokenizer_p.h> +#include <private/qtreatas_p.h> +#include <private/qtypechecker_p.h> +#include <private/qunaryexpression_p.h> +#include <private/qunresolvedvariablereference_p.h> +#include <private/quserfunctioncallsite_p.h> +#include <private/qvaluecomparison_p.h> +#include <private/qxpathhelper_p.h> +#include <private/qxsltsimplecontentconstructor_p.h> /* * The cpp generated with bison 2.1 wants to diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h index 2efcae8..73cf795 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer_p.h +++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h @@ -57,7 +57,7 @@ #include <QString> #include <QUrl> -#include "qtokenizer_p.h" +#include <private/qtokenizer_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/parser/qxslttokenizer_p.h b/src/xmlpatterns/parser/qxslttokenizer_p.h index f076f44..7429e1f 100644 --- a/src/xmlpatterns/parser/qxslttokenizer_p.h +++ b/src/xmlpatterns/parser/qxslttokenizer_p.h @@ -56,10 +56,10 @@ #include <QStack> #include <QUrl> -#include "qmaintainingreader_p.h" -#include "qreportcontext_p.h" -#include "qtokenizer_p.h" -#include "qxslttokenlookup_p.h" +#include <private/qmaintainingreader_p.h> +#include <private/qreportcontext_p.h> +#include <private/qtokenizer_p.h> +#include <private/qxslttokenlookup_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/projection/qdocumentprojector_p.h b/src/xmlpatterns/projection/qdocumentprojector_p.h index 42cb29d..f1fd963 100644 --- a/src/xmlpatterns/projection/qdocumentprojector_p.h +++ b/src/xmlpatterns/projection/qdocumentprojector_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_DocumentProjector_H #define Patternist_DocumentProjector_H -#include "qprojectedexpression_p.h" +#include <private/qprojectedexpression_p.h> #include "qabstractxmlreceiver.h" QT_BEGIN_HEADER diff --git a/src/xmlpatterns/projection/qprojectedexpression_p.h b/src/xmlpatterns/projection/qprojectedexpression_p.h index cfb4087..57e8fd6 100644 --- a/src/xmlpatterns/projection/qprojectedexpression_p.h +++ b/src/xmlpatterns/projection/qprojectedexpression_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_ProjectedExpression_H #define Patternist_ProjectedExpression_H -#include "qitem_p.h" +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qnamespacesupport_p.h b/src/xmlpatterns/schema/qnamespacesupport_p.h index 656026e..ddf8fb5 100644 --- a/src/xmlpatterns/schema/qnamespacesupport_p.h +++ b/src/xmlpatterns/schema/qnamespacesupport_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_NamespaceSupport_H #define Patternist_NamespaceSupport_H -#include "qnamepool_p.h" +#include <private/qnamepool_p.h> #include <QtCore/QExplicitlySharedDataPointer> #include <QtCore/QHash> diff --git a/src/xmlpatterns/schema/qxsdalternative_p.h b/src/xmlpatterns/schema/qxsdalternative_p.h index 588257d..ae288f1 100644 --- a/src/xmlpatterns/schema/qxsdalternative_p.h +++ b/src/xmlpatterns/schema/qxsdalternative_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_XsdAlternative_H #define Patternist_XsdAlternative_H -#include "qnamedschemacomponent_p.h" -#include "qschematype_p.h" -#include "qxsdannotated_p.h" -#include "qxsdxpathexpression_p.h" +#include <private/qnamedschemacomponent_p.h> +#include <private/qschematype_p.h> +#include <private/qxsdannotated_p.h> +#include <private/qxsdxpathexpression_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdannotated_p.h b/src/xmlpatterns/schema/qxsdannotated_p.h index 6885026..d6da693 100644 --- a/src/xmlpatterns/schema/qxsdannotated_p.h +++ b/src/xmlpatterns/schema/qxsdannotated_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XsdAnnotated_H #define Patternist_XsdAnnotated_H -#include "qxsdannotation_p.h" +#include <private/qxsdannotation_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdannotation_p.h b/src/xmlpatterns/schema/qxsdannotation_p.h index 447787f..a280cbd 100644 --- a/src/xmlpatterns/schema/qxsdannotation_p.h +++ b/src/xmlpatterns/schema/qxsdannotation_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdAnnotation_H #define Patternist_XsdAnnotation_H -#include "qderivedstring_p.h" -#include "qxsdapplicationinformation_p.h" -#include "qxsddocumentation_p.h" +#include <private/qderivedstring_p.h> +#include <private/qxsdapplicationinformation_p.h> +#include <private/qxsddocumentation_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h index 5df85b7..c01f566 100644 --- a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h +++ b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdApplicationInformation_H #define Patternist_XsdApplicationInformation_H -#include "qanytype_p.h" -#include "qanyuri_p.h" -#include "qnamedschemacomponent_p.h" +#include <private/qanytype_p.h> +#include <private/qanyuri_p.h> +#include <private/qnamedschemacomponent_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdassertion_p.h b/src/xmlpatterns/schema/qxsdassertion_p.h index 3839aee..b653ee5 100644 --- a/src/xmlpatterns/schema/qxsdassertion_p.h +++ b/src/xmlpatterns/schema/qxsdassertion_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdAssertion_H #define Patternist_XsdAssertion_H -#include "qnamedschemacomponent_p.h" -#include "qxsdannotated_p.h" -#include "qxsdxpathexpression_p.h" +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdannotated_p.h> +#include <private/qxsdxpathexpression_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdattribute_p.h b/src/xmlpatterns/schema/qxsdattribute_p.h index 169c48a..7e666ee 100644 --- a/src/xmlpatterns/schema/qxsdattribute_p.h +++ b/src/xmlpatterns/schema/qxsdattribute_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdAttribute_H #define Patternist_XsdAttribute_H -#include "qanysimpletype_p.h" -#include "qnamedschemacomponent_p.h" -#include "qxsdannotated_p.h" +#include <private/qanysimpletype_p.h> +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdannotated_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdattributegroup_p.h b/src/xmlpatterns/schema/qxsdattributegroup_p.h index aba4d01..80f83ce 100644 --- a/src/xmlpatterns/schema/qxsdattributegroup_p.h +++ b/src/xmlpatterns/schema/qxsdattributegroup_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdAttributeGroup_H #define Patternist_XsdAttributeGroup_H -#include "qxsdannotated_p.h" -#include "qxsdattributeuse_p.h" -#include "qxsdwildcard_p.h" +#include <private/qxsdannotated_p.h> +#include <private/qxsdattributeuse_p.h> +#include <private/qxsdwildcard_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h index 7bec32d..8209b7d 100644 --- a/src/xmlpatterns/schema/qxsdattributereference_p.h +++ b/src/xmlpatterns/schema/qxsdattributereference_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XsdAttributeReference_H #define Patternist_XsdAttributeReference_H -#include "qxsdattributeuse_p.h" +#include <private/qxsdattributeuse_p.h> #include <QtXmlPatterns/QSourceLocation> diff --git a/src/xmlpatterns/schema/qxsdattributeterm_p.h b/src/xmlpatterns/schema/qxsdattributeterm_p.h index 58c8017..3bc81fc 100644 --- a/src/xmlpatterns/schema/qxsdattributeterm_p.h +++ b/src/xmlpatterns/schema/qxsdattributeterm_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_XsdAttributeTerm_H #define Patternist_XsdAttributeTerm_H -#include "qnamedschemacomponent_p.h" -#include "qxsdannotated_p.h" +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdannotated_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h index e06407f..e5c8cd7 100644 --- a/src/xmlpatterns/schema/qxsdattributeuse_p.h +++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_XsdAttributeUse_H #define Patternist_XsdAttributeUse_H -#include "qxsdattribute_p.h" -#include "qxsdattributeterm_p.h" +#include <private/qxsdattribute_p.h> +#include <private/qxsdattributeterm_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h index 5e2a8dc..2c9565d 100644 --- a/src/xmlpatterns/schema/qxsdcomplextype_p.h +++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h @@ -52,13 +52,13 @@ #ifndef Patternist_XsdComplexType_H #define Patternist_XsdComplexType_H -#include "qanytype_p.h" -#include "qxsdassertion_p.h" -#include "qxsdattributeuse_p.h" -#include "qxsdparticle_p.h" -#include "qxsdsimpletype_p.h" -#include "qxsduserschematype_p.h" -#include "qxsdwildcard_p.h" +#include <private/qanytype_p.h> +#include <private/qxsdassertion_p.h> +#include <private/qxsdattributeuse_p.h> +#include <private/qxsdparticle_p.h> +#include <private/qxsdsimpletype_p.h> +#include <private/qxsduserschematype_p.h> +#include <private/qxsdwildcard_p.h> #include <QtCore/QSet> diff --git a/src/xmlpatterns/schema/qxsddocumentation_p.h b/src/xmlpatterns/schema/qxsddocumentation_p.h index 3ca2332..c4ff38d 100644 --- a/src/xmlpatterns/schema/qxsddocumentation_p.h +++ b/src/xmlpatterns/schema/qxsddocumentation_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_XsdDocumentation_H #define Patternist_XsdDocumentation_H -#include "qanytype_p.h" -#include "qanyuri_p.h" -#include "qderivedstring_p.h" -#include "qnamedschemacomponent_p.h" +#include <private/qanytype_p.h> +#include <private/qanyuri_p.h> +#include <private/qderivedstring_p.h> +#include <private/qnamedschemacomponent_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h index ac1755a..69afe4e 100644 --- a/src/xmlpatterns/schema/qxsdelement_p.h +++ b/src/xmlpatterns/schema/qxsdelement_p.h @@ -52,11 +52,11 @@ #ifndef Patternist_XsdElement_H #define Patternist_XsdElement_H -#include "qschemacomponent_p.h" -#include "qschematype_p.h" -#include "qxsdalternative_p.h" -#include "qxsdidentityconstraint_p.h" -#include "qxsdcomplextype_p.h" +#include <private/qschemacomponent_p.h> +#include <private/qschematype_p.h> +#include <private/qxsdalternative_p.h> +#include <private/qxsdidentityconstraint_p.h> +#include <private/qxsdcomplextype_p.h> #include <QtCore/QList> #include <QtCore/QSet> diff --git a/src/xmlpatterns/schema/qxsdfacet_p.h b/src/xmlpatterns/schema/qxsdfacet_p.h index a24f6bc..af4faf8 100644 --- a/src/xmlpatterns/schema/qxsdfacet_p.h +++ b/src/xmlpatterns/schema/qxsdfacet_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_XsdFacet_H #define Patternist_XsdFacet_H -#include "qitem_p.h" -#include "qnamedschemacomponent_p.h" -#include "qxsdannotated_p.h" -#include "qxsdassertion_p.h" +#include <private/qitem_p.h> +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdannotated_p.h> +#include <private/qxsdassertion_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdidcache_p.h b/src/xmlpatterns/schema/qxsdidcache_p.h index 56588f0..39fc8f7 100644 --- a/src/xmlpatterns/schema/qxsdidcache_p.h +++ b/src/xmlpatterns/schema/qxsdidcache_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XsdIdCache_H #define Patternist_XsdIdCache_H -#include "qschemacomponent_p.h" +#include <private/qschemacomponent_p.h> #include <QtCore/QExplicitlySharedDataPointer> #include <QtCore/QReadWriteLock> diff --git a/src/xmlpatterns/schema/qxsdidchelper_p.h b/src/xmlpatterns/schema/qxsdidchelper_p.h index 122b12d..01451b3 100644 --- a/src/xmlpatterns/schema/qxsdidchelper_p.h +++ b/src/xmlpatterns/schema/qxsdidchelper_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_XsdIdcHelper_H #define Patternist_XsdIdcHelper_H -#include "qreportcontext_p.h" -#include "qschematype_p.h" +#include <private/qreportcontext_p.h> +#include <private/qschematype_p.h> #include <QtXmlPatterns/QXmlItem> diff --git a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h index 7f083c3..6661df5 100644 --- a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h +++ b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdIdentityConstraint_H #define Patternist_XsdIdentityConstraint_H -#include "qnamedschemacomponent_p.h" -#include "qxsdannotated_p.h" -#include "qxsdxpathexpression_p.h" +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdannotated_p.h> +#include <private/qxsdxpathexpression_p.h> #include <QtCore/QStringList> diff --git a/src/xmlpatterns/schema/qxsdinstancereader_p.h b/src/xmlpatterns/schema/qxsdinstancereader_p.h index 2217d64..2c089b9 100644 --- a/src/xmlpatterns/schema/qxsdinstancereader_p.h +++ b/src/xmlpatterns/schema/qxsdinstancereader_p.h @@ -53,8 +53,8 @@ #define Patternist_XsdInstanceReader_H #include "qabstractxmlnodemodel.h" -#include "qpullbridge_p.h" -#include "qxsdschemacontext_p.h" +#include <private/qpullbridge_p.h> +#include <private/qxsdschemacontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h index 56b0ed0..dcafd5e 100644 --- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h +++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_XsdModelGroup_H #define Patternist_XsdModelGroup_H -#include "qxsdparticle_p.h" -#include "qxsdterm_p.h" +#include <private/qxsdparticle_p.h> +#include <private/qxsdterm_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdnotation_p.h b/src/xmlpatterns/schema/qxsdnotation_p.h index fd54e48..23bf50d 100644 --- a/src/xmlpatterns/schema/qxsdnotation_p.h +++ b/src/xmlpatterns/schema/qxsdnotation_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_XsdNotation_H #define Patternist_XsdNotation_H -#include "qanyuri_p.h" -#include "qderivedstring_p.h" -#include "qnamedschemacomponent_p.h" -#include "qxsdannotated_p.h" +#include <private/qanyuri_p.h> +#include <private/qderivedstring_p.h> +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdannotated_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdparticle_p.h b/src/xmlpatterns/schema/qxsdparticle_p.h index 5d7e554..beea28b 100644 --- a/src/xmlpatterns/schema/qxsdparticle_p.h +++ b/src/xmlpatterns/schema/qxsdparticle_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_XsdParticle_H #define Patternist_XsdParticle_H -#include "qnamedschemacomponent_p.h" -#include "qxsdterm_p.h" +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdterm_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdparticlechecker_p.h b/src/xmlpatterns/schema/qxsdparticlechecker_p.h index 14c5d84..68134a5 100644 --- a/src/xmlpatterns/schema/qxsdparticlechecker_p.h +++ b/src/xmlpatterns/schema/qxsdparticlechecker_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_XsdParticleChecker_H #define Patternist_XsdParticleChecker_H -#include "qxsdelement_p.h" -#include "qxsdparticle_p.h" -#include "qxsdschemacontext_p.h" -#include "qxsdwildcard_p.h" +#include <private/qxsdelement_p.h> +#include <private/qxsdparticle_p.h> +#include <private/qxsdschemacontext_p.h> +#include <private/qxsdwildcard_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h index c32f57f..996e91d 100644 --- a/src/xmlpatterns/schema/qxsdreference_p.h +++ b/src/xmlpatterns/schema/qxsdreference_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XsdReference_H #define Patternist_XsdReference_H -#include "qxsdterm_p.h" +#include <private/qxsdterm_p.h> #include <QtXmlPatterns/QSourceLocation> diff --git a/src/xmlpatterns/schema/qxsdschema_p.h b/src/xmlpatterns/schema/qxsdschema_p.h index f563543..d746a01 100644 --- a/src/xmlpatterns/schema/qxsdschema_p.h +++ b/src/xmlpatterns/schema/qxsdschema_p.h @@ -52,16 +52,16 @@ #ifndef Patternist_XsdSchema_H #define Patternist_XsdSchema_H -#include "qschematype_p.h" -#include "qxsdannotated_p.h" -#include "qxsdattribute_p.h" -#include "qxsdattributegroup_p.h" -#include "qxsdcomplextype_p.h" -#include "qxsdelement_p.h" -#include "qxsdidentityconstraint_p.h" -#include "qxsdmodelgroup_p.h" -#include "qxsdnotation_p.h" -#include "qxsdsimpletype_p.h" +#include <private/qschematype_p.h> +#include <private/qxsdannotated_p.h> +#include <private/qxsdattribute_p.h> +#include <private/qxsdattributegroup_p.h> +#include <private/qxsdcomplextype_p.h> +#include <private/qxsdelement_p.h> +#include <private/qxsdidentityconstraint_p.h> +#include <private/qxsdmodelgroup_p.h> +#include <private/qxsdnotation_p.h> +#include <private/qxsdsimpletype_p.h> #include <QtCore/QHash> #include <QtCore/QReadWriteLock> diff --git a/src/xmlpatterns/schema/qxsdschemachecker_p.h b/src/xmlpatterns/schema/qxsdschemachecker_p.h index b94948d..09abc6e 100644 --- a/src/xmlpatterns/schema/qxsdschemachecker_p.h +++ b/src/xmlpatterns/schema/qxsdschemachecker_p.h @@ -52,14 +52,14 @@ #ifndef Patternist_XsdSchemaChecker_H #define Patternist_XsdSchemaChecker_H -#include "qschematype_p.h" -#include "qxsdattribute_p.h" -#include "qxsdattributegroup_p.h" -#include "qxsdelement_p.h" -#include "qxsdmodelgroup_p.h" -#include "qxsdnotation_p.h" -#include "qxsdschema_p.h" -#include "qxsdsimpletype_p.h" +#include <private/qschematype_p.h> +#include <private/qxsdattribute_p.h> +#include <private/qxsdattributegroup_p.h> +#include <private/qxsdelement_p.h> +#include <private/qxsdmodelgroup_p.h> +#include <private/qxsdnotation_p.h> +#include <private/qxsdschema_p.h> +#include <private/qxsdsimpletype_p.h> #include <QtCore/QExplicitlySharedDataPointer> diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h index c83f9b5..d258c89 100644 --- a/src/xmlpatterns/schema/qxsdschemacontext_p.h +++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h @@ -52,13 +52,13 @@ #ifndef Patternist_XsdSchemaContext_H #define Patternist_XsdSchemaContext_H -#include "qnamedschemacomponent_p.h" -#include "qreportcontext_p.h" -#include "qschematypefactory_p.h" -#include "qxsdschematoken_p.h" -#include "qxsdschema_p.h" -#include "qxsdschemachecker_p.h" -#include "qxsdschemaresolver_p.h" +#include <private/qnamedschemacomponent_p.h> +#include <private/qreportcontext_p.h> +#include <private/qschematypefactory_p.h> +#include <private/qxsdschematoken_p.h> +#include <private/qxsdschema_p.h> +#include <private/qxsdschemachecker_p.h> +#include <private/qxsdschemaresolver_p.h> #include <QtCore/QUrl> #include <QtNetwork/QNetworkAccessManager> diff --git a/src/xmlpatterns/schema/qxsdschemadebugger_p.h b/src/xmlpatterns/schema/qxsdschemadebugger_p.h index 728359d..4893919 100644 --- a/src/xmlpatterns/schema/qxsdschemadebugger_p.h +++ b/src/xmlpatterns/schema/qxsdschemadebugger_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XsdSchemaDebugger_H #define Patternist_XsdSchemaDebugger_H -#include "qxsdschema_p.h" +#include <private/qxsdschema_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdschemahelper_p.h b/src/xmlpatterns/schema/qxsdschemahelper_p.h index 22e74e2..3800ca7 100644 --- a/src/xmlpatterns/schema/qxsdschemahelper_p.h +++ b/src/xmlpatterns/schema/qxsdschemahelper_p.h @@ -52,13 +52,13 @@ #ifndef Patternist_XsdSchemaHelper_H #define Patternist_XsdSchemaHelper_H -#include "qcomparisonfactory_p.h" -#include "qschematype_p.h" -#include "qxsdattributegroup_p.h" -#include "qxsdelement_p.h" -#include "qxsdparticle_p.h" -#include "qxsdschemacontext_p.h" -#include "qxsdwildcard_p.h" +#include <private/qcomparisonfactory_p.h> +#include <private/qschematype_p.h> +#include <private/qxsdattributegroup_p.h> +#include <private/qxsdelement_p.h> +#include <private/qxsdparticle_p.h> +#include <private/qxsdschemacontext_p.h> +#include <private/qxsdwildcard_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdschemamerger_p.h b/src/xmlpatterns/schema/qxsdschemamerger_p.h index 48d2249..2b1c0de 100644 --- a/src/xmlpatterns/schema/qxsdschemamerger_p.h +++ b/src/xmlpatterns/schema/qxsdschemamerger_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XsdSchemaMerger_H #define Patternist_XsdSchemaMerger_H -#include "qxsdschema_p.h" +#include <private/qxsdschema_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h index ae2442e..ae721ff 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser_p.h +++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h @@ -52,20 +52,20 @@ #ifndef Patternist_XsdSchemaParser_H #define Patternist_XsdSchemaParser_H -#include "qnamespacesupport_p.h" -#include "qxsdalternative_p.h" -#include "qxsdattribute_p.h" -#include "qxsdattributegroup_p.h" -#include "qxsdattributeterm_p.h" -#include "qxsdcomplextype_p.h" -#include "qxsdelement_p.h" -#include "qxsdidcache_p.h" -#include "qxsdmodelgroup_p.h" -#include "qxsdnotation_p.h" -#include "qxsdsimpletype_p.h" -#include "qxsdschemacontext_p.h" -#include "qxsdschemaparsercontext_p.h" -#include "qxsdstatemachine_p.h" +#include <private/qnamespacesupport_p.h> +#include <private/qxsdalternative_p.h> +#include <private/qxsdattribute_p.h> +#include <private/qxsdattributegroup_p.h> +#include <private/qxsdattributeterm_p.h> +#include <private/qxsdcomplextype_p.h> +#include <private/qxsdelement_p.h> +#include <private/qxsdidcache_p.h> +#include <private/qxsdmodelgroup_p.h> +#include <private/qxsdnotation_p.h> +#include <private/qxsdsimpletype_p.h> +#include <private/qxsdschemacontext_p.h> +#include <private/qxsdschemaparsercontext_p.h> +#include <private/qxsdstatemachine_p.h> #include <QtCore/QHash> #include <QtCore/QSet> diff --git a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h index ed07808..808b82c 100644 --- a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h +++ b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h @@ -52,12 +52,12 @@ #ifndef Patternist_XsdSchemaParserContext_H #define Patternist_XsdSchemaParserContext_H -#include "qmaintainingreader_p.h" // for definition of ElementDescription -#include "qxsdschematoken_p.h" -#include "qxsdschema_p.h" -#include "qxsdschemachecker_p.h" -#include "qxsdschemacontext_p.h" -#include "qxsdschemaresolver_p.h" +#include <private/qmaintainingreader_p.h> // for definition of ElementDescription +#include <private/qxsdschematoken_p.h> +#include <private/qxsdschema_p.h> +#include <private/qxsdschemachecker_p.h> +#include <private/qxsdschemacontext_p.h> +#include <private/qxsdschemaresolver_p.h> #include <QtCore/QSharedData> diff --git a/src/xmlpatterns/schema/qxsdschemaresolver_p.h b/src/xmlpatterns/schema/qxsdschemaresolver_p.h index dd1fbe3..bff1e0d 100644 --- a/src/xmlpatterns/schema/qxsdschemaresolver_p.h +++ b/src/xmlpatterns/schema/qxsdschemaresolver_p.h @@ -52,19 +52,19 @@ #ifndef Patternist_XsdSchemaResolver_H #define Patternist_XsdSchemaResolver_H -#include "qnamespacesupport_p.h" -#include "qschematype_p.h" -#include "qschematypefactory_p.h" -#include "qxsdalternative_p.h" -#include "qxsdattribute_p.h" -#include "qxsdattributegroup_p.h" -#include "qxsdelement_p.h" -#include "qxsdmodelgroup_p.h" -#include "qxsdnotation_p.h" -#include "qxsdreference_p.h" -#include "qxsdschema_p.h" -#include "qxsdschemachecker_p.h" -#include "qxsdsimpletype_p.h" +#include <private/qnamespacesupport_p.h> +#include <private/qschematype_p.h> +#include <private/qschematypefactory_p.h> +#include <private/qxsdalternative_p.h> +#include <private/qxsdattribute_p.h> +#include <private/qxsdattributegroup_p.h> +#include <private/qxsdelement_p.h> +#include <private/qxsdmodelgroup_p.h> +#include <private/qxsdnotation_p.h> +#include <private/qxsdreference_p.h> +#include <private/qxsdschema_p.h> +#include <private/qxsdschemachecker_p.h> +#include <private/qxsdsimpletype_p.h> #include <QtCore/QExplicitlySharedDataPointer> diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h index 2448083..0652a95 100644 --- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h +++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h @@ -53,7 +53,7 @@ #define Patternist_XsdSchemaTypesFactory_H #include <QtCore/QHash> -#include "qschematypefactory_p.h" +#include <private/qschematypefactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h index 9d5a047..576fe4c 100644 --- a/src/xmlpatterns/schema/qxsdsimpletype_p.h +++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdSimpleType_H #define Patternist_XsdSimpleType_H -#include "qanysimpletype_p.h" -#include "qxsdfacet_p.h" -#include "qxsduserschematype_p.h" +#include <private/qanysimpletype_p.h> +#include <private/qxsdfacet_p.h> +#include <private/qxsduserschematype_p.h> #include <QtCore/QSet> diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h index a332831..e248937 100644 --- a/src/xmlpatterns/schema/qxsdstatemachine_p.h +++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XsdStateMachine_H #define Patternist_XsdStateMachine_H -#include "qnamepool_p.h" +#include <private/qnamepool_p.h> #include <QtCore/QHash> #include <QtCore/QSet> diff --git a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h index 8c70be3..859eb1f 100644 --- a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h +++ b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdStateMachineBuilder_H #define Patternist_XsdStateMachineBuilder_H -#include "qxsdparticle_p.h" -#include "qxsdstatemachine_p.h" -#include "qxsdterm_p.h" +#include <private/qxsdparticle_p.h> +#include <private/qxsdstatemachine_p.h> +#include <private/qxsdterm_p.h> #include <QtCore/QExplicitlySharedDataPointer> #include <QtCore/QList> diff --git a/src/xmlpatterns/schema/qxsdterm_p.h b/src/xmlpatterns/schema/qxsdterm_p.h index bc4471a..ea597c6 100644 --- a/src/xmlpatterns/schema/qxsdterm_p.h +++ b/src/xmlpatterns/schema/qxsdterm_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_XsdTerm_H #define Patternist_XsdTerm_H -#include "qnamedschemacomponent_p.h" -#include "qxsdannotated_p.h" +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdannotated_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h index 4d2915b..fa0b6b5 100644 --- a/src/xmlpatterns/schema/qxsdtypechecker_p.h +++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h @@ -54,9 +54,9 @@ #include <QtXmlPatterns/QSourceLocation> -#include "qschematype_p.h" -#include "qsourcelocationreflection_p.h" -#include "qxsdschemacontext_p.h" +#include <private/qschematype_p.h> +#include <private/qsourcelocationreflection_p.h> +#include <private/qxsdschemacontext_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h index ed32dd3..eafcf7d 100644 --- a/src/xmlpatterns/schema/qxsduserschematype_p.h +++ b/src/xmlpatterns/schema/qxsduserschematype_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdUserSchemaType_H #define Patternist_XsdUserSchemaType_H -#include "qnamedschemacomponent_p.h" -#include "qschematype_p.h" -#include "qxsdannotated_p.h" +#include <private/qnamedschemacomponent_p.h> +#include <private/qschematype_p.h> +#include <private/qxsdannotated_p.h> template<typename N, typename M> class QHash; template<typename N> class QList; diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h index 8186d10..e759f3a 100644 --- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h +++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h @@ -54,10 +54,10 @@ #include "qabstractxmlnodemodel.h" -#include "qabstractxmlforwarditerator_p.h" -#include "qitem_p.h" -#include "qschematype_p.h" -#include "qxsdelement_p.h" +#include <private/qabstractxmlforwarditerator_p.h> +#include <private/qitem_p.h> +#include <private/qschematype_p.h> +#include <private/qxsdelement_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h index 4def19c..f9c50ae 100644 --- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h +++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_XsdValidatingInstanceReader_H #define Patternist_XsdValidatingInstanceReader_H -#include "qxsdidchelper_p.h" -#include "qxsdinstancereader_p.h" -#include "qxsdstatemachine_p.h" -#include "qxsdvalidatedxmlnodemodel_p.h" +#include <private/qxsdidchelper_p.h> +#include <private/qxsdinstancereader_p.h> +#include <private/qxsdstatemachine_p.h> +#include <private/qxsdvalidatedxmlnodemodel_p.h> #include <QtCore/QStack> diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h index 438ced2..5dc1316 100644 --- a/src/xmlpatterns/schema/qxsdwildcard_p.h +++ b/src/xmlpatterns/schema/qxsdwildcard_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XsdWildcard_H #define Patternist_XsdWildcard_H -#include "qxsdterm_p.h" +#include <private/qxsdterm_p.h> #include <QtCore/QSet> diff --git a/src/xmlpatterns/schema/qxsdxpathexpression_p.h b/src/xmlpatterns/schema/qxsdxpathexpression_p.h index 31d09da..e7c130a 100644 --- a/src/xmlpatterns/schema/qxsdxpathexpression_p.h +++ b/src/xmlpatterns/schema/qxsdxpathexpression_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_XsdXPathExpression_H #define Patternist_XsdXPathExpression_H -#include "qanyuri_p.h" -#include "qnamedschemacomponent_p.h" -#include "qxsdannotated_p.h" +#include <private/qanyuri_p.h> +#include <private/qnamedschemacomponent_p.h> +#include <private/qxsdannotated_p.h> #include <QtCore/QList> diff --git a/src/xmlpatterns/type/qabstractnodetest_p.h b/src/xmlpatterns/type/qabstractnodetest_p.h index 4511d57..55c7f30 100644 --- a/src/xmlpatterns/type/qabstractnodetest_p.h +++ b/src/xmlpatterns/type/qabstractnodetest_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AbstractNodeTest_H #define Patternist_AbstractNodeTest_H -#include "qanynodetype_p.h" +#include <private/qanynodetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qanyitemtype_p.h b/src/xmlpatterns/type/qanyitemtype_p.h index 3785a45..56e6bcb 100644 --- a/src/xmlpatterns/type/qanyitemtype_p.h +++ b/src/xmlpatterns/type/qanyitemtype_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AnyItemType_H #define Patternist_AnyItemType_H -#include "qatomictype_p.h" +#include <private/qatomictype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qanynodetype_p.h b/src/xmlpatterns/type/qanynodetype_p.h index bbf4bab..b6a36b0 100644 --- a/src/xmlpatterns/type/qanynodetype_p.h +++ b/src/xmlpatterns/type/qanynodetype_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_AnyNodeType_H #define Patternist_AnyNodeType_H -#include "qatomictype_p.h" -#include "qitem_p.h" +#include <private/qatomictype_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qanysimpletype_p.h b/src/xmlpatterns/type/qanysimpletype_p.h index 964bf12..a1f6725 100644 --- a/src/xmlpatterns/type/qanysimpletype_p.h +++ b/src/xmlpatterns/type/qanysimpletype_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AnySimpleType_H #define Patternist_AnySimpleType_H -#include "qanytype_p.h" +#include <private/qanytype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qanytype_p.h b/src/xmlpatterns/type/qanytype_p.h index 230cd65..26b26e7 100644 --- a/src/xmlpatterns/type/qanytype_p.h +++ b/src/xmlpatterns/type/qanytype_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AnyType_H #define Patternist_AnyType_H -#include "qschematype_p.h" +#include <private/qschematype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qatomiccasterlocator_p.h b/src/xmlpatterns/type/qatomiccasterlocator_p.h index 8c3207a..96de120 100644 --- a/src/xmlpatterns/type/qatomiccasterlocator_p.h +++ b/src/xmlpatterns/type/qatomiccasterlocator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AtomicCasterLocator_H #define Patternist_AtomicCasterLocator_H -#include "qatomictypedispatch_p.h" +#include <private/qatomictypedispatch_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qatomiccasterlocators_p.h b/src/xmlpatterns/type/qatomiccasterlocators_p.h index 76feac0..e4fee69 100644 --- a/src/xmlpatterns/type/qatomiccasterlocators_p.h +++ b/src/xmlpatterns/type/qatomiccasterlocators_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_AtomicCasterLocators_H #define Patternist_AtomicCasterLocators_H -#include "qatomiccasterlocator_p.h" -#include "qatomiccasters_p.h" -//#include "qderivedinteger_p.h" +#include <private/qatomiccasterlocator_p.h> +#include <private/qatomiccasters_p.h> +//#include <private/qderivedinteger_p.h> /** * @file diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h index 9e4a966..c5b1729 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h +++ b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AtomicComparatorLocator_H #define Patternist_AtomicComparatorLocator_H -#include "qatomictypedispatch_p.h" +#include <private/qatomictypedispatch_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h index 53fcca5..b5fb1b3 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h +++ b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AtomicComparatorLocators_H #define Patternist_AtomicComparatorLocators_H -#include "qatomiccomparatorlocator_p.h" +#include <private/qatomiccomparatorlocator_p.h> /** * @file diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h index 2f3150a..d2eee3c 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h +++ b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_AtomicTypeVisitorResultLocator_H #define Patternist_AtomicTypeVisitorResultLocator_H -#include "qatomictypedispatch_p.h" +#include <private/qatomictypedispatch_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h index 7f76e83..5dfecea 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h +++ b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_AtomicMathematicianLocators_H #define Patternist_AtomicMathematicianLocators_H -#include "qatomicmathematician_p.h" -#include "qatomicmathematicianlocator_p.h" +#include <private/qatomicmathematician_p.h> +#include <private/qatomicmathematicianlocator_p.h> /** * @file diff --git a/src/xmlpatterns/type/qatomictype_p.h b/src/xmlpatterns/type/qatomictype_p.h index 02a48be..120487a 100644 --- a/src/xmlpatterns/type/qatomictype_p.h +++ b/src/xmlpatterns/type/qatomictype_p.h @@ -52,12 +52,12 @@ #ifndef Patternist_AtomicType_H #define Patternist_AtomicType_H -#include "qanysimpletype_p.h" -#include "qatomiccasterlocator_p.h" -#include "qatomiccomparatorlocator_p.h" -#include "qatomicmathematicianlocator_p.h" -#include "qatomictypedispatch_p.h" -#include "qitemtype_p.h" +#include <private/qanysimpletype_p.h> +#include <private/qatomiccasterlocator_p.h> +#include <private/qatomiccomparatorlocator_p.h> +#include <private/qatomicmathematicianlocator_p.h> +#include <private/qatomictypedispatch_p.h> +#include <private/qitemtype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qbasictypesfactory_p.h b/src/xmlpatterns/type/qbasictypesfactory_p.h index e0916a9..91ac94b 100644 --- a/src/xmlpatterns/type/qbasictypesfactory_p.h +++ b/src/xmlpatterns/type/qbasictypesfactory_p.h @@ -53,7 +53,7 @@ #define Patternist_BuiltinTypesFactory_H #include <QHash> -#include "qschematypefactory_p.h" +#include <private/qschematypefactory_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qbuiltinatomictype_p.h b/src/xmlpatterns/type/qbuiltinatomictype_p.h index 874cd6d..9a8e96b 100644 --- a/src/xmlpatterns/type/qbuiltinatomictype_p.h +++ b/src/xmlpatterns/type/qbuiltinatomictype_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_BuiltinAtomicType_H #define Patternist_BuiltinAtomicType_H -#include "qatomictype_p.h" +#include <private/qatomictype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qbuiltinatomictypes_p.h b/src/xmlpatterns/type/qbuiltinatomictypes_p.h index d0e075c..6f9bc10 100644 --- a/src/xmlpatterns/type/qbuiltinatomictypes_p.h +++ b/src/xmlpatterns/type/qbuiltinatomictypes_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_BuiltinAtomicTypes_H #define Patternist_BuiltinAtomicTypes_H -#include "qatomiccasterlocators_p.h" -#include "qatomiccomparatorlocators_p.h" -#include "qbuiltinatomictype_p.h" +#include <private/qatomiccasterlocators_p.h> +#include <private/qatomiccomparatorlocators_p.h> +#include <private/qbuiltinatomictype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qbuiltinnodetype_p.h b/src/xmlpatterns/type/qbuiltinnodetype_p.h index 7f6eb4d..8967ad0 100644 --- a/src/xmlpatterns/type/qbuiltinnodetype_p.h +++ b/src/xmlpatterns/type/qbuiltinnodetype_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_BuiltinNodeType_H #define Patternist_BuiltinNodeType_H -#include "qitem_p.h" -#include "qanynodetype_p.h" -#include "qbuiltintypes_p.h" +#include <private/qitem_p.h> +#include <private/qanynodetype_p.h> +#include <private/qbuiltintypes_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qbuiltintypes_p.h b/src/xmlpatterns/type/qbuiltintypes_p.h index b998c5b..44ccd86 100644 --- a/src/xmlpatterns/type/qbuiltintypes_p.h +++ b/src/xmlpatterns/type/qbuiltintypes_p.h @@ -52,13 +52,13 @@ #ifndef Patternist_BuiltinTypes_H #define Patternist_BuiltinTypes_H -#include "qanynodetype_p.h" -#include "qanysimpletype_p.h" -#include "qanytype_p.h" -#include "qbuiltinatomictype_p.h" -#include "qitemtype_p.h" -#include "qnumerictype_p.h" -#include "quntyped_p.h" +#include <private/qanynodetype_p.h> +#include <private/qanysimpletype_p.h> +#include <private/qanytype_p.h> +#include <private/qbuiltinatomictype_p.h> +#include <private/qitemtype_p.h> +#include <private/qnumerictype_p.h> +#include <private/quntyped_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qcommonsequencetypes_p.h b/src/xmlpatterns/type/qcommonsequencetypes_p.h index b39493b..fd405b4 100644 --- a/src/xmlpatterns/type/qcommonsequencetypes_p.h +++ b/src/xmlpatterns/type/qcommonsequencetypes_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_CommonSequenceTypes_H #define Patternist_CommonSequenceTypes_H -#include "qemptysequencetype_p.h" -#include "qnonetype_p.h" +#include <private/qemptysequencetype_p.h> +#include <private/qnonetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qebvtype_p.h b/src/xmlpatterns/type/qebvtype_p.h index 13eaabc..50dfc8f 100644 --- a/src/xmlpatterns/type/qebvtype_p.h +++ b/src/xmlpatterns/type/qebvtype_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_EBVType_H #define Patternist_EBVType_H -#include "qatomictype_p.h" -#include "qsequencetype_p.h" +#include <private/qatomictype_p.h> +#include <private/qsequencetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qemptysequencetype_p.h b/src/xmlpatterns/type/qemptysequencetype_p.h index a89f181..dabaa3e 100644 --- a/src/xmlpatterns/type/qemptysequencetype_p.h +++ b/src/xmlpatterns/type/qemptysequencetype_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_EmptySequenceType_H #define Patternist_EmptySequenceType_H -#include "qatomictype_p.h" -#include "qsequencetype_p.h" +#include <private/qatomictype_p.h> +#include <private/qsequencetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qgenericsequencetype_p.h b/src/xmlpatterns/type/qgenericsequencetype_p.h index 996eb80..39cf78a 100644 --- a/src/xmlpatterns/type/qgenericsequencetype_p.h +++ b/src/xmlpatterns/type/qgenericsequencetype_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_GenericSequenceType_H #define Patternist_GenericSequenceType_H -#include "qcommonsequencetypes_p.h" -#include "qsequencetype_p.h" +#include <private/qcommonsequencetypes_p.h> +#include <private/qsequencetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h index 3f726ce..2519363 100644 --- a/src/xmlpatterns/type/qlocalnametest_p.h +++ b/src/xmlpatterns/type/qlocalnametest_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_LocalNameTest_H #define Patternist_LocalNameTest_H -#include "qabstractnodetest_p.h" +#include <private/qabstractnodetest_p.h> template<typename Key, typename Value> class QHash; diff --git a/src/xmlpatterns/type/qmultiitemtype_p.h b/src/xmlpatterns/type/qmultiitemtype_p.h index 7a50044..06d9395 100644 --- a/src/xmlpatterns/type/qmultiitemtype_p.h +++ b/src/xmlpatterns/type/qmultiitemtype_p.h @@ -54,7 +54,7 @@ #include <QList> -#include "qitemtype_p.h" +#include <private/qitemtype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qnamedschemacomponent_p.h b/src/xmlpatterns/type/qnamedschemacomponent_p.h index 25a4a57..3c9cd5e 100644 --- a/src/xmlpatterns/type/qnamedschemacomponent_p.h +++ b/src/xmlpatterns/type/qnamedschemacomponent_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_NamedSchemaComponent_H #define Patternist_NamedSchemaComponent_H -#include "qnamepool_p.h" -#include "qschemacomponent_p.h" -#include "qxmlname.h" +#include <private/qnamepool_p.h> +#include <private/qschemacomponent_p.h> +#include <QXmlName> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h index 5ce5213..2eb9280 100644 --- a/src/xmlpatterns/type/qnamespacenametest_p.h +++ b/src/xmlpatterns/type/qnamespacenametest_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_NamespaceNameTest_H #define Patternist_NamespaceNameTest_H -#include "qabstractnodetest_p.h" +#include <private/qabstractnodetest_p.h> template<typename Key, typename Value> class QHash; diff --git a/src/xmlpatterns/type/qnonetype_p.h b/src/xmlpatterns/type/qnonetype_p.h index 922bdcb..9596b36 100644 --- a/src/xmlpatterns/type/qnonetype_p.h +++ b/src/xmlpatterns/type/qnonetype_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_NoneType_H #define Patternist_NoneType_H -#include "qatomictype_p.h" -#include "qsequencetype_p.h" +#include <private/qatomictype_p.h> +#include <private/qsequencetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qnumerictype_p.h b/src/xmlpatterns/type/qnumerictype_p.h index 97ce9d4..5467aad 100644 --- a/src/xmlpatterns/type/qnumerictype_p.h +++ b/src/xmlpatterns/type/qnumerictype_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_NumericType_H #define Patternist_NumericType_H -#include "qatomictype_p.h" +#include <private/qatomictype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qqnametest_p.h b/src/xmlpatterns/type/qqnametest_p.h index fe5e383..63886d8 100644 --- a/src/xmlpatterns/type/qqnametest_p.h +++ b/src/xmlpatterns/type/qqnametest_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_QNameTest_H #define Patternist_QNameTest_H -#include "qabstractnodetest_p.h" +#include <private/qabstractnodetest_p.h> template<typename Key, typename Value> class QHash; diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h index 87b2bc1..701262e 100644 --- a/src/xmlpatterns/type/qschematype_p.h +++ b/src/xmlpatterns/type/qschematype_p.h @@ -52,9 +52,9 @@ #ifndef Patternist_SchemaType_H #define Patternist_SchemaType_H -#include "qnamepool_p.h" -#include "qschemacomponent_p.h" -#include "qxmlname.h" +#include <private/qnamepool_p.h> +#include <private/qschemacomponent_p.h> +#include <QXmlName> template<typename N, typename M> class QHash; template<typename N> class QList; diff --git a/src/xmlpatterns/type/qschematypefactory_p.h b/src/xmlpatterns/type/qschematypefactory_p.h index 519ca1a..38a37f0 100644 --- a/src/xmlpatterns/type/qschematypefactory_p.h +++ b/src/xmlpatterns/type/qschematypefactory_p.h @@ -54,9 +54,9 @@ #include <QSharedData> -#include "qreportcontext_p.h" -#include "qitemtype_p.h" -#include "qschematype_p.h" +#include <private/qreportcontext_p.h> +#include <private/qitemtype_p.h> +#include <private/qschematype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qsequencetype_p.h b/src/xmlpatterns/type/qsequencetype_p.h index a075a86..2483510 100644 --- a/src/xmlpatterns/type/qsequencetype_p.h +++ b/src/xmlpatterns/type/qsequencetype_p.h @@ -56,8 +56,8 @@ template<typename T> class QList; #include <QSharedData> -#include "qcardinality_p.h" -#include "qitemtype_p.h" +#include <private/qcardinality_p.h> +#include <private/qitemtype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qtypechecker_p.h b/src/xmlpatterns/type/qtypechecker_p.h index 23079bb..ff56631 100644 --- a/src/xmlpatterns/type/qtypechecker_p.h +++ b/src/xmlpatterns/type/qtypechecker_p.h @@ -52,8 +52,8 @@ #ifndef Patternist_TypeChecker_H #define Patternist_TypeChecker_H -#include "qstaticcontext_p.h" -#include "qexpression_p.h" +#include <private/qstaticcontext_p.h> +#include <private/qexpression_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/quntyped_p.h b/src/xmlpatterns/type/quntyped_p.h index 0ac5c00..3023791 100644 --- a/src/xmlpatterns/type/quntyped_p.h +++ b/src/xmlpatterns/type/quntyped_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_Untyped_H #define Patternist_Untyped_H -#include "qanytype_p.h" +#include <private/qanytype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/type/qxsltnodetest_p.h b/src/xmlpatterns/type/qxsltnodetest_p.h index 875c97d..6f5277a 100644 --- a/src/xmlpatterns/type/qxsltnodetest_p.h +++ b/src/xmlpatterns/type/qxsltnodetest_p.h @@ -52,7 +52,7 @@ #ifndef Patternist_XSLTNodeTest_H #define Patternist_XSLTNodeTest_H -#include "qanynodetype_p.h" +#include <private/qanynodetype_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h index 92ff0b2..9abc1b9 100644 --- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h @@ -54,7 +54,7 @@ #include <QHash> -#include "qnamespaceresolver_p.h" +#include <private/qnamespaceresolver_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h index 3088da7..c1b697d 100644 --- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h @@ -54,7 +54,7 @@ #include <QHash> -#include "qnamespaceresolver_p.h" +#include <private/qnamespaceresolver_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h index 255cc13..ba448e7 100644 --- a/src/xmlpatterns/utils/qnamespacebinding_p.h +++ b/src/xmlpatterns/utils/qnamespacebinding_p.h @@ -54,7 +54,7 @@ template<typename T> class QVector; -#include "qxmlname.h" +#include <QXmlName> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h index 19eab12..4ac9d30 100644 --- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h @@ -54,8 +54,8 @@ #include <QHash> -#include "qnamespaceresolver_p.h" -#include "qitem_p.h" +#include <private/qnamespaceresolver_p.h> +#include <private/qitem_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h index 5ca1b0e..ce99f02 100644 --- a/src/xmlpatterns/utils/qoutputvalidator_p.h +++ b/src/xmlpatterns/utils/qoutputvalidator_p.h @@ -54,9 +54,9 @@ #include <QSet> -#include "qdynamiccontext_p.h" +#include <private/qdynamiccontext_p.h> #include "qabstractxmlreceiver.h" -#include "qsourcelocationreflection_p.h" +#include <private/qsourcelocationreflection_p.h> QT_BEGIN_HEADER diff --git a/src/xmlpatterns/utils/qpatternistlocale_p.h b/src/xmlpatterns/utils/qpatternistlocale_p.h index 7530d18..f065d97 100644 --- a/src/xmlpatterns/utils/qpatternistlocale_p.h +++ b/src/xmlpatterns/utils/qpatternistlocale_p.h @@ -56,9 +56,9 @@ #include <QString> #include <QUrl> -#include "qcardinality_p.h" -#include "qnamepool_p.h" -#include "qprimitives_p.h" +#include <private/qcardinality_p.h> +#include <private/qnamepool_p.h> +#include <private/qprimitives_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qxpathhelper_p.h b/src/xmlpatterns/utils/qxpathhelper_p.h index b041f01..e004c8a 100644 --- a/src/xmlpatterns/utils/qxpathhelper_p.h +++ b/src/xmlpatterns/utils/qxpathhelper_p.h @@ -52,10 +52,10 @@ #ifndef Patternist_XPathHelper_H #define Patternist_XPathHelper_H -#include "qcommonnamespaces_p.h" -#include "qitem_p.h" -#include "qpatternistlocale_p.h" -#include "qreportcontext_p.h" +#include <private/qcommonnamespaces_p.h> +#include <private/qitem_p.h> +#include <private/qpatternistlocale_p.h> +#include <private/qreportcontext_p.h> QT_BEGIN_HEADER diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri index 631ed7f..1d978f3 100644 --- a/tests/auto/xmlpatterns.pri +++ b/tests/auto/xmlpatterns.pri @@ -16,19 +16,3 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { else:win32: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}d else: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}_debug } - -XMLPATTERNS_SOURCES = $$QT.xmlpatterns.sources -INCLUDEPATH += \ - $$XMLPATTERNS_SOURCES/acceltree \ - $$XMLPATTERNS_SOURCES/api \ - $$XMLPATTERNS_SOURCES/data \ - $$XMLPATTERNS_SOURCES/environment \ - $$XMLPATTERNS_SOURCES/expr \ - $$XMLPATTERNS_SOURCES/functions \ - $$XMLPATTERNS_SOURCES/iterators \ - $$XMLPATTERNS_SOURCES/janitors \ - $$XMLPATTERNS_SOURCES/parser \ - $$XMLPATTERNS_SOURCES/projection \ - $$XMLPATTERNS_SOURCES/schema \ - $$XMLPATTERNS_SOURCES/type \ - $$XMLPATTERNS_SOURCES/utils diff --git a/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp b/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp index fd7f1ae..0b6f477 100644 --- a/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp +++ b/tests/auto/xmlpatternsschema/tst_xmlpatternsschema.cpp @@ -41,8 +41,8 @@ #include <QtTest/QtTest> -#include "qxsdstatemachine_p.h" -#include "qxsdschematoken_p.h" +#include <private/qxsdstatemachine_p.h> +#include <private/qxsdschematoken_p.h> using namespace QPatternist; diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp index 8ceafee..f50c4d6 100644 --- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp +++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp @@ -44,7 +44,7 @@ #include <QtDebug> #include <QXmlNamePool> -#include "qfunctionfactorycollection_p.h" +#include <private/qfunctionfactorycollection_p.h> #include "ASTItem.h" #include "ExpressionInfo.h" diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h index dd098e6..57db1bb 100644 --- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h +++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h @@ -43,8 +43,8 @@ #define PatternistSDK_DebugExpressionFactory_H #include "Global.h" -#include "qexpressionfactory_p.h" -#include "qfunctionfactory_p.h" +#include <private/qexpressionfactory_p.h> +#include <private/qfunctionfactory_p.h> QT_BEGIN_HEADER diff --git a/tests/auto/xmlpatternssdk/ErrorItem.cpp b/tests/auto/xmlpatternssdk/ErrorItem.cpp index 436edb9..06040a3 100644 --- a/tests/auto/xmlpatternssdk/ErrorItem.cpp +++ b/tests/auto/xmlpatternssdk/ErrorItem.cpp @@ -43,8 +43,8 @@ #include <QPointer> #include <QVariant> -#include "qreportcontext_p.h" -#include "qcommonnamespaces_p.h" +#include <private/qreportcontext_p.h> +#include <private/qcommonnamespaces_p.h> #include "ErrorItem.h" diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h index 9627300..c3a563e 100644 --- a/tests/auto/xmlpatternssdk/ExpressionInfo.h +++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h @@ -43,7 +43,7 @@ #define PatternistSDK_ExpressionInfo_H #include "Global.h" -#include "qexpressiondispatch_p.h" +#include <private/qexpressiondispatch_p.h> #include <QPair> #include <QString> diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.cpp b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp index 5470039..777f64f 100644 --- a/tests/auto/xmlpatternssdk/ExpressionNamer.cpp +++ b/tests/auto/xmlpatternssdk/ExpressionNamer.cpp @@ -41,70 +41,70 @@ #include <QtDebug> -#include "qabstractfloat_p.h" -#include "qandexpression_p.h" -#include "qanyuri_p.h" -#include "qapplytemplate_p.h" -#include "qargumentreference_p.h" -#include "qarithmeticexpression_p.h" -#include "qatomicstring_p.h" -#include "qatomizer_p.h" -#include "qattributeconstructor_p.h" -#include "qattributenamevalidator_p.h" -#include "qaxisstep_p.h" -#include "qbase64binary_p.h" -#include "qboolean_p.h" -#include "qcardinalityverifier_p.h" -#include "qcastableas_p.h" -#include "qcastas_p.h" -#include "qcombinenodes_p.h" -#include "qcontextitem_p.h" -#include "qdate_p.h" -#include "qdecimal_p.h" -#include "qdynamiccontextstore_p.h" -#include "qelementconstructor_p.h" -#include "qemptysequence_p.h" -#include "qevaluationcache_p.h" -#include "qexpressionsequence_p.h" -#include "qexpressionvariablereference_p.h" -#include "qfirstitempredicate_p.h" -#include "qforclause_p.h" -#include "qfunctioncall_p.h" -#include "qgday_p.h" -#include "qgeneralcomparison_p.h" -#include "qgenericpredicate_p.h" -#include "qgmonthday_p.h" -#include "qgmonth_p.h" -#include "qgyearmonth_p.h" -#include "qgyear_p.h" -#include "qhexbinary_p.h" -#include "qifthenclause_p.h" -#include "qinstanceof_p.h" -#include "qinteger_p.h" -#include "qitem_p.h" -#include "qitemverifier_p.h" -#include "qliteral_p.h" -#include "qnamespaceconstructor_p.h" -#include "qncnameconstructor_p.h" -#include "qnodecomparison_p.h" -#include "qorexpression_p.h" -#include "qpath_p.h" -#include "qpositionalvariablereference_p.h" -#include "qqnameconstructor_p.h" -#include "qqnamevalue_p.h" -#include "qquantifiedexpression_p.h" -#include "qrangeexpression_p.h" -#include "qrangevariablereference_p.h" -#include "qschemadatetime_p.h" -#include "qschematime_p.h" -#include "qsimplecontentconstructor_p.h" -#include "qtreatas_p.h" -#include "qtruthpredicate_p.h" -#include "quntypedatomicconverter_p.h" -#include "quntypedatomic_p.h" -#include "quserfunctioncallsite_p.h" -#include "qvalidationerror_p.h" -#include "qvaluecomparison_p.h" +#include <private/qabstractfloat_p.h> +#include <private/qandexpression_p.h> +#include <private/qanyuri_p.h> +#include <private/qapplytemplate_p.h> +#include <private/qargumentreference_p.h> +#include <private/qarithmeticexpression_p.h> +#include <private/qatomicstring_p.h> +#include <private/qatomizer_p.h> +#include <private/qattributeconstructor_p.h> +#include <private/qattributenamevalidator_p.h> +#include <private/qaxisstep_p.h> +#include <private/qbase64binary_p.h> +#include <private/qboolean_p.h> +#include <private/qcardinalityverifier_p.h> +#include <private/qcastableas_p.h> +#include <private/qcastas_p.h> +#include <private/qcombinenodes_p.h> +#include <private/qcontextitem_p.h> +#include <private/qdate_p.h> +#include <private/qdecimal_p.h> +#include <private/qdynamiccontextstore_p.h> +#include <private/qelementconstructor_p.h> +#include <private/qemptysequence_p.h> +#include <private/qevaluationcache_p.h> +#include <private/qexpressionsequence_p.h> +#include <private/qexpressionvariablereference_p.h> +#include <private/qfirstitempredicate_p.h> +#include <private/qforclause_p.h> +#include <private/qfunctioncall_p.h> +#include <private/qgday_p.h> +#include <private/qgeneralcomparison_p.h> +#include <private/qgenericpredicate_p.h> +#include <private/qgmonthday_p.h> +#include <private/qgmonth_p.h> +#include <private/qgyearmonth_p.h> +#include <private/qgyear_p.h> +#include <private/qhexbinary_p.h> +#include <private/qifthenclause_p.h> +#include <private/qinstanceof_p.h> +#include <private/qinteger_p.h> +#include <private/qitem_p.h> +#include <private/qitemverifier_p.h> +#include <private/qliteral_p.h> +#include <private/qnamespaceconstructor_p.h> +#include <private/qncnameconstructor_p.h> +#include <private/qnodecomparison_p.h> +#include <private/qorexpression_p.h> +#include <private/qpath_p.h> +#include <private/qpositionalvariablereference_p.h> +#include <private/qqnameconstructor_p.h> +#include <private/qqnamevalue_p.h> +#include <private/qquantifiedexpression_p.h> +#include <private/qrangeexpression_p.h> +#include <private/qrangevariablereference_p.h> +#include <private/qschemadatetime_p.h> +#include <private/qschematime_p.h> +#include <private/qsimplecontentconstructor_p.h> +#include <private/qtreatas_p.h> +#include <private/qtruthpredicate_p.h> +#include <private/quntypedatomicconverter_p.h> +#include <private/quntypedatomic_p.h> +#include <private/quserfunctioncallsite_p.h> +#include <private/qvalidationerror_p.h> +#include <private/qvaluecomparison_p.h> #include "ExpressionInfo.h" #include "Global.h" diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.h b/tests/auto/xmlpatternssdk/ExpressionNamer.h index 297bdc5..6b31671 100644 --- a/tests/auto/xmlpatternssdk/ExpressionNamer.h +++ b/tests/auto/xmlpatternssdk/ExpressionNamer.h @@ -43,7 +43,7 @@ #define PatternistSDK_ExpressionNamer_H #include "Global.h" -#include "qexpressiondispatch_p.h" +#include <private/qexpressiondispatch_p.h> QT_BEGIN_HEADER diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp index 8424389..9ae4089 100644 --- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp +++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp @@ -47,9 +47,9 @@ #include "Global.h" -#include "qcommonsequencetypes_p.h" -#include "qdebug_p.h" -#include "qatomicstring_p.h" +#include <private/qcommonsequencetypes_p.h> +#include <private/qdebug_p.h> +#include <private/qatomicstring_p.h> #include "ExternalSourceLoader.h" diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h index 78b544d..6fad8c0 100644 --- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h +++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h @@ -46,9 +46,9 @@ #include <QUrl> #include <QXmlQuery> -#include "qdynamiccontext_p.h" -#include "qresourceloader_p.h" -#include "qexternalvariableloader_p.h" +#include <private/qdynamiccontext_p.h> +#include <private/qresourceloader_p.h> +#include <private/qexternalvariableloader_p.h> QT_BEGIN_HEADER diff --git a/tests/auto/xmlpatternssdk/Global.h b/tests/auto/xmlpatternssdk/Global.h index 30a89eb..95e21ac 100644 --- a/tests/auto/xmlpatternssdk/Global.h +++ b/tests/auto/xmlpatternssdk/Global.h @@ -44,8 +44,8 @@ #include <QString> -#include "private/qitem_p.h" -#include "private/qnamepool_p.h" +#include <private/qitem_p.h> +#include <private/qnamepool_p.h> #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) # ifdef Q_PATTERNISTSDK_BUILDING diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.cpp b/tests/auto/xmlpatternssdk/TestBaseLine.cpp index 065f37f..60cf727 100644 --- a/tests/auto/xmlpatternssdk/TestBaseLine.cpp +++ b/tests/auto/xmlpatternssdk/TestBaseLine.cpp @@ -48,7 +48,7 @@ #include <QXmlAttributes> #include <QXmlSimpleReader> -#include "qdebug_p.h" +#include <private/qdebug_p.h> #include "XMLWriter.h" #include "TestBaseLine.h" diff --git a/tests/auto/xmlpatternssdk/TestCase.cpp b/tests/auto/xmlpatternssdk/TestCase.cpp index 4033946..7b40700 100644 --- a/tests/auto/xmlpatternssdk/TestCase.cpp +++ b/tests/auto/xmlpatternssdk/TestCase.cpp @@ -45,7 +45,7 @@ #include <QXmlQuery> #include <QXmlResultItems> #include <QXmlSerializer> -#include <qxmlquery_p.h> +#include <private/qxmlquery_p.h> #include "DebugExpressionFactory.h" #include "ExternalSourceLoader.h" diff --git a/tests/auto/xmlpatternssdk/TestCase.h b/tests/auto/xmlpatternssdk/TestCase.h index 100a81c..9a64c88 100644 --- a/tests/auto/xmlpatternssdk/TestCase.h +++ b/tests/auto/xmlpatternssdk/TestCase.h @@ -44,7 +44,7 @@ #include <QtXmlPatterns/QXmlQuery> -#include "qexternalvariableloader_p.h" +#include <private/qexternalvariableloader_p.h> #include "ErrorHandler.h" #include "TestBaseLine.h" diff --git a/tests/auto/xmlpatternssdk/TestResult.cpp b/tests/auto/xmlpatternssdk/TestResult.cpp index fda34b0..f7a3ff2 100644 --- a/tests/auto/xmlpatternssdk/TestResult.cpp +++ b/tests/auto/xmlpatternssdk/TestResult.cpp @@ -42,7 +42,7 @@ #include <QXmlAttributes> #include <QtDebug> -#include "qdebug_p.h" +#include <private/qdebug_p.h> #include "Global.h" #include "XMLWriter.h" diff --git a/tests/auto/xmlpatternssdk/TestSuite.cpp b/tests/auto/xmlpatternssdk/TestSuite.cpp index e24786a..060132a 100644 --- a/tests/auto/xmlpatternssdk/TestSuite.cpp +++ b/tests/auto/xmlpatternssdk/TestSuite.cpp @@ -51,7 +51,7 @@ #include "XMLWriter.h" #include "XSLTTestSuiteHandler.h" #include "XSDTestSuiteHandler.h" -#include "qdebug_p.h" +#include <private/qdebug_p.h> #include "TestSuite.h" diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp index 74a6082..3e6e53f 100644 --- a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp +++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp @@ -41,8 +41,8 @@ #include <QtDebug> -#include "qacceltreeresourceloader_p.h" -#include "qnetworkaccessdelegator_p.h" +#include <private/qacceltreeresourceloader_p.h> +#include <private/qnetworkaccessdelegator_p.h> #include "Global.h" #include "TestBaseLine.h" diff --git a/tests/auto/xmlpatternssdk/XQTSTestCase.h b/tests/auto/xmlpatternssdk/XQTSTestCase.h index 2c809c5..983978e 100644 --- a/tests/auto/xmlpatternssdk/XQTSTestCase.h +++ b/tests/auto/xmlpatternssdk/XQTSTestCase.h @@ -46,7 +46,7 @@ #include <QString> #include <QUrl> -#include "qexternalvariableloader_p.h" +#include <private/qexternalvariableloader_p.h> #include "TestBaseLine.h" #include "TestCase.h" diff --git a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp index 5b6fb90..11d3714 100644 --- a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp +++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.cpp @@ -41,8 +41,8 @@ #include <QtDebug> -#include "qacceltreeresourceloader_p.h" -#include "qnetworkaccessdelegator_p.h" +#include <private/qacceltreeresourceloader_p.h> +#include <private/qnetworkaccessdelegator_p.h> #include "Global.h" #include "TestBaseLine.h" diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp index 31dfe70..6c084e8 100644 --- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp +++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp @@ -41,8 +41,8 @@ #include <QtDebug> -#include "qacceltreeresourceloader_p.h" -#include "qnetworkaccessdelegator_p.h" +#include <private/qacceltreeresourceloader_p.h> +#include <private/qnetworkaccessdelegator_p.h> #include "Global.h" #include "TestBaseLine.h" |