diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-12-12 10:04:07 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-12-13 07:56:48 +0100 |
| commit | 87361727ffafbee460970cdb8e72056653fd2443 (patch) | |
| tree | 347c878588b8786dfe5546316ef6d8cff1749ff1 | |
| parent | 7cc55822fb94dcbba4e686664ebfca233513b20e (diff) | |
QtCore platform code: s/QPair/std::pair/
Also port qMakePair() to just braced initialization and CTAD.
Pick-to: 6.7
Task-number: QTBUG-115841
Change-Id: I46ee214ab47513375a6e28e3b439c7b060581235
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
| -rw-r--r-- | src/corelib/kernel/qcore_mac.mm | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qwinregistry.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qwinregistry_p.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm index 5100a07a2a..8844a173c7 100644 --- a/src/corelib/kernel/qcore_mac.mm +++ b/src/corelib/kernel/qcore_mac.mm @@ -25,7 +25,6 @@ #include "qendian.h" #include "qhash.h" -#include "qpair.h" #include "qmutex.h" #include "qvarlengtharray.h" #include "private/qlocking_p.h" @@ -715,7 +714,7 @@ QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machH }; static auto makeVersionTuple = [](uint32_t dt, uint32_t sdk, QOperatingSystemVersion::OSType osType) { - return qMakePair( + return std::pair( QOperatingSystemVersion(osType, dt >> 16 & 0xffff, dt >> 8 & 0xff, dt & 0xff), QOperatingSystemVersion(osType, sdk >> 16 & 0xffff, sdk >> 8 & 0xff, sdk & 0xff) ); diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 4944613a59..e63c320805 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -436,7 +436,7 @@ public: private: QMacVersion() = default; - using VersionTuple = QPair<QOperatingSystemVersion, QOperatingSystemVersion>; + using VersionTuple = std::pair<QOperatingSystemVersion, QOperatingSystemVersion>; static VersionTuple versionsForImage(const mach_header *machHeader); static VersionTuple applicationVersion(); static VersionTuple libraryVersion(); diff --git a/src/corelib/kernel/qwinregistry.cpp b/src/corelib/kernel/qwinregistry.cpp index dc5252f9d1..d237316577 100644 --- a/src/corelib/kernel/qwinregistry.cpp +++ b/src/corelib/kernel/qwinregistry.cpp @@ -125,10 +125,10 @@ QString QWinRegistryKey::stringValue(QStringView subKey) const return value<QString>(subKey).value_or(QString()); } -QPair<DWORD, bool> QWinRegistryKey::dwordValue(QStringView subKey) const +std::pair<DWORD, bool> QWinRegistryKey::dwordValue(QStringView subKey) const { const std::optional<DWORD> val = value<DWORD>(subKey); - return qMakePair(val.value_or(0), val.has_value()); + return {val.value_or(0), val.has_value()}; } QT_END_NAMESPACE diff --git a/src/corelib/kernel/qwinregistry_p.h b/src/corelib/kernel/qwinregistry_p.h index 0de1bfe0f5..20b2d10dd7 100644 --- a/src/corelib/kernel/qwinregistry_p.h +++ b/src/corelib/kernel/qwinregistry_p.h @@ -58,7 +58,7 @@ public: // ### TODO: Remove once all usages are migrated to new interface. QString stringValue(QStringView subKey) const; - QPair<DWORD, bool> dwordValue(QStringView subKey) const; + std::pair<DWORD, bool> dwordValue(QStringView subKey) const; private: HKEY m_key = nullptr; |