diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-02-06 20:10:36 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-03-17 17:14:36 +0100 |
commit | ffa5820fa3bf8b28675129919d748373d6c77827 (patch) | |
tree | 9236ee33581d93396a8a08e0d64cc05326ed07e8 /src/corelib | |
parent | 03b281a0f2697472001f4de7b0c8ea8d9e850a93 (diff) |
Core: Do not depend on transitive includes
Change-Id: I2c71188a4d27692a2d6ef1aa447b329627214b17
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/corelib')
27 files changed, 35 insertions, 1 deletions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index fe7ab0c070..e375305f9f 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -85,6 +85,7 @@ #include "qpropertyanimation_p.h" #include <QtCore/QMutex> +#include <QtCore/QHash> #include <QtCore/private/qlocking_p.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h index 0009d8d2ea..bc3515e894 100644 --- a/src/corelib/io/qloggingregistry_p.h +++ b/src/corelib/io/qloggingregistry_p.h @@ -54,6 +54,7 @@ #include <QtCore/private/qglobal_p.h> #include <QtCore/qloggingcategory.h> #include <QtCore/qlist.h> +#include <QtCore/qhash.h> #include <QtCore/qmap.h> #include <QtCore/qmutex.h> #include <QtCore/qstring.h> diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 5181d81140..e224f649ae 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -50,6 +50,7 @@ # include <qregularexpression.h> #endif #include <qstack.h> +#include <qmap.h> #include <qbitarray.h> #include <qdatetime.h> #include <qloggingcategory.h> diff --git a/src/corelib/itemmodels/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp index d8a93eee36..a1622dbfe1 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.cpp +++ b/src/corelib/itemmodels/qabstractproxymodel.cpp @@ -42,6 +42,7 @@ #include <private/qabstractproxymodel_p.h> #include <QtCore/QSize> #include <QtCore/QStringList> +#include <QtCore/QMap> QT_BEGIN_NAMESPACE diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp index 72ff6c1f36..4ea3bc7326 100644 --- a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp +++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp @@ -40,6 +40,7 @@ #include "qconcatenatetablesproxymodel.h" #include <private/qabstractitemmodel_p.h> #include "qsize.h" +#include "qmap.h" #include "qdebug.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/itemmodels/qstringlistmodel.cpp b/src/corelib/itemmodels/qstringlistmodel.cpp index 829d4cf3ed..c2c951546c 100644 --- a/src/corelib/itemmodels/qstringlistmodel.cpp +++ b/src/corelib/itemmodels/qstringlistmodel.cpp @@ -44,6 +44,7 @@ #include "qstringlistmodel.h" #include <QtCore/qlist.h> +#include <QtCore/qmap.h> #include <algorithm> diff --git a/src/corelib/itemmodels/qtransposeproxymodel.cpp b/src/corelib/itemmodels/qtransposeproxymodel.cpp index 26b2628241..8cc5ed1465 100644 --- a/src/corelib/itemmodels/qtransposeproxymodel.cpp +++ b/src/corelib/itemmodels/qtransposeproxymodel.cpp @@ -42,6 +42,7 @@ #include <QtCore/qlist.h> #include <QtCore/qmetaobject.h> #include <QtCore/qsize.h> +#include <QtCore/qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 628313fbac..87d8af90bb 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -49,6 +49,7 @@ #include <private/qlocking_p.h> #endif #include "qtextstream.h" +#include "qvarlengtharray.h" #include <ctype.h> #include <qt_windows.h> diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index c23fab2eef..de56a80c4b 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -42,6 +42,7 @@ #include "qcoreapplication.h" #include "qpair.h" +#include "qhash.h" #include "qsocketnotifier.h" #include "qthread.h" #include "qelapsedtimer.h" diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 38115c1e2c..c6e6d4390e 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -56,6 +56,7 @@ #include "private/qabstracteventdispatcher_p.h" #include "private/qcore_unix_p.h" #include "QtCore/qvarlengtharray.h" +#include "QtCore/qhash.h" #include "private/qtimerinfo_unix_p.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index ec9f84c6e5..f02efe3046 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -45,6 +45,8 @@ #include "qdatetime.h" #include "qbytearray.h" #include "qreadwritelock.h" +#include "qhash.h" +#include "qmap.h" #include "qstring.h" #include "qstringlist.h" #include "qlist.h" diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index b942ac50c7..13c90f2578 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -45,6 +45,7 @@ #include "qdatastream.h" #include "qdebug.h" #include "qmap.h" +#include "qhash.h" #include "qdatetime.h" #if QT_CONFIG(easingcurve) #include "qeasingcurve.h" diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 2bf64c9422..518da4316c 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -48,6 +48,7 @@ #include <private/qfilesystementry_p.h> +#include <QtCore/QMap> #include <QtCore/QFile> #include <QtCore/QFileInfo> #include <QtCore/QStandardPaths> diff --git a/src/corelib/mimetypes/qmimemagicrule.cpp b/src/corelib/mimetypes/qmimemagicrule.cpp index bb30c11ff5..3cf5ba2d7f 100644 --- a/src/corelib/mimetypes/qmimemagicrule.cpp +++ b/src/corelib/mimetypes/qmimemagicrule.cpp @@ -44,6 +44,7 @@ #include "qmimetypeparser_p.h" #include <QtCore/QList> +#include <QtCore/QMap> #include <QtCore/QDebug> #include <qendian.h> diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index f152094dcd..6aa59e56f4 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -45,6 +45,7 @@ #include <qstandardpaths.h> #include "qmimemagicrulematcher_p.h" +#include <QMap> #include <QXmlStreamReader> #include <QBuffer> #include <QDir> diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index 00cf5fefbd..d895240991 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -59,6 +59,7 @@ QT_REQUIRE_CONFIG(mimetype); #include "qmimeglobpattern_p.h" #include <QtCore/qdatetime.h> #include <QtCore/qset.h> +#include <QtCore/qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index 89b15d4765..4f397e0dce 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -48,6 +48,9 @@ #include "qjsondocument.h" #include "qjson_p.h" +#include <qmap.h> +#include <qhash.h> + #include <private/qnumeric_p.h> #include <quuid.h> diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index 6b015d759d..da1d92ba17 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -43,6 +43,8 @@ #include <qjsonarray.h> #include <qstringlist.h> #include <qvariant.h> +#include <qmap.h> +#include <qhash.h> #include <qdebug.h> #include <qcbormap.h> #include <qcborarray.h> diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp index a8cfc4372c..edba60eca7 100644 --- a/src/corelib/serialization/qjsonobject.cpp +++ b/src/corelib/serialization/qjsonobject.cpp @@ -45,6 +45,8 @@ #include <qdebug.h> #include <qvariant.h> #include <qcbormap.h> +#include <qmap.h> +#include <qhash.h> #include <private/qcborvalue_p.h> #include "qjsonwriter_p.h" diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp index 6175c02270..a36ef1d7aa 100644 --- a/src/corelib/serialization/qjsonvalue.cpp +++ b/src/corelib/serialization/qjsonvalue.cpp @@ -46,6 +46,8 @@ #include <quuid.h> #include <qvariant.h> #include <qstringlist.h> +#include <qmap.h> +#include <qhash.h> #include <qdebug.h> #include "qdatastream.h" diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h index 41b04d4c38..609e799b48 100644 --- a/src/corelib/serialization/qxmlstream_p.h +++ b/src/corelib/serialization/qxmlstream_p.h @@ -52,6 +52,9 @@ #include <qstringconverter.h> #include <qxmlstream.h> #include "qxmlstreamgrammar_p.h" +#include <QtCore/qhash.h> +#include <QCoreApplication> // Q_DECLARE_TR_FUNCTIONS + #include <memory> @@ -170,7 +173,6 @@ public: const T *cend() const { return end(); } }; - class QXmlStream { Q_DECLARE_TR_FUNCTIONS(QXmlStream) diff --git a/src/corelib/text/qcollator_posix.cpp b/src/corelib/text/qcollator_posix.cpp index 7f04847434..4591f25d07 100644 --- a/src/corelib/text/qcollator_posix.cpp +++ b/src/corelib/text/qcollator_posix.cpp @@ -41,6 +41,7 @@ #include "qcollator_p.h" #include "qstringlist.h" #include "qstring.h" +#include "qvarlengtharray.h" #include <cstring> #include <cwchar> diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h index 953de2673f..1d10e0b292 100644 --- a/src/corelib/text/qlocale_p.h +++ b/src/corelib/text/qlocale_p.h @@ -58,6 +58,7 @@ #include "QtCore/qvariant.h" #include "QtCore/qnumeric.h" #include <QtCore/qcalendar.h> +#include <QtCore/QList> // Q_DECLARE_METATYPE(QList<Qt::DayOfWeek>) #include "qlocale.h" diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp index 0f1c7c2eb8..e22d7d3410 100644 --- a/src/corelib/thread/qsemaphore.cpp +++ b/src/corelib/thread/qsemaphore.cpp @@ -44,6 +44,7 @@ #include "qwaitcondition.h" #include "qdeadlinetimer.h" #include "qdatetime.h" +#include "qdebug.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/time/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp index 0b5be978f8..13e1b2157e 100644 --- a/src/corelib/time/qdatetimeparser.cpp +++ b/src/corelib/time/qdatetimeparser.cpp @@ -43,6 +43,7 @@ #include "qdatastream.h" #include "qset.h" +#include "qvarlengtharray.h" #include "qlocale.h" #include "qdatetime.h" #if QT_CONFIG(timezone) diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp index 0c59fa2d09..aa8ff6d554 100644 --- a/src/corelib/time/qtimezoneprivate_tz.cpp +++ b/src/corelib/time/qtimezoneprivate_tz.cpp @@ -48,6 +48,7 @@ #include <QtCore/QDateTime> #include <QtCore/QFile> #include <QtCore/QCache> +#include <QtCore/QMap> #include <QtCore/QMutex> #include <qdebug.h> diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp index f294449b5f..d8899009d8 100644 --- a/src/corelib/tools/qcommandlineparser.cpp +++ b/src/corelib/tools/qcommandlineparser.cpp @@ -43,6 +43,7 @@ #include <qcoreapplication.h> #include <private/qcoreapplication_p.h> #include <qhash.h> +#include <qvarlengtharray.h> #include <qlist.h> #include <qdebug.h> #if defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED) |