From 5c04046acae6e61280fba7fef31401edd7c36087 Mon Sep 17 00:00:00 2001
From: Dylan Liu <312902918@qq.com>
Date: 周五, 23 5月 2025 16:04:20 +0800
Subject: [PATCH] QWKCore/cocoawindowcontext: Use typeId() instead of type() in Qt 6.0+. (#181)
---
src/core/qwindowkit_windows.cpp | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/core/qwindowkit_windows.cpp b/src/core/qwindowkit_windows.cpp
index c022e26..640528c 100644
--- a/src/core/qwindowkit_windows.cpp
+++ b/src/core/qwindowkit_windows.cpp
@@ -71,26 +71,21 @@
return result;
}
- QPair<DWORD, bool> WindowsRegistryKey::dwordValue(QStringView subKey) const {
+ std::pair<DWORD, bool> WindowsRegistryKey::dwordValue(QStringView subKey) const {
if (!isValid())
- return qMakePair(0, false);
+ return std::make_pair(0, false);
DWORD type;
auto subKeyC = reinterpret_cast<const wchar_t *>(subKey.utf16());
if (::RegQueryValueExW(m_key, subKeyC, nullptr, &type, nullptr, nullptr) != ERROR_SUCCESS ||
type != REG_DWORD) {
- return qMakePair(0, false);
+ return std::make_pair(0, false);
}
DWORD value = 0;
DWORD size = sizeof(value);
const bool ok =
::RegQueryValueExW(m_key, subKeyC, nullptr, nullptr,
reinterpret_cast<unsigned char *>(&value), &size) == ERROR_SUCCESS;
- return qMakePair(value, ok);
- }
-#elif QT_VERSION < QT_VERSION_CHECK(6, 8, 1)
- WindowsRegistryKey::WindowsRegistryKey(HKEY parentHandle, QStringView subKey, REGSAM permissions, REGSAM access)
- : QWinRegistryKey(parentHandle, subKey, permissions, access)
- {
+ return std::make_pair(value, ok);
}
#endif
}
\ No newline at end of file
--
Gitblit v1.9.1