Use QOperatingSystemVersion

src/ui/darkthemeapplier_windows.cpp

@@ -8,6 +8,7 @@
 
 #include <QApplication>
 #include <QGuiApplication>
+#include <QOperatingSystemVersion>
 #include <QPalette>
 #include <QToolTip>
 #include <QStyle>
@@ -90,7 +91,7 @@ namespace tremotesf {
             }
 
             void applyDarkThemeToTitleBar(QWindow* window) {
-                if (isRunningOnWindows11OrGreater()) {
+                if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows11) {
                     debug().log("Setting DWMWA_CAPTION_COLOR on {}", *window);
                     const auto qcolor = QGuiApplication::palette().color(QPalette::Window);
                     const auto color = RGB(qcolor.red(), qcolor.green(), qcolor.blue());
@@ -110,7 +111,7 @@ namespace tremotesf {
                 } else {
                     debug().log("Setting DWMWA_USE_IMMERSIVE_DARK_MODE on {}", *window);
                     const auto attribute = []() -> DWORD {
-                        if (isRunningOnWindows10_2004OrGreater()) {
+                        if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10_2004) {
                             return DWMWINDOWATTRIBUTE_compat::DWMWA_USE_IMMERSIVE_DARK_MODE_SINCE_2004;
                         }
                         return DWMWINDOWATTRIBUTE_compat::DWMWA_USE_IMMERSIVE_DARK_MODE_1809_UNTIL_2004;

src/windowshelpers.cpp

@@ -17,34 +17,6 @@
 
 namespace tremotesf {
     namespace {
-        bool isWindowsVersionOrGreater(DWORD major, DWORD minor, DWORD build) {
-            debug().log(
-                "isWindowsVersionOrGreater() called with: major = {}, minor = {}, build = {}",
-                major,
-                minor,
-                build
-            );
-            OSVERSIONINFOEXW info{};
-            info.dwOSVersionInfoSize = sizeof(info);
-            info.dwMajorVersion = major;
-            info.dwMinorVersion = minor;
-            info.dwBuildNumber = build;
-            const auto conditionMask = VerSetConditionMask(
-                VerSetConditionMask(
-                    VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL),
-                    VER_MINORVERSION,
-                    VER_GREATER_EQUAL
-                ),
-                VER_BUILDNUMBER,
-                VER_GREATER_EQUAL
-            );
-            const auto ret =
-                VerifyVersionInfoW(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER, conditionMask) !=
-                FALSE;
-            debug().log("isWindowsVersionOrGreater: returning {}", ret);
-            return ret;
-        }
-
         /**
          * @brief std::error_category for Win32 errors (returned by GetLastError())
          * Returns UTF-8 strings
@@ -78,16 +50,6 @@ namespace tremotesf {
         };
     }
 
-    bool isRunningOnWindows10_2004OrGreater() {
-        static const bool is = isWindowsVersionOrGreater(10, 0, 19041);
-        return is;
-    }
-
-    bool isRunningOnWindows11OrGreater() {
-        static const bool is = isWindowsVersionOrGreater(10, 0, 22000);
-        return is;
-    }
-
     void checkWin32Bool(int win32BoolResult, std::string_view functionName) {
         if (win32BoolResult != FALSE) return;
         // Don't use winrt::check_bool because it doesn't preserve Win32 error code

src/windowshelpers.h

@@ -11,9 +11,6 @@
 #include <QString>
 
 namespace tremotesf {
-    bool isRunningOnWindows10_2004OrGreater();
-    bool isRunningOnWindows11OrGreater();
-
     /**
      * @brief checkWin32Bool
      * @param win32BoolResult BOOL returned from Win32 function