Changeset 100068 in vbox

Timestamp:

Jun 5, 2023 12:42:04 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157755

Message:

FE/Qt and Debugger: bugref:10450: Qt6 compatibility bits for QString::fromUtf16 calls; ushort is replaced with char16_t.

Location:

trunk/src/VBox

Files:

• Debugger/VBoxDbgGui.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/COMDefs.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/globals/COMDefs.h (modified) (2 diffs)
• Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

@@ -299 +299 @@
         strName = QString::fromUtf16((const ushort *)bstr);
 #else
-        strName = QString::fromUtf16((char16_t *)bstr);
+        strName = QString::fromUtf16((const char16_t *)bstr);
 #endif
         SysFreeString(bstr);

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp

@@ -204 +204 @@
     aVec.resize (static_cast <int> (aArr.size()));
     for (int i = 0; i < aVec.size(); ++ i)
+#ifndef VBOX_IS_QT6_OR_LATER
         aVec [i] = QString::fromUtf16 ((const ushort *)aArr [i]);
+#else
+        aVec [i] = QString::fromUtf16 ((const char16_t *)aArr [i]);
+#endif
 }
 
@@ -252 +256 @@
     aVec.resize (static_cast <int> (aArr.size()));
     for (int i = 0; i < aVec.size(); ++ i)
+#ifndef VBOX_IS_QT6_OR_LATER
         aVec [i] = QUuid(QString::fromUtf16 ((const ushort *)aArr [i]));
+#else
+        aVec [i] = QUuid(QString::fromUtf16 ((const char16_t *)aArr [i]));
+#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

@@ -398 +398 @@
         {
             if (bstr) {
+#ifndef VBOX_IS_QT6_OR_LATER
                 str = QString::fromUtf16((const ushort *)bstr);
+#else
+                str = QString::fromUtf16((const char16_t *)bstr);
+#endif
                 SysFreeString(bstr);
             }
@@ -442 +446 @@
         {
             if (bstr) {
+#ifndef VBOX_IS_QT6_OR_LATER
                 uuid = QUuid(QString::fromUtf16((const ushort *)bstr));
+#else
+                uuid = QUuid(QString::fromUtf16((const char16_t *)bstr));
+#endif
                 SysFreeString(bstr);
             }

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.cpp

@@ -190 +190 @@
     WCHAR wszKeyName[256];
     if (::GetKeyNameTextW(iScan, wszKeyName, RT_ELEMENTS(wszKeyName)))
+#ifndef VBOX_IS_QT6_OR_LATER
         strKeyName = QString::fromUtf16((const ushort *)wszKeyName);
+#else
+        strKeyName = QString::fromUtf16((const char16_t *)wszKeyName);
+#endif
     else
     {