Changeset 107420 in vbox for trunk/src

Timestamp:

Jan 6, 2025 3:57:35 PM (13 days ago)

Author:

vboxsync

Message:

FE/Qt: bugref:3409: Extra-data Manager & Runtime UI: Fixing parfait warnings related to implicit type conversion.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -4180 +4180 @@
 }
 
-double UIExtraDataManager::scaleFactor(const QUuid &uID, const int uScreenIndex)
+double UIExtraDataManager::scaleFactor(const QUuid &uID, int iScreenIndex)
 {
     /* Get corresponding extra-data for this machine: */
@@ -4189 +4189 @@
         return 1.0;
 
-    int index = uScreenIndex;
-    /* use the 0th. scale factor in case we dont have a scale factor for @p uScreenIndex: */
-    if (data.size() <= uScreenIndex)
-        index = 0;
+    int iIndex = iScreenIndex;
+    /* use the 0th. scale factor in case we dont have a scale factor for @p iScreenIndex: */
+    if (data.size() <= iScreenIndex)
+        iIndex = 0;
 
     bool fOk = false;
-    double scaleFactor = data[index].toDouble(&fOk);
+    const double dScaleFactor = data.at(iIndex).toDouble(&fOk);
     if (!fOk)
         return 1.0;
-    return scaleFactor;
+    return dScaleFactor;
 }
 
@@ -4226 +4226 @@
 }
 
-void UIExtraDataManager::setScaleFactor(double dScaleFactor, const QUuid &uID, const int uScreenIndex)
+void UIExtraDataManager::setScaleFactor(double dScaleFactor, const QUuid &uID, int iScreenIndex)
 {
     QStringList data = extraDataStringList(GUI_ScaleFactor, uID);
 
     /* Just make sure that we have corresponding data item: */
-    if (data.size() <= uScreenIndex)
-    {
-        int listSize = data.size();
-        for (int i = listSize; i <= uScreenIndex; ++i)
+    if (data.size() <= iScreenIndex)
+    {
+        for (int i = data.size(); i <= iScreenIndex; ++i)
             data.append(QString::number(1.0));
     }
 
-    data[uScreenIndex] = QString::number(dScaleFactor);
+    data[iScreenIndex] = QString::number(dScaleFactor);
     setExtraDataStringList(GUI_ScaleFactor, data, uID);
 }

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -713 +713 @@
 
         /** Returns the scale-factor. */
-        double scaleFactor(const QUuid &uID, const int uScreenIndex);
+        double scaleFactor(const QUuid &uID, int iScreenIndex);
         QList<double> scaleFactors(const QUuid &uID);
         /** Saves the @a dScaleFactor for the monitor with @a uScreenIndex. If the existing scale factor
           * list (from extra data) does not have scale factors for the screens with ids in [0, uScreenIndex)
           * the this function appends a default scale factor for said screens.*/
-        void setScaleFactor(double dScaleFactor, const QUuid &uID, const int uScreenIndex);
+        void setScaleFactor(double dScaleFactor, const QUuid &uID, int iScreenIndex);
         /** Replaces the scale factor list of the machine with @a uID with @a scaleFactors. */
         void setScaleFactors(const QList<double> &scaleFactors, const QUuid &uID);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -298 +298 @@
 
     /* Acquire selected scale-factor: */
-    double dScaleFactor = gEDataManager->scaleFactor(uiCommon().managedVMUuid(), m_uScreenId);
+    double dScaleFactor = gEDataManager->scaleFactor(uiCommon().managedVMUuid(), (int)m_uScreenId);
 
     /* Take the device-pixel-ratio into account: */
@@ -1061 +1061 @@
 
     /* Acquire selected scale-factor: */
-    double dScaleFactor = gEDataManager->scaleFactor(uiCommon().managedVMUuid(), m_uScreenId);
+    double dScaleFactor = gEDataManager->scaleFactor(uiCommon().managedVMUuid(), (int)m_uScreenId);
 
     /* Take the device-pixel-ratio into account: */