From d7e64c698eea21073645cffc993c14b729366e59 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 11 Feb 2022 11:34:22 -0800 Subject: 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 --- src/imports/xmllistmodel/qqmlxmllistmodel_p.h | 3 ++- src/xmlpatterns/acceltree/qcompressedwhitespace_p.h | 1 + src/xmlpatterns/api/qabstractxmlforwarditerator_p.h | 1 + src/xmlpatterns/api/qabstractxmlnodemodel_p.h | 1 + src/xmlpatterns/api/qabstractxmlpullprovider_p.h | 1 + src/xmlpatterns/api/qabstractxmlreceiver_p.h | 2 ++ src/xmlpatterns/api/qcoloroutput_p.h | 1 + src/xmlpatterns/api/qiodevicedelegate_p.h | 1 + src/xmlpatterns/api/qnetworkaccessdelegator_p.h | 1 + src/xmlpatterns/api/qreferencecountedvalue_p.h | 2 ++ src/xmlpatterns/api/qxmlpatternistcli_p.h | 1 + src/xmlpatterns/expr/qexpressiondispatch_p.h | 1 + src/xmlpatterns/expr/qsourcelocationreflection_p.h | 2 ++ src/xmlpatterns/parser/qxslttokenlookup_p.h | 1 + src/xmlpatterns/schema/qxsdschematoken_p.h | 1 + src/xmlpatterns/type/qatomictypedispatch_p.h | 1 + src/xmlpatterns/type/qcardinality_p.h | 1 + src/xmlpatterns/type/qprimitives_p.h | 1 + src/xmlpatterns/type/qschemacomponent_p.h | 1 + src/xmlpatterns/utils/qautoptr_p.h | 1 + src/xmlpatterns/utils/qcommonnamespaces_p.h | 1 + src/xmlpatterns/utils/qcppcastinghelper_p.h | 1 + src/xmlpatterns/utils/qnamespacebinding_p.h | 1 + src/xmlpatterns/utils/qnamespaceresolver_p.h | 1 + src/xmlpatterns/utils/qxmldebug_p.h | 1 + 25 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h index ea3736a..8bae888 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 #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h index 7ad3eb1..4af8943 100644 --- a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h +++ b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h @@ -51,6 +51,7 @@ #define Patternist_CompressedWhitespace_H #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h index b033486..da15027 100644 --- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h +++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h @@ -54,6 +54,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h index d25a5c6..8b96fdb 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 bdb4295..2b64d01 100644 --- a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h +++ b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h @@ -51,6 +51,7 @@ #define QABSTRACTXMLPULLPROVIDER_H #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qabstractxmlreceiver_p.h b/src/xmlpatterns/api/qabstractxmlreceiver_p.h index 302d3c4..1b485a5 100644 --- a/src/xmlpatterns/api/qabstractxmlreceiver_p.h +++ b/src/xmlpatterns/api/qabstractxmlreceiver_p.h @@ -47,6 +47,8 @@ // // We mean it. +#include + #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 8b33d91..7f9527a 100644 --- a/src/xmlpatterns/api/qcoloroutput_p.h +++ b/src/xmlpatterns/api/qcoloroutput_p.h @@ -52,6 +52,7 @@ #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qiodevicedelegate_p.h b/src/xmlpatterns/api/qiodevicedelegate_p.h index 8a58f15..0901664 100644 --- a/src/xmlpatterns/api/qiodevicedelegate_p.h +++ b/src/xmlpatterns/api/qiodevicedelegate_p.h @@ -52,6 +52,7 @@ #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h index fd71271..edefbcf 100644 --- a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h +++ b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h @@ -53,6 +53,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/api/qreferencecountedvalue_p.h b/src/xmlpatterns/api/qreferencecountedvalue_p.h index 9cab9f4..de3242d 100644 --- a/src/xmlpatterns/api/qreferencecountedvalue_p.h +++ b/src/xmlpatterns/api/qreferencecountedvalue_p.h @@ -47,6 +47,8 @@ // // We mean it. +#include + #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 e136927..ef3d855 100644 --- a/src/xmlpatterns/api/qxmlpatternistcli_p.h +++ b/src/xmlpatterns/api/qxmlpatternistcli_p.h @@ -51,6 +51,7 @@ #define Patternist_Cli_h #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qexpressiondispatch_p.h b/src/xmlpatterns/expr/qexpressiondispatch_p.h index c4c751f..71ac315 100644 --- a/src/xmlpatterns/expr/qexpressiondispatch_p.h +++ b/src/xmlpatterns/expr/qexpressiondispatch_p.h @@ -51,6 +51,7 @@ #define Patternist_ExpressionDispatch_H #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h index 2030218..24292f1 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h +++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h @@ -47,6 +47,8 @@ // // We mean it. +#include + #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 26703a4..2311736 100644 --- a/src/xmlpatterns/parser/qxslttokenlookup_p.h +++ b/src/xmlpatterns/parser/qxslttokenlookup_p.h @@ -54,6 +54,7 @@ #define qxslttokenlookup_p_H #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/schema/qxsdschematoken_p.h b/src/xmlpatterns/schema/qxsdschematoken_p.h index abb6416..628da09 100644 --- a/src/xmlpatterns/schema/qxsdschematoken_p.h +++ b/src/xmlpatterns/schema/qxsdschematoken_p.h @@ -54,6 +54,7 @@ #define QPatternist_XsdSchemaToken_h #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/type/qatomictypedispatch_p.h b/src/xmlpatterns/type/qatomictypedispatch_p.h index a9ab68b..958b9d6 100644 --- a/src/xmlpatterns/type/qatomictypedispatch_p.h +++ b/src/xmlpatterns/type/qatomictypedispatch_p.h @@ -51,6 +51,7 @@ #define Patternist_AtomicTypeDispatch_H #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/type/qcardinality_p.h b/src/xmlpatterns/type/qcardinality_p.h index ffb482f..6d64510 100644 --- a/src/xmlpatterns/type/qcardinality_p.h +++ b/src/xmlpatterns/type/qcardinality_p.h @@ -51,6 +51,7 @@ #define Patternist_Cardinality_H #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h index 29af39a..9509d4e 100644 --- a/src/xmlpatterns/type/qprimitives_p.h +++ b/src/xmlpatterns/type/qprimitives_p.h @@ -53,6 +53,7 @@ #include #include #include +#include /** * @file diff --git a/src/xmlpatterns/type/qschemacomponent_p.h b/src/xmlpatterns/type/qschemacomponent_p.h index 3f1634c..53ec531 100644 --- a/src/xmlpatterns/type/qschemacomponent_p.h +++ b/src/xmlpatterns/type/qschemacomponent_p.h @@ -52,6 +52,7 @@ #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qautoptr_p.h b/src/xmlpatterns/utils/qautoptr_p.h index be193f9..68ae674 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 +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qcommonnamespaces_p.h b/src/xmlpatterns/utils/qcommonnamespaces_p.h index aa19c87..da8b538 100644 --- a/src/xmlpatterns/utils/qcommonnamespaces_p.h +++ b/src/xmlpatterns/utils/qcommonnamespaces_p.h @@ -51,6 +51,7 @@ #define Patternist_CommonNamespaces_H #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qcppcastinghelper_p.h b/src/xmlpatterns/utils/qcppcastinghelper_p.h index 55ea76e..4cd90a6 100644 --- a/src/xmlpatterns/utils/qcppcastinghelper_p.h +++ b/src/xmlpatterns/utils/qcppcastinghelper_p.h @@ -51,6 +51,7 @@ #define Patternist_CppCastingHelper_H #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h index 3dff0cb..929658a 100644 --- a/src/xmlpatterns/utils/qnamespacebinding_p.h +++ b/src/xmlpatterns/utils/qnamespacebinding_p.h @@ -53,6 +53,7 @@ template class QVector; #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qnamespaceresolver_p.h b/src/xmlpatterns/utils/qnamespaceresolver_p.h index 7e1008d..f31267f 100644 --- a/src/xmlpatterns/utils/qnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qnamespaceresolver_p.h @@ -52,6 +52,7 @@ #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/xmlpatterns/utils/qxmldebug_p.h b/src/xmlpatterns/utils/qxmldebug_p.h index f3173ed..cdc493b 100644 --- a/src/xmlpatterns/utils/qxmldebug_p.h +++ b/src/xmlpatterns/utils/qxmldebug_p.h @@ -51,6 +51,7 @@ #define Patternist_Debug_H #include +#include /** * @file * @short Contains macros for debugging. -- cgit v1.2.1