1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant QPair includes

Browse Source 
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>
This commit is contained in:
Ahmad Samir 2023-08-30 22:40:24 +03:00
parent 177ffb473b
commit ac9e968755
26 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/io/qdataurl_p.h
View File

@ -19,7 +19,6 @@
#include "QtCore/qurl.h" #include "QtCore/qurl.h"
#include "QtCore/qbytearray.h" #include "QtCore/qbytearray.h"
#include "QtCore/qstring.h" #include "QtCore/qstring.h"
#include "QtCore/qpair.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
src/corelib/io/qtemporarydir.cpp
View File

@ -8,7 +8,6 @@
#include "qdebug.h" #include "qdebug.h"
#include "qdiriterator.h" #include "qdiriterator.h"
#include "qpair.h"
#include "qplatformdefs.h" #include "qplatformdefs.h"
#include "qrandom.h" #include "qrandom.h"
#include "private/qtemporaryfile_p.h" #include "private/qtemporaryfile_p.h"

1
src/corelib/io/qurl.h
View File

@ -9,7 +9,6 @@
#include <QtCore/qobjectdefs.h> #include <QtCore/qobjectdefs.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#if defined(Q_OS_DARWIN) || defined(Q_QDOC) #if defined(Q_OS_DARWIN) || defined(Q_QDOC)

1
src/corelib/kernel/qdeadlinetimer.h
View File

@ -7,7 +7,6 @@
#include <QtCore/qelapsedtimer.h> #include <QtCore/qelapsedtimer.h>
#include <QtCore/qmetatype.h> #include <QtCore/qmetatype.h>
#include <QtCore/qnamespace.h> #include <QtCore/qnamespace.h>
#include <QtCore/qpair.h>
#ifdef max #ifdef max
// un-pollute the namespace. We need std::numeric_limits::max() and std::chrono::duration::max() // un-pollute the namespace. We need std::numeric_limits::max() and std::chrono::duration::max()

1
src/corelib/kernel/qeventdispatcher_glib.cpp
View File

@ -11,7 +11,6 @@
#include "qsocketnotifier.h" #include "qsocketnotifier.h"
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <glib.h> #include <glib.h>

1
src/corelib/kernel/qeventdispatcher_unix.cpp
View File

@ -5,7 +5,6 @@
#include "qplatformdefs.h" #include "qplatformdefs.h"
#include "qcoreapplication.h" #include "qcoreapplication.h"
#include "qpair.h"
#include "qhash.h" #include "qhash.h"
#include "qsocketnotifier.h" #include "qsocketnotifier.h"
#include "qthread.h" #include "qthread.h"

1
src/corelib/kernel/qeventdispatcher_win.cpp
View File

@ -7,7 +7,6 @@
#include "qcoreapplication.h" #include "qcoreapplication.h"
#include <private/qsystemlibrary_p.h> #include <private/qsystemlibrary_p.h>
#include "qoperatingsystemversion.h" #include "qoperatingsystemversion.h"
#include "qpair.h"
#include "qset.h" #include "qset.h"
#include "qsocketnotifier.h" #include "qsocketnotifier.h"
#include "qvarlengtharray.h" #include "qvarlengtharray.h"

1
src/corelib/kernel/qobject.cpp
View File

@ -22,7 +22,6 @@
#include <qthread.h> #include <qthread.h>
#include <private/qthread_p.h> #include <private/qthread_p.h>
#include <qdebug.h> #include <qdebug.h>
#include <qpair.h>
#include <qvarlengtharray.h> #include <qvarlengtharray.h>
#include <qscopeguard.h> #include <qscopeguard.h>
#include <qset.h> #include <qset.h>

2
src/corelib/tools/qhashfunctions.h
View File

@ -7,10 +7,10 @@
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtCore/qstringfwd.h> #include <QtCore/qstringfwd.h>
#include <QtCore/qpair.h>
#include <numeric> // for std::accumulate #include <numeric> // for std::accumulate
#include <functional> // for std::hash #include <functional> // for std::hash
#include <utility> // For std::pair
#if 0 #if 0
#pragma qt_class(QHashFunctions) #pragma qt_class(QHashFunctions)

1
src/dbus/qdbusintrospection_p.h
View File

@ -18,7 +18,6 @@
#include <QtDBus/private/qtdbusglobal_p.h> #include <QtDBus/private/qtdbusglobal_p.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qmap.h> #include <QtCore/qmap.h>
#include <QtCore/qpair.h>
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>

1
src/gui/image/qmovie.cpp
View File

@ -144,7 +144,6 @@
#include "qrect.h" #include "qrect.h"
#include "qelapsedtimer.h" #include "qelapsedtimer.h"
#include "qtimer.h" #include "qtimer.h"
#include "qpair.h"
#include "qmap.h" #include "qmap.h"
#include "qlist.h" #include "qlist.h"
#include "qbuffer.h" #include "qbuffer.h"

1
src/gui/painting/qbezier_p.h
View File

@ -18,7 +18,6 @@
#include <QtGui/private/qtguiglobal_p.h> #include <QtGui/private/qtguiglobal_p.h>
#include "QtCore/qline.h" #include "QtCore/qline.h"
#include "QtCore/qlist.h" #include "QtCore/qlist.h"
#include "QtCore/qpair.h"
#include "QtCore/qpoint.h" #include "QtCore/qpoint.h"
#include "QtCore/qrect.h" #include "QtCore/qrect.h"
#include "QtGui/qtransform.h" #include "QtGui/qtransform.h"

1
src/network/access/qhttpnetworkconnectionchannel.cpp
View File

@ -7,7 +7,6 @@
#include "qhttp2configuration.h" #include "qhttp2configuration.h"
#include "private/qnoncontiguousbytedevice_p.h" #include "private/qnoncontiguousbytedevice_p.h"
#include <qpair.h>
#include <qdebug.h> #include <qdebug.h>
#include <private/qhttp2protocolhandler_p.h> #include <private/qhttp2protocolhandler_p.h>

1
src/plugins/platforms/windows/qwindowsmenu.h
View File

@ -9,7 +9,6 @@
#include <qpa/qplatformmenu.h> #include <qpa/qplatformmenu.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qpair.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
src/plugins/platforms/windows/qwindowsscreen.h
View File

@ -7,7 +7,6 @@
#include "qtwindowsglobal.h" #include "qtwindowsglobal.h"
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qscopedpointer.h> #include <QtCore/qscopedpointer.h>
#include <qpa/qplatformscreen.h> #include <qpa/qplatformscreen.h>
#include <qpa/qplatformscreen_p.h> #include <qpa/qplatformscreen_p.h>

1
src/plugins/platforms/xcb/qxcbimage.h
View File

@ -5,7 +5,6 @@
#define QXCBIMAGE_H #define QXCBIMAGE_H
#include "qxcbscreen.h" #include "qxcbscreen.h"
#include <QtCore/QPair>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <xcb/xcb_image.h> #include <xcb/xcb_image.h>

1
src/plugins/styles/mac/qmacstyle_mac_p_p.h
View File

@ -12,7 +12,6 @@
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qmap.h> #include <QtCore/qmap.h>
#include <QtCore/qmath.h> #include <QtCore/qmath.h>
#include <QtCore/qpair.h>
#include <QtCore/qpointer.h> #include <QtCore/qpointer.h>
#include <QtCore/qtextstream.h> #include <QtCore/qtextstream.h>

1
src/printsupport/kernel/qprinterinfo.h
View File

@ -8,7 +8,6 @@
#include <QtPrintSupport/qprinter.h> #include <QtPrintSupport/qprinter.h>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QPair>
#include <QtGui/qpagesize.h> #include <QtGui/qpagesize.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/testlib/qappletestlogger.cpp
View File

@ -3,8 +3,6 @@
#include "qappletestlogger_p.h" #include "qappletestlogger_p.h"
#include <QPair>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#if defined(QT_USE_APPLE_UNIFIED_LOGGING) #if defined(QT_USE_APPLE_UNIFIED_LOGGING)

1
src/tools/uic/cpp/cppwriteinitialization.h
View File

@ -5,7 +5,6 @@
#define CPPWRITEINITIALIZATION_H #define CPPWRITEINITIALIZATION_H
#include "treewalker.h" #include "treewalker.h"
#include <qpair.h>
#include <qhash.h> #include <qhash.h>
#include <qset.h> #include <qset.h>
#include <qmap.h> #include <qmap.h>

1
src/widgets/accessible/qaccessiblewidgets_p.h
View File

@ -21,7 +21,6 @@
#if QT_CONFIG(accessibility) #if QT_CONFIG(accessibility)
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtCore/QPair>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
src/widgets/itemviews/qabstractitemview_p.h
View File

@ -23,7 +23,6 @@
#include "QtGui/qevent.h" #include "QtGui/qevent.h"
#include "QtCore/qmimedata.h" #include "QtCore/qmimedata.h"
#include "QtGui/qpainter.h" #include "QtGui/qpainter.h"
#include "QtCore/qpair.h"
#include "QtGui/qregion.h" #include "QtGui/qregion.h"
#include "QtCore/qdebug.h" #include "QtCore/qdebug.h"
#include "QtCore/qbasictimer.h" #include "QtCore/qbasictimer.h"

1
src/widgets/widgets/qcombobox_p.h
View File

@ -27,7 +27,6 @@
#include "QtGui/qpainter.h" #include "QtGui/qpainter.h"
#include "QtWidgets/qstyle.h" #include "QtWidgets/qstyle.h"
#include "QtWidgets/qstyleoption.h" #include "QtWidgets/qstyleoption.h"
#include "QtCore/qpair.h"
#include "QtCore/qtimer.h" #include "QtCore/qtimer.h"
#include "private/qwidget_p.h" #include "private/qwidget_p.h"
#include "QtCore/qpointer.h" #include "QtCore/qpointer.h"

1
src/widgets/widgets/qdockarealayout_p.h
View File

@ -18,7 +18,6 @@
#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/private/qtwidgetsglobal_p.h>
#include "QtWidgets/qlayout.h" #include "QtWidgets/qlayout.h"
#include "QtCore/qlist.h" #include "QtCore/qlist.h"
#include "QtCore/qpair.h"
#include "QtCore/qrect.h" #include "QtCore/qrect.h"
QT_REQUIRE_CONFIG(dockwidget); QT_REQUIRE_CONFIG(dockwidget);

1
tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
View File

@ -5,7 +5,6 @@
#include <QTest> #include <QTest>
#include <QMessageBox> #include <QMessageBox>
#include <QDebug> #include <QDebug>
#include <QPair>
#include <QSet> #include <QSet>
#include <QList> #include <QList>
#include <QPointer> #include <QPointer>

1
tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
View File

@ -5,7 +5,6 @@
#include <QtGui> #include <QtGui>
#include <QtWidgets> #include <QtWidgets>
#include <QtDebug> #include <QtDebug>
#include <QPair>
#include <QList> #include <QList>
#include <QPointer> #include <QPointer>
#include <QSignalSpy> #include <QSignalSpy>