I hope this is fixed compilation with old MSVC

Author: alex-w

CMakeLists.txt

@@ -331,10 +331,15 @@ IF(WIN32)
           # C4305: type truncation
           # C4351: "new" behaviour, member array default initialization. Required since at least C++98, but funny MSVC throws a warning.
           # C4996: deprecated POSIX names (used in zlib)
-	     # C5105: defines in macros
+          # C5105: defines in macros
           # Zc:_cplusplus: Qt >5.9.0 requires a C++17 compiler, because cmake has a bug: https://gitlab.kitware.com/cmake/cmake/-/issues/1883
+	  SET(STEL_MSVC_FLAGS "/wd4244 /wd4305 /wd4351 /wd4996 /wd5105 /utf-8 /Zc:__cplusplus")
+
           # permissive: required by Qt >=6.9.0 (see qt6\QtCore\qcompilerdetection.h for more information: https://github.com/qt/qtbase/blob/v6.9.0/src/corelib/global/qcompilerdetection.h#L1304-L1316)
-          SET(STEL_MSVC_FLAGS "/wd4244 /wd4305 /wd4351 /wd4996 /wd5105 /utf-8 /Zc:__cplusplus /permissive-")
+	  IF(${QT_VERSION} VERSION_GREATER_EQUAL 6.9.0)
+               SET(STEL_MSVC_FLAGS "${STEL_MSVC_FLAGS} /permissive-")
+          ENDIF()
+
           # Avoid type conflict with C++17 standard
           # SET(STEL_MSVC_FLAGS "${STEL_MSVC_FLAGS} /D_HAS_STD_BYTE=0") # Don't do this in Qt6. Just avoid "using namespace std" anywhere! https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889
           # Set multiprocessing and minimal version of Windows

src/StelSystemInfo.cpp

@@ -30,7 +30,6 @@
 #include <windows.h>
 #include <WbemIdl.h>
 #include <comdef.h>
-#include <comutil.h> // For _bstr_t
 #include <string>
 #pragma comment(lib, "wbemuuid.lib")
 #endif
@@ -114,38 +113,38 @@ void printSystemInfo()
 			IWbemClassObject* obj = nullptr;
 
 			// CPU info
-			const std::wstring cpu_query(_bstr_t(L"SELECT Name, NumberOfLogicalProcessors, MaxClockSpeed FROM Win32_Processor"));
-			service->ExecQuery(_bstr_t(L"WQL"), _bstr_t(std::wstring(cpu_query.begin(), cpu_query.end()).c_str()), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, nullptr, &enumerator);
+			const std::wstring cpu_query(L"SELECT Name, NumberOfLogicalProcessors, MaxClockSpeed FROM Win32_Processor");
+			service->ExecQuery(bstr_t(L"WQL"), bstr_t(std::wstring(cpu_query.begin(), cpu_query.end()).c_str()), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, nullptr, &enumerator);
 			while (enumerator)
 			{
 				enumerator->Next(WBEM_INFINITE, 1, &obj, &u_return);
 				if (!u_return)
 					break;
 
-				hr = obj->Get(_bstr_t(L"Name"), 0, &vt_prop, nullptr, nullptr);
-                log(QString("CPU name: %1").arg(vt_prop.bstrVal));
+				hr = obj->Get(L"Name", 0, &vt_prop, nullptr, nullptr);
+                                log(QString("CPU name: %1").arg(vt_prop.bstrVal));
 
-				hr = obj->Get(_bstr_t(L"MaxClockSpeed"), 0, &vt_prop, nullptr, nullptr);
-                log(QString("CPU maximum speed: %1 MHz").arg(vt_prop.uintVal));
+				hr = obj->Get(L"MaxClockSpeed", 0, &vt_prop, nullptr, nullptr);
+                                log(QString("CPU maximum speed: %1 MHz").arg(vt_prop.uintVal));
 
-				hr = obj->Get(_bstr_t(L"NumberOfLogicalProcessors"), 0, &vt_prop, nullptr, nullptr);
-                log(QString("CPU logical cores: %1").arg(vt_prop.intVal));
+				hr = obj->Get(L"NumberOfLogicalProcessors", 0, &vt_prop, nullptr, nullptr);
+                                log(QString("CPU logical cores: %1").arg(vt_prop.intVal));
 
 				VariantClear(&vt_prop);
 				obj->Release();
 			}
 
 			// RAM info
 			int64_t totalRAM = 0;
-			const std::wstring ram_query(_bstr_t(L"SELECT Capacity FROM Win32_PhysicalMemory"));
-			service->ExecQuery(_bstr_t(L"WQL"), _bstr_t(std::wstring(ram_query.begin(), ram_query.end()).c_str()), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, nullptr, &enumerator);
+			const std::wstring ram_query(L"SELECT Capacity FROM Win32_PhysicalMemory");
+			service->ExecQuery(bstr_t(L"WQL"), bstr_t(std::wstring(ram_query.begin(), ram_query.end()).c_str()), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, nullptr, &enumerator);
 			while (enumerator)
 			{
 				enumerator->Next(WBEM_INFINITE, 1, &obj, &u_return);
 				if (!u_return)
 					break;
 
-				hr = obj->Get(_bstr_t(L"Capacity"), 0, &vt_prop, nullptr, nullptr);
+				hr = obj->Get(L"Capacity", 0, &vt_prop, nullptr, nullptr);
 				totalRAM += std::stoll(vt_prop.bstrVal);
 
 				VariantClear(&vt_prop);
@@ -154,23 +153,23 @@ void printSystemInfo()
 			log(QString("Total physical memory: %1 MB").arg(totalRAM/(1024<<10)));
 
 			// GPU info (Enabled only)
-			const std::wstring gpu_query(_bstr_t(L"SELECT Name, AdapterRAM, CurrentHorizontalResolution, CurrentVerticalResolution FROM Win32_VideoController WHERE Status='OK'"));
-			service->ExecQuery(_bstr_t(L"WQL"), _bstr_t(std::wstring(gpu_query.begin(), gpu_query.end()).c_str()), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, nullptr, &enumerator);
+			const std::wstring gpu_query(L"SELECT Name, AdapterRAM, CurrentHorizontalResolution, CurrentVerticalResolution FROM Win32_VideoController WHERE Status='OK'");
+			service->ExecQuery(bstr_t(L"WQL"), bstr_t(std::wstring(gpu_query.begin(), gpu_query.end()).c_str()), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, nullptr, &enumerator);
 			while (enumerator)
 			{
 				enumerator->Next(WBEM_INFINITE, 1, &obj, &u_return);
 				if (!u_return)
 					break;
 
-				hr = obj->Get(_bstr_t(L"Name"), 0, &vt_prop, nullptr, nullptr);
-                log(QString("GPU name: %1").arg(vt_prop.bstrVal));
+				hr = obj->Get(L"Name", 0, &vt_prop, nullptr, nullptr);
+                                log(QString("GPU name: %1").arg(vt_prop.bstrVal));
 
-				hr = obj->Get(_bstr_t(L"AdapterRAM"), 0, &vt_prop, nullptr, nullptr);
-                log(QString("GPU RAM: %1 MB").arg(vt_prop.ullVal/(1024<<10)));
+				hr = obj->Get(L"AdapterRAM", 0, &vt_prop, nullptr, nullptr);
+                                log(QString("GPU RAM: %1 MB").arg(vt_prop.ullVal/(1024<<10)));
 
-				hr = obj->Get(_bstr_t(L"CurrentHorizontalResolution"), 0, &vt_prop, nullptr, nullptr);
+				hr = obj->Get(L"CurrentHorizontalResolution", 0, &vt_prop, nullptr, nullptr);
 				int currHRes = vt_prop.intVal;
-				hr = obj->Get(_bstr_t(L"CurrentVerticalResolution"), 0, &vt_prop, nullptr, nullptr);
+				hr = obj->Get(L"CurrentVerticalResolution", 0, &vt_prop, nullptr, nullptr);
 				int currVRes = vt_prop.intVal;
 				log(QString("Current resolution: %1x%2").arg(currHRes).arg(currVRes));