Remove redundant QPair includes

Nothing in those files uses QPair; and a local build finished fine without them. Task-number: QTBUG-115841 Change-Id: I669cfecaa9129bce6b31e464826287f138b159db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2023-08-30 22:40:24 +03:00 · 2023-08-30 22:40:24 +03:00 · ac9e968755
commit ac9e968755
parent 177ffb473b
26 changed files with 1 additions and 27 deletions
--- a/src/corelib/io/qdataurl_p.h
+++ b/src/corelib/io/qdataurl_p.h
@ -19,7 +19,6 @@
 #include "QtCore/qurl.h"
 #include "QtCore/qbytearray.h"
 #include "QtCore/qstring.h"
-#include "QtCore/qpair.h"

 QT_BEGIN_NAMESPACE

--- a/src/corelib/io/qtemporarydir.cpp
+++ b/src/corelib/io/qtemporarydir.cpp
@ -8,7 +8,6 @@

 #include "qdebug.h"
 #include "qdiriterator.h"
-#include "qpair.h"
 #include "qplatformdefs.h"
 #include "qrandom.h"
 #include "private/qtemporaryfile_p.h"
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@ -9,7 +9,6 @@
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qlist.h>
-#include <QtCore/qpair.h>
 #include <QtCore/qglobal.h>

 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
--- a/src/corelib/kernel/qdeadlinetimer.h
+++ b/src/corelib/kernel/qdeadlinetimer.h
@ -7,7 +7,6 @@
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qnamespace.h>
-#include <QtCore/qpair.h>

 #ifdef max
 // un-pollute the namespace. We need std::numeric_limits::max() and std::chrono::duration::max()
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@ -11,7 +11,6 @@
 #include "qsocketnotifier.h"

 #include <QtCore/qlist.h>
-#include <QtCore/qpair.h>

 #include <glib.h>

--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@ -5,7 +5,6 @@
 #include "qplatformdefs.h"

 #include "qcoreapplication.h"
-#include "qpair.h"
 #include "qhash.h"
 #include "qsocketnotifier.h"
 #include "qthread.h"
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@ -7,7 +7,6 @@
 #include "qcoreapplication.h"
 #include <private/qsystemlibrary_p.h>
 #include "qoperatingsystemversion.h"
-#include "qpair.h"
 #include "qset.h"
 #include "qsocketnotifier.h"
 #include "qvarlengtharray.h"
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@ -22,7 +22,6 @@
 #include <qthread.h>
 #include <private/qthread_p.h>
 #include <qdebug.h>
-#include <qpair.h>
 #include <qvarlengtharray.h>
 #include <qscopeguard.h>
 #include <qset.h>
--- a/src/corelib/tools/qhashfunctions.h
+++ b/src/corelib/tools/qhashfunctions.h
@ -7,10 +7,10 @@

 #include <QtCore/qstring.h>
 #include <QtCore/qstringfwd.h>
-#include <QtCore/qpair.h>

 #include <numeric> // for std::accumulate
 #include <functional> // for std::hash
+#include <utility> // For std::pair

 #if 0
 #pragma qt_class(QHashFunctions)
--- a/src/dbus/qdbusintrospection_p.h
+++ b/src/dbus/qdbusintrospection_p.h
@ -18,7 +18,6 @@
 #include <QtDBus/private/qtdbusglobal_p.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
-#include <QtCore/qpair.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@ -144,7 +144,6 @@
 #include "qrect.h"
 #include "qelapsedtimer.h"
 #include "qtimer.h"
-#include "qpair.h"
 #include "qmap.h"
 #include "qlist.h"
 #include "qbuffer.h"
--- a/src/gui/painting/qbezier_p.h
+++ b/src/gui/painting/qbezier_p.h
@ -18,7 +18,6 @@
 #include <QtGui/private/qtguiglobal_p.h>
 #include "QtCore/qline.h"
 #include "QtCore/qlist.h"
-#include "QtCore/qpair.h"
 #include "QtCore/qpoint.h"
 #include "QtCore/qrect.h"
 #include "QtGui/qtransform.h"
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@ -7,7 +7,6 @@
 #include "qhttp2configuration.h"
 #include "private/qnoncontiguousbytedevice_p.h"

-#include <qpair.h>
 #include <qdebug.h>

 #include <private/qhttp2protocolhandler_p.h>
--- a/src/plugins/platforms/windows/qwindowsmenu.h
+++ b/src/plugins/platforms/windows/qwindowsmenu.h
@ -9,7 +9,6 @@
 #include <qpa/qplatformmenu.h>

 #include <QtCore/qlist.h>
-#include <QtCore/qpair.h>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/platforms/windows/qwindowsscreen.h
+++ b/src/plugins/platforms/windows/qwindowsscreen.h
@ -7,7 +7,6 @@
 #include "qtwindowsglobal.h"

 #include <QtCore/qlist.h>
-#include <QtCore/qpair.h>
 #include <QtCore/qscopedpointer.h>
 #include <qpa/qplatformscreen.h>
 #include <qpa/qplatformscreen_p.h>
--- a/src/plugins/platforms/xcb/qxcbimage.h
+++ b/src/plugins/platforms/xcb/qxcbimage.h
@ -5,7 +5,6 @@
 #define QXCBIMAGE_H

 #include "qxcbscreen.h"
-#include <QtCore/QPair>
 #include <QtGui/QImage>
 #include <QtGui/QPixmap>
 #include <xcb/xcb_image.h>
--- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h
+++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
@ -12,7 +12,6 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qmath.h>
-#include <QtCore/qpair.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qtextstream.h>

--- a/src/printsupport/kernel/qprinterinfo.h
+++ b/src/printsupport/kernel/qprinterinfo.h
@ -8,7 +8,6 @@
 #include <QtPrintSupport/qprinter.h>

 #include <QtCore/QList>
-#include <QtCore/QPair>
 #include <QtGui/qpagesize.h>

 QT_BEGIN_NAMESPACE
--- a/src/testlib/qappletestlogger.cpp
+++ b/src/testlib/qappletestlogger.cpp
@ -3,8 +3,6 @@

 #include "qappletestlogger_p.h"

-#include <QPair>
-
 QT_BEGIN_NAMESPACE

 #if defined(QT_USE_APPLE_UNIFIED_LOGGING)
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@ -5,7 +5,6 @@
 #define CPPWRITEINITIALIZATION_H

 #include "treewalker.h"
-#include <qpair.h>
 #include <qhash.h>
 #include <qset.h>
 #include <qmap.h>
--- a/src/widgets/accessible/qaccessiblewidgets_p.h
+++ b/src/widgets/accessible/qaccessiblewidgets_p.h
@ -21,7 +21,6 @@
 #if QT_CONFIG(accessibility)

 #include <QtCore/QPointer>
-#include <QtCore/QPair>

 QT_BEGIN_NAMESPACE

--- a/src/widgets/itemviews/qabstractitemview_p.h
+++ b/src/widgets/itemviews/qabstractitemview_p.h
@ -23,7 +23,6 @@
 #include "QtGui/qevent.h"
 #include "QtCore/qmimedata.h"
 #include "QtGui/qpainter.h"
-#include "QtCore/qpair.h"
 #include "QtGui/qregion.h"
 #include "QtCore/qdebug.h"
 #include "QtCore/qbasictimer.h"
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@ -27,7 +27,6 @@
 #include "QtGui/qpainter.h"
 #include "QtWidgets/qstyle.h"
 #include "QtWidgets/qstyleoption.h"
-#include "QtCore/qpair.h"
 #include "QtCore/qtimer.h"
 #include "private/qwidget_p.h"
 #include "QtCore/qpointer.h"
--- a/src/widgets/widgets/qdockarealayout_p.h
+++ b/src/widgets/widgets/qdockarealayout_p.h
@ -18,7 +18,6 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "QtWidgets/qlayout.h"
 #include "QtCore/qlist.h"
-#include "QtCore/qpair.h"
 #include "QtCore/qrect.h"

 QT_REQUIRE_CONFIG(dockwidget);
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@ -5,7 +5,6 @@
 #include <QTest>
 #include <QMessageBox>
 #include <QDebug>
-#include <QPair>
 #include <QSet>
 #include <QList>
 #include <QPointer>
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@ -5,7 +5,6 @@
 #include <QtGui>
 #include <QtWidgets>
 #include <QtDebug>
-#include <QPair>
 #include <QList>
 #include <QPointer>
 #include <QSignalSpy>