diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-11 11:34:22 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-03-08 08:06:48 -0800 |
commit | d7e64c698eea21073645cffc993c14b729366e59 (patch) | |
tree | 51fb945952ba86cad7137230c80143b835e6f74f | |
parent | 5b179c60e73f312d6567f38023d7d5edf900545c (diff) |
Make sure all private headers include at least one other
See script in qtbase/util/includeprivate for the rules.
Since these files are being touched anyway, I also ran the
updatecopyright.pl script too.
Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
25 files changed, 29 insertions, 1 deletions
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h index ea3736af..8bae8881 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h +++ b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -58,6 +58,7 @@ #include <QtCore/qurl.h> #include <QtCore/qstringlist.h> #include <QtCore/qabstractitemmodel.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h index 7ad3eb14..4af8943e 100644 --- a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h +++ b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h @@ -51,6 +51,7 @@ #define Patternist_CompressedWhitespace_H #include <QtGlobal> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h index b0334865..da150275 100644 --- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h +++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h @@ -54,6 +54,7 @@ #include <QtCore/QVector> #include <QtCore/QSharedData> #include <QtCore/QString> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h index d25a5c60..8b96fdb1 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h @@ -52,6 +52,7 @@ #include "qabstractxmlnodemodel.h" #include "qsourcelocation.h" +#include "private/qglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h index bdb42957..2b64d016 100644 --- a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h +++ b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h @@ -51,6 +51,7 @@ #define QABSTRACTXMLPULLPROVIDER_H #include <QtCore/QtGlobal> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qabstractxmlreceiver_p.h b/src/xmlpatterns/api/qabstractxmlreceiver_p.h index 302d3c4a..1b485a59 100644 --- a/src/xmlpatterns/api/qabstractxmlreceiver_p.h +++ b/src/xmlpatterns/api/qabstractxmlreceiver_p.h @@ -47,6 +47,8 @@ // // We mean it. +#include <QtCore/private/qglobal_p.h> + #ifndef QABSTRACTXMLRECEIVER_P_H #define QABSTRACTXMLRECEIVER_P_H diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h index 8b33d91d..7f9527af 100644 --- a/src/xmlpatterns/api/qcoloroutput_p.h +++ b/src/xmlpatterns/api/qcoloroutput_p.h @@ -52,6 +52,7 @@ #include <QtCore/QtGlobal> #include <QtCore/QHash> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qiodevicedelegate_p.h b/src/xmlpatterns/api/qiodevicedelegate_p.h index 8a58f15a..0901664e 100644 --- a/src/xmlpatterns/api/qiodevicedelegate_p.h +++ b/src/xmlpatterns/api/qiodevicedelegate_p.h @@ -52,6 +52,7 @@ #include <QtCore/QTimer> #include <QtNetwork/QNetworkReply> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h index fd71271e..edefbcfd 100644 --- a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h +++ b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h @@ -53,6 +53,7 @@ #include <QObject> #include <QPointer> #include <QSharedData> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qreferencecountedvalue_p.h b/src/xmlpatterns/api/qreferencecountedvalue_p.h index 9cab9f4e..de3242d8 100644 --- a/src/xmlpatterns/api/qreferencecountedvalue_p.h +++ b/src/xmlpatterns/api/qreferencecountedvalue_p.h @@ -47,6 +47,8 @@ // // We mean it. +#include <QtCore/private/qglobal_p.h> + #ifndef QPatternist_ReferenceCountedValue_p_h #define QPatternist_ReferenceCountedValue_p_h diff --git a/src/xmlpatterns/api/qxmlpatternistcli_p.h b/src/xmlpatterns/api/qxmlpatternistcli_p.h index e136927c..ef3d8550 100644 --- a/src/xmlpatterns/api/qxmlpatternistcli_p.h +++ b/src/xmlpatterns/api/qxmlpatternistcli_p.h @@ -51,6 +51,7 @@ #define Patternist_Cli_h #include <QCoreApplication> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qexpressiondispatch_p.h b/src/xmlpatterns/expr/qexpressiondispatch_p.h index c4c751f5..71ac315a 100644 --- a/src/xmlpatterns/expr/qexpressiondispatch_p.h +++ b/src/xmlpatterns/expr/qexpressiondispatch_p.h @@ -51,6 +51,7 @@ #define Patternist_ExpressionDispatch_H #include <QSharedData> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h index 20302182..24292f1a 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h +++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h @@ -47,6 +47,8 @@ // // We mean it. +#include <QtCore/private/qglobal_p.h> + #ifndef Patternist_SourceLocationReflection_H #define Patternist_SourceLocationReflection_H diff --git a/src/xmlpatterns/parser/qxslttokenlookup_p.h b/src/xmlpatterns/parser/qxslttokenlookup_p.h index 26703a4d..23117367 100644 --- a/src/xmlpatterns/parser/qxslttokenlookup_p.h +++ b/src/xmlpatterns/parser/qxslttokenlookup_p.h @@ -54,6 +54,7 @@ #define qxslttokenlookup_p_H #include <QtCore/QString> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/schema/qxsdschematoken_p.h b/src/xmlpatterns/schema/qxsdschematoken_p.h index abb64167..628da09a 100644 --- a/src/xmlpatterns/schema/qxsdschematoken_p.h +++ b/src/xmlpatterns/schema/qxsdschematoken_p.h @@ -54,6 +54,7 @@ #define QPatternist_XsdSchemaToken_h #include <QtCore/QString> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/type/qatomictypedispatch_p.h b/src/xmlpatterns/type/qatomictypedispatch_p.h index a9ab68b7..958b9d64 100644 --- a/src/xmlpatterns/type/qatomictypedispatch_p.h +++ b/src/xmlpatterns/type/qatomictypedispatch_p.h @@ -51,6 +51,7 @@ #define Patternist_AtomicTypeDispatch_H #include <QSharedData> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/type/qcardinality_p.h b/src/xmlpatterns/type/qcardinality_p.h index ffb482fe..6d645107 100644 --- a/src/xmlpatterns/type/qcardinality_p.h +++ b/src/xmlpatterns/type/qcardinality_p.h @@ -51,6 +51,7 @@ #define Patternist_Cardinality_H #include <QtCore/QtGlobal> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h index 29af39aa..9509d4e1 100644 --- a/src/xmlpatterns/type/qprimitives_p.h +++ b/src/xmlpatterns/type/qprimitives_p.h @@ -53,6 +53,7 @@ #include <QtGlobal> #include <QtCore/QHash> #include <QtCore/QUrl> +#include <QtCore/private/qglobal_p.h> /** * @file diff --git a/src/xmlpatterns/type/qschemacomponent_p.h b/src/xmlpatterns/type/qschemacomponent_p.h index 3f1634c3..53ec531e 100644 --- a/src/xmlpatterns/type/qschemacomponent_p.h +++ b/src/xmlpatterns/type/qschemacomponent_p.h @@ -52,6 +52,7 @@ #include <QSharedData> #include <QtGlobal> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qautoptr_p.h b/src/xmlpatterns/utils/qautoptr_p.h index be193f96..68ae674b 100644 --- a/src/xmlpatterns/utils/qautoptr_p.h +++ b/src/xmlpatterns/utils/qautoptr_p.h @@ -51,6 +51,7 @@ #define QPatternist_AutoPtr_p_h #include <QtGlobal> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qcommonnamespaces_p.h b/src/xmlpatterns/utils/qcommonnamespaces_p.h index aa19c87a..da8b538a 100644 --- a/src/xmlpatterns/utils/qcommonnamespaces_p.h +++ b/src/xmlpatterns/utils/qcommonnamespaces_p.h @@ -51,6 +51,7 @@ #define Patternist_CommonNamespaces_H #include <QLatin1String> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qcppcastinghelper_p.h b/src/xmlpatterns/utils/qcppcastinghelper_p.h index 55ea76e4..4cd90a6d 100644 --- a/src/xmlpatterns/utils/qcppcastinghelper_p.h +++ b/src/xmlpatterns/utils/qcppcastinghelper_p.h @@ -51,6 +51,7 @@ #define Patternist_CppCastingHelper_H #include <QtCore/QtGlobal> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h index 3dff0cb8..929658af 100644 --- a/src/xmlpatterns/utils/qnamespacebinding_p.h +++ b/src/xmlpatterns/utils/qnamespacebinding_p.h @@ -53,6 +53,7 @@ template<typename T> class QVector; #include <QXmlName> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qnamespaceresolver_p.h b/src/xmlpatterns/utils/qnamespaceresolver_p.h index 7e1008d4..f31267fb 100644 --- a/src/xmlpatterns/utils/qnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qnamespaceresolver_p.h @@ -52,6 +52,7 @@ #include <QSharedData> #include <QXmlName> +#include <private/qglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qxmldebug_p.h b/src/xmlpatterns/utils/qxmldebug_p.h index f3173ed2..cdc493b8 100644 --- a/src/xmlpatterns/utils/qxmldebug_p.h +++ b/src/xmlpatterns/utils/qxmldebug_p.h @@ -51,6 +51,7 @@ #define Patternist_Debug_H #include <QtDebug> +#include <QtCore/private/qglobal_p.h> /** * @file * @short Contains macros for debugging. |