diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm index 5100a07a2a1..8844a173c7c 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 4944613a59b..e63c3208057 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; + using VersionTuple = std::pair; 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 dc5252f9d19..d2373165771 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(subKey).value_or(QString()); } -QPair QWinRegistryKey::dwordValue(QStringView subKey) const +std::pair QWinRegistryKey::dwordValue(QStringView subKey) const { const std::optional val = value(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 0de1bfe0f53..20b2d10dd7e 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 dwordValue(QStringView subKey) const; + std::pair dwordValue(QStringView subKey) const; private: HKEY m_key = nullptr;