From cf64c1b04286aadc86cbae793970bf1c7bf716a0 Mon Sep 17 00:00:00 2001 From: Isak Fyksen Date: Thu, 24 Oct 2024 14:54:27 +0200 Subject: [PATCH] Replace QPair/qMakePair with std::pair in qtbase/plugins As a drive-by replace calls to QList::append with emplace_back, to avoid repeating value_type. Task-number: QTBUG-115841 Change-Id: I027d82706f3545dd63c6b8ba89ba66ae938e07f9 Reviewed-by: Marc Mutz (cherry picked from commit 6ed725b3b93d15a45501fecb6f1fa711ef65e17e) Reviewed-by: Qt Cherry-pick Bot --- .../platforminputcontexts/ibus/qibustypes.cpp | 6 ++--- .../uiautomation/qwindowsuiamainprovider.cpp | 2 +- .../xcb_glx/qglxintegration.cpp | 4 ++-- .../platforms/xcb/qxcbconnection_basic.h | 5 ++--- .../printsupport/cups/qcupsprintengine.cpp | 22 +++++++++---------- src/plugins/styles/android/qandroidstyle_p.h | 4 ++-- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp index ab1a244b6d9..2057ac154d1 100644 --- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp @@ -175,7 +175,7 @@ void QIBusAttributeList::deserializeFrom(const QDBusArgument &arg) QList QIBusAttributeList::imAttributes() const { - QHash, QTextCharFormat> rangeAttrs; + QHash, QTextCharFormat> rangeAttrs; const int numAttributes = attributes.size(); // Merge text formats for identical ranges into a single QTextFormat. @@ -184,7 +184,7 @@ QList QIBusAttributeList::imAttributes() const const QTextCharFormat &format = attr.format(); if (format.isValid()) { - const QPair range(attr.start, attr.end); + const std::pair range(attr.start, attr.end); rangeAttrs[range].merge(format); } } @@ -200,7 +200,7 @@ QList QIBusAttributeList::imAttributes() const imAttrs += QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, attr.start, attr.end - attr.start, - format.isValid() ? rangeAttrs[QPair(attr.start, attr.end)] : format); + format.isValid() ? rangeAttrs[std::pair(attr.start, attr.end)] : format); } return imAttrs; diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp index 56181caa215..f01c594b6cd 100644 --- a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp +++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp @@ -362,7 +362,7 @@ void QWindowsUiaMainProvider::fillVariantArrayForRelation(QAccessibleInterface* { Q_ASSERT(accessible); - typedef QPair RelationPair; + typedef std::pair RelationPair; const QList relationInterfaces = accessible->relations(relation); if (relationInterfaces.empty()) return; diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index 04eac027cd2..1e8600b7b2f 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -156,7 +156,7 @@ static void updateFormatFromContext(QSurfaceFormat &format) format.setOption(QSurfaceFormat::ResetNotification); } - if (format.version() < qMakePair(3, 0)) { + if (format.version() < std::pair(3, 0)) { format.setOption(QSurfaceFormat::DeprecatedFunctions); return; } @@ -169,7 +169,7 @@ static void updateFormatFromContext(QSurfaceFormat &format) format.setOption(QSurfaceFormat::DeprecatedFunctions); if (value & GL_CONTEXT_FLAG_DEBUG_BIT) format.setOption(QSurfaceFormat::DebugContext); - if (format.version() < qMakePair(3, 2)) + if (format.version() < std::pair(3, 2)) return; // Version 3.2 and newer have a profile diff --git a/src/plugins/platforms/xcb/qxcbconnection_basic.h b/src/plugins/platforms/xcb/qxcbconnection_basic.h index d44805b382f..586b45e8a7c 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_basic.h +++ b/src/plugins/platforms/xcb/qxcbconnection_basic.h @@ -6,7 +6,6 @@ #include "qxcbatom.h" #include "qxcbexport.h" -#include #include #include #include @@ -52,7 +51,7 @@ public: bool hasXKB() const { return m_hasXkb; } bool hasXRender(int major = -1, int minor = -1) const { if (m_hasXRender && major != -1 && minor != -1) - return m_xrenderVersion >= qMakePair(major, minor); + return m_xrenderVersion >= std::pair(major, minor); return m_hasXRender; } @@ -105,7 +104,7 @@ private: bool m_hasShmFd = false; bool m_hasXSync = false; - QPair m_xrenderVersion; + std::pair m_xrenderVersion; bool m_xi2Enabled = false; int m_xi2Minor = -1; diff --git a/src/plugins/printsupport/cups/qcupsprintengine.cpp b/src/plugins/printsupport/cups/qcupsprintengine.cpp index c38f163694b..e534874dad8 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine.cpp +++ b/src/plugins/printsupport/cups/qcupsprintengine.cpp @@ -185,42 +185,42 @@ void QCupsPrintEnginePrivate::closePrintDevice() } // Set up print options. - QList > options; + QList > options; QList cupsOptStruct; - options.append(QPair("media", m_pageLayout.pageSize().key().toLocal8Bit())); + options.emplace_back("media", m_pageLayout.pageSize().key().toLocal8Bit()); if (copies > 1) - options.append(QPair("copies", QString::number(copies).toLocal8Bit())); + options.emplace_back("copies", QString::number(copies).toLocal8Bit()); if (copies > 1 && collate) - options.append(QPair("Collate", "True")); + options.emplace_back("Collate", "True"); switch (duplex) { case QPrint::DuplexNone: - options.append(QPair("sides", "one-sided")); + options.emplace_back("sides", "one-sided"); break; case QPrint::DuplexAuto: if (m_pageLayout.orientation() == QPageLayout::Portrait) - options.append(QPair("sides", "two-sided-long-edge")); + options.emplace_back("sides", "two-sided-long-edge"); else - options.append(QPair("sides", "two-sided-short-edge")); + options.emplace_back("sides", "two-sided-short-edge"); break; case QPrint::DuplexLongSide: - options.append(QPair("sides", "two-sided-long-edge")); + options.emplace_back("sides", "two-sided-long-edge"); break; case QPrint::DuplexShortSide: - options.append(QPair("sides", "two-sided-short-edge")); + options.emplace_back("sides", "two-sided-short-edge"); break; } if (m_pageLayout.orientation() == QPageLayout::Landscape) - options.append(QPair("landscape", "")); + options.emplace_back("landscape", ""); QStringList::const_iterator it = cupsOptions.constBegin(); Q_ASSERT(cupsOptions.size() % 2 == 0); while (it != cupsOptions.constEnd()) { - options.append(QPair((*it).toLocal8Bit(), (*(it+1)).toLocal8Bit())); + options.emplace_back((*it).toLocal8Bit(), (*(it+1)).toLocal8Bit()); it += 2; } diff --git a/src/plugins/styles/android/qandroidstyle_p.h b/src/plugins/styles/android/qandroidstyle_p.h index 38abc24b02c..d47591f1752 100644 --- a/src/plugins/styles/android/qandroidstyle_p.h +++ b/src/plugins/styles/android/qandroidstyle_p.h @@ -191,7 +191,7 @@ public: virtual void setPaddingLeftToSizeWidth(); QSize sizeImage(const QStyleOption *opt) const; private: - typedef QPair StateType; + typedef std::pair StateType; QList m_states; }; @@ -206,7 +206,7 @@ public: AndroidDrawable *layer(int id) const; QSize size() const; private: - typedef QPair LayerType; + typedef std::pair LayerType; QList m_layers; int m_id; double m_factor;