Changeset 94001 in vbox

Timestamp:

Feb 28, 2022 10:54:24 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: QString.sprintf is gone. Forced to use QString::number, RTStrPrintf and similar for formatting numbers and such. bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (3 diffs)
• globals/UIErrorString.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsUSB.cpp (modified) (1 diff)

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

@@ -2185 +2185 @@
             strDetails =
                 tr("Unknown device %1:%2", "USB device details")
-                   .arg(QString().sprintf("%04hX", comDevice.GetVendorId()))
-                   .arg(QString().sprintf("%04hX", comDevice.GetProductId()));
+                   .arg(QString::number(comDevice.GetVendorId(),  16).toUpper().rightJustified(4, '0'))
+                   .arg(QString::number(comDevice.GetProductId(), 16).toUpper().rightJustified(4, '0'));
         }
         else
@@ -2197 +2197 @@
         ushort iRev = comDevice.GetRevision();
         if (iRev != 0)
-            strDetails += QString().sprintf(" [%04hX]", iRev);
+        {
+            strDetails += " [";
+            strDetails += QString::number(iRev, 16).toUpper().rightJustified(4, '0');
+            strDetails += "]";
+        }
     }
 
@@ -2210 +2214 @@
            "<nobr>Product ID: %2</nobr><br>"
            "<nobr>Revision: %3</nobr>", "USB device tooltip")
-           .arg(QString().sprintf("%04hX", comDevice.GetVendorId()))
-           .arg(QString().sprintf("%04hX", comDevice.GetProductId()))
-           .arg(QString().sprintf("%04hX", comDevice.GetRevision()));
+           .arg(QString::number(comDevice.GetVendorId(),  16).toUpper().rightJustified(4, '0'))
+           .arg(QString::number(comDevice.GetProductId(), 16).toUpper().rightJustified(4, '0'))
+           .arg(QString::number(comDevice.GetRevision(),  16).toUpper().rightJustified(4, '0'));
 
     const QString strSerial = comDevice.GetSerialNumber();

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

@@ -53 +53 @@
     Assert(pszDefine);
 
-    QString str;
-    str.sprintf("%s", pszDefine);
-    return str;
+    return QString(pszDefine);
 #endif
 }
@@ -63 +61 @@
 {
     /** @todo r=bird: See UIErrorString::formatRC for 31th bit discussion. */
+    char szHex[32];
+    RTStrPrintf(szHex, sizeof(szHex), "%#010X", rc);
+
 #ifdef RT_OS_WINDOWS
     char szDefine[80];
@@ -69 +70 @@
         cchRet = RTErrWinQueryDefine(rc | 0x80000000, szDefine, sizeof(szDefine), true /*fFailIfUnknown*/);
 
-    QString str;
     if (cchRet != VERR_NOT_FOUND)
-        str.sprintf("%s (0x%08x)", szDefine, rc);
-    else
-        str.sprintf("0x%08x", rc);
-    return str;
+        return QString(szDefine).append(" (").append(szHex).append(")");
 #else
     const char *pszDefine = RTErrCOMGet(SUCCEEDED_WARNING(rc) ? rc | 0x80000000 : rc)->pszDefine;
     Assert(pszDefine);
 
-    QString str;
     if (strncmp(pszDefine, RT_STR_TUPLE("Unknown ")))
-        str.sprintf("%s (0x%08X)", pszDefine, rc);
-    else
-        str.sprintf("0x%08X", rc);
-    return str;
-#endif
+        return QString(pszDefine).append(" (").append(szHex).append(")");
+#endif
+    return QString(szHex);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -730 +730 @@
     filterData.m_strName = uiCommon().usbDetails(usb);
     filterData.m_fHostUSBDevice = false;
-    filterData.m_strVendorId = QString().sprintf("%04hX", usb.GetVendorId());
-    filterData.m_strProductId = QString().sprintf("%04hX", usb.GetProductId());
-    filterData.m_strRevision = QString().sprintf("%04hX", usb.GetRevision());
+    filterData.m_strVendorId  = QString::number(usb.GetVendorId(),  16).toUpper().rightJustified(4, '0');
+    filterData.m_strProductId = QString::number(usb.GetProductId(), 16).toUpper().rightJustified(4, '0');
+    filterData.m_strRevision  = QString::number(usb.GetRevision(),  16).toUpper().rightJustified(4, '0');
     /* The port property depends on the host computer rather than on the USB
      * device itself; for this reason only a few people will want to use it