Changeset 83801 in vbox for trunk/src

Timestamp:

Apr 18, 2020 6:02:55 PM (5 years ago)

Author:

vboxsync

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

137327

Message:

FE/Qt: VC++ adjustments and warnings. bugref:8489

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (1 diff)
• monitor/performance/UIPerformanceMonitor.cpp (modified) (18 diffs)
• net/UINetworkReply.cpp (modified) (1 diff)
• runtime/UIDnDDropSource_win.cpp (modified) (1 diff)
• settings/UISettingsSelector.cpp (modified) (1 diff)
• widgets/UINameAndSystemEditor.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -264 +264 @@
         {
             VBoxGLTmpContext ctx;
-            const QGLContext *pContext = ctx.makeCurrent();
+            pContext = ctx.makeCurrent();
             Assert(pContext);
             if (pContext)

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.cpp

@@ -38 +38 @@
 
 /* External includes: */
-# include <math.h>
+#include <math.h>
 
 /** The time in seconds between metric inquries done to API. */
-const ULONG iPeriod = 1;
-/** The number of data points we store in UIChart. with iPeriod=1 it corresponds to 2 min. of data. */
-const int iMaximumQueueSize = 120;
+const ULONG g_iPeriod = 1;
+/** The number of data points we store in UIChart. with g_iPeriod=1 it corresponds to 2 min. of data. */
+const int g_iMaximumQueueSize = 120;
 /** This is passed to IPerformanceCollector during its setup. When 1 that means IPerformanceCollector object does a data cache of size 1. */
-const int iMetricSetupCount = 1;
-const int iDecimalCount = 2;
+const int g_iMetricSetupCount = 1;
+const int g_iDecimalCount = 2;
+
 
 /*********************************************************************************************************************************
-*   UIChart definition.                                                                                     *
+*   UIChart definition.                                                                                                          *
 *********************************************************************************************************************************/
 
@@ -293 +294 @@
 {
     Q_UNUSED(pEvent);
-    if (!m_pMetric || iMaximumQueueSize <= 1)
+    if (!m_pMetric || g_iMaximumQueueSize <= 1)
         return;
 
@@ -344 +345 @@
         return;
     /* Draw the data lines: */
-    float fBarWidth = m_lineChartRect.width() / (float) (iMaximumQueueSize - 1);
+    float fBarWidth = m_lineChartRect.width() / (float) (g_iMaximumQueueSize - 1);
     float fH = m_lineChartRect.height() / (float)iMaximum;
     for (int k = 0; k < DATA_SERIES_SIZE; ++k)
@@ -409 +410 @@
             strValue = QString::number(iValue);
         else if (m_pMetric->unit().compare("kb", Qt::CaseInsensitive) == 0)
-            strValue = uiCommon().formatSize(_1K * (quint64)iValue, iDecimalCount);
+            strValue = uiCommon().formatSize(_1K * (quint64)iValue, g_iDecimalCount);
         else if (m_pMetric->unit().compare("b", Qt::CaseInsensitive) == 0 ||
                  m_pMetric->unit().compare("b/s", Qt::CaseInsensitive) == 0)
-            strValue = uiCommon().formatSize(iValue, iDecimalCount);
+            strValue = uiCommon().formatSize(iValue, g_iDecimalCount);
         else if (m_pMetric->unit().compare("times", Qt::CaseInsensitive) == 0)
             strValue = UICommon::addMetricSuffixToNumber(iValue);
@@ -429 +430 @@
     int iFontHeight = fontMetrics.height();
 
-    int iTotalSeconds = iPeriod * iMaximumQueueSize;
+    int iTotalSeconds = g_iPeriod * g_iMaximumQueueSize;
     for (int i = 0; i < iXSubAxisCount + 2; ++i)
     {
@@ -578 +579 @@
 }
 
+
 /*********************************************************************************************************************************
-*   UIMetric implementation.                                                                                     *
+*   UIMetric implementation.                                                                                                     *
 *********************************************************************************************************************************/
 
@@ -586 +588 @@
     , m_strUnit(strUnit)
     , m_iMaximum(0)
-    , m_iMaximumQueueSize(iMaximumQueueSize)
+    , m_iMaximumQueueSize(iMaximumQueueSize) /** @todo r=bird: m_iMaximumQueueSize is not used anywhere that I can see. */
     , m_fRequiresGuestAdditions(false)
     , m_fIsInitialized(false)
@@ -632 +634 @@
         return;
     m_data[iDataSeriesIndex].enqueue(fData);
-    if (m_data[iDataSeriesIndex].size() > iMaximumQueueSize)
+    if (m_data[iDataSeriesIndex].size() > g_iMaximumQueueSize)
         m_data[iDataSeriesIndex].dequeue();
 }
@@ -773 +775 @@
     /* Compute the maximum label string length and set it as a fixed width to labels to prevent always changing widths: */
     /* Add m_iDecimalCount plus 4 characters for the number and 3 for unit string: */
-    iMaximum += (iDecimalCount + 7);
+    iMaximum += (g_iDecimalCount + 7);
     if (!m_infoLabels.isEmpty())
     {
@@ -799 +801 @@
     {
         connect(m_pTimer, &QTimer::timeout, this, &UIPerformanceMonitor::sltTimeout);
-        m_pTimer->start(1000 * iPeriod);
+        m_pTimer->start(1000 * g_iPeriod);
     }
 
@@ -924 +926 @@
     m_nameList << "Guest/RAM/Usage*";
     m_objectList = QVector<CUnknown>(m_nameList.size(), CUnknown());
-    m_performanceMonitor.SetupMetrics(m_nameList, m_objectList, iPeriod, iMetricSetupCount);
+    m_performanceMonitor.SetupMetrics(m_nameList, m_objectList, g_iPeriod, g_iMetricSetupCount);
     {
         QVector<CPerformanceMetric> metrics = m_performanceMonitor.GetMetrics(m_nameList, m_objectList);
@@ -934 +936 @@
                 if (strName.contains("RAM", Qt::CaseInsensitive) && strName.contains("Free", Qt::CaseInsensitive))
                 {
-                    UIMetric newMetric(m_strRAMMetricName, metrics[i].GetUnit(), iMaximumQueueSize);
+                    UIMetric newMetric(m_strRAMMetricName, metrics[i].GetUnit(), g_iMaximumQueueSize);
                     newMetric.setRequiresGuestAdditions(true);
                     m_metrics.insert(m_strRAMMetricName, newMetric);
@@ -942 +944 @@
     }
 
-    m_metrics.insert(m_strCPUMetricName, UIMetric(m_strCPUMetricName, "%", iMaximumQueueSize));
+    m_metrics.insert(m_strCPUMetricName, UIMetric(m_strCPUMetricName, "%", g_iMaximumQueueSize));
     {
         /* Network metric: */
-        UIMetric networkMetric(m_strNetworkMetricName, "B", iMaximumQueueSize);
+        UIMetric networkMetric(m_strNetworkMetricName, "B", g_iMaximumQueueSize);
         m_metrics.insert(m_strNetworkMetricName, networkMetric);
     }
@@ -951 +953 @@
     /* Disk IO metric */
     {
-        UIMetric diskIOMetric(m_strDiskIOMetricName, "B", iMaximumQueueSize);
+        UIMetric diskIOMetric(m_strDiskIOMetricName, "B", g_iMaximumQueueSize);
         m_metrics.insert(m_strDiskIOMetricName, diskIOMetric);
     }
@@ -957 +959 @@
     /* VM exits metric */
     {
-        UIMetric VMExitsMetric(m_strVMExitMetricName, "times", iMaximumQueueSize);
+        UIMetric VMExitsMetric(m_strVMExitMetricName, "times", g_iMaximumQueueSize);
         m_metrics.insert(m_strVMExitMetricName, VMExitsMetric);
     }
@@ -1035 +1037 @@
         QString strInfo;
         if (m_infoLabels[m_strRAMMetricName]->isEnabled())
-            strInfo = QString("<b>%1</b><br/>%2: %3<br/>%4: %5<br/>%6: %7").arg(m_strRAMInfoLabelTitle).arg(m_strRAMInfoLabelTotal).arg(uiCommon().formatSize(_1K * iTotalRAM, iDecimalCount))
-                .arg(m_strRAMInfoLabelFree).arg(uiCommon().formatSize(_1K * (iFreeRAM), iDecimalCount))
-                .arg(m_strRAMInfoLabelUsed).arg(uiCommon().formatSize(_1K * (iTotalRAM - iFreeRAM), iDecimalCount));
+            strInfo = QString("<b>%1</b><br/>%2: %3<br/>%4: %5<br/>%6: %7").arg(m_strRAMInfoLabelTitle).arg(m_strRAMInfoLabelTotal).arg(uiCommon().formatSize(_1K * iTotalRAM, g_iDecimalCount))
+                .arg(m_strRAMInfoLabelFree).arg(uiCommon().formatSize(_1K * (iFreeRAM), g_iDecimalCount))
+                .arg(m_strRAMInfoLabelUsed).arg(uiCommon().formatSize(_1K * (iTotalRAM - iFreeRAM), g_iDecimalCount));
         else
             strInfo = QString("<b>%1</b><br/>%2: %3<br/>%4: %5<br/>%6: %7").arg(m_strRAMInfoLabelTitle).arg(m_strRAMInfoLabelTotal).arg("---").arg(m_strRAMInfoLabelFree).arg("---").arg(m_strRAMInfoLabelUsed).arg("---");
@@ -1073 +1075 @@
             strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4<br/>%5 %6</font><br/><font color=\"%7\">%8: %9<br/>%10 %11</font>")
                 .arg(m_strNetworkInfoLabelTitle)
-                .arg(dataColorString(m_strNetworkMetricName, 0)).arg(m_strNetworkInfoLabelReceived).arg(uiCommon().formatSize((quint64)iReceiveRate, iDecimalCount))
-                .arg(m_strNetworkInfoLabelReceivedTotal).arg(uiCommon().formatSize((quint64)iReceiveTotal, iDecimalCount))
-                .arg(dataColorString(m_strNetworkMetricName, 1)).arg(m_strNetworkInfoLabelTransmitted).arg(uiCommon().formatSize((quint64)iTransmitRate, iDecimalCount))
-                .arg(m_strNetworkInfoLabelTransmittedTotal).arg(uiCommon().formatSize((quint64)iTransmitTotal, iDecimalCount));
+                .arg(dataColorString(m_strNetworkMetricName, 0)).arg(m_strNetworkInfoLabelReceived).arg(uiCommon().formatSize((quint64)iReceiveRate, g_iDecimalCount))
+                .arg(m_strNetworkInfoLabelReceivedTotal).arg(uiCommon().formatSize((quint64)iReceiveTotal, g_iDecimalCount))
+                .arg(dataColorString(m_strNetworkMetricName, 1)).arg(m_strNetworkInfoLabelTransmitted).arg(uiCommon().formatSize((quint64)iTransmitRate, g_iDecimalCount))
+                .arg(m_strNetworkInfoLabelTransmittedTotal).arg(uiCommon().formatSize((quint64)iTransmitTotal, g_iDecimalCount));
 
         else
@@ -1116 +1118 @@
             strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4<br/>%5 %6</font><br/><font color=\"%7\">%8: %9<br/>%10 %11</font>")
                 .arg(m_strDiskIOInfoLabelTitle)
-                .arg(dataColorString(m_strDiskIOMetricName, 0)).arg(m_strDiskIOInfoLabelWritten).arg(uiCommon().formatSize((quint64)iWriteRate, iDecimalCount))
-                .arg(m_strDiskIOInfoLabelWrittenTotal).arg(uiCommon().formatSize((quint64)uDiskIOTotalWritten, iDecimalCount))
-                .arg(dataColorString(m_strDiskIOMetricName, 1)).arg(m_strDiskIOInfoLabelRead).arg(uiCommon().formatSize((quint64)iReadRate, iDecimalCount))
-                .arg(m_strDiskIOInfoLabelReadTotal).arg(uiCommon().formatSize((quint64)uDiskIOTotalRead, iDecimalCount));
+                .arg(dataColorString(m_strDiskIOMetricName, 0)).arg(m_strDiskIOInfoLabelWritten).arg(uiCommon().formatSize((quint64)iWriteRate, g_iDecimalCount))
+                .arg(m_strDiskIOInfoLabelWrittenTotal).arg(uiCommon().formatSize((quint64)uDiskIOTotalWritten, g_iDecimalCount))
+                .arg(dataColorString(m_strDiskIOMetricName, 1)).arg(m_strDiskIOInfoLabelRead).arg(uiCommon().formatSize((quint64)iReadRate, g_iDecimalCount))
+                .arg(m_strDiskIOInfoLabelReadTotal).arg(uiCommon().formatSize((quint64)uDiskIOTotalRead, g_iDecimalCount));
 
         else

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -443 +443 @@
          */
         RTFSOBJINFO Info;
-        int rc = RTPathQueryInfoEx(pszCaCertFile, &Info, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK);
+        rc = RTPathQueryInfoEx(pszCaCertFile, &Info, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK);
         if (   RT_SUCCESS(rc)
             && RTFS_IS_FILE(Info.Attr.fMode))

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

@@ -36 +36 @@
 
 UIDnDDropSource::UIDnDDropSource(QWidget *pParent, UIDnDDataObject *pDataObject)
-    : m_cRefCount(1)
-    , m_pParent(pParent)
+    : m_pParent(pParent)
     , m_pDataObject(pDataObject)
+    , m_cRefCount(1)
     , m_dwCurEffect(DROPEFFECT_NONE)
     , m_uCurAction(Qt::IgnoreAction)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp

@@ -801 +801 @@
         if (static_cast<UISelectorActionItem*>(pItem)->tabWidget() == pTabWidget)
         {
-            QTabWidget *pTabWidget = static_cast<UISelectorActionItem*>(pItem)->tabWidget();
+            QTabWidget *pTabWidget2 = static_cast<UISelectorActionItem*>(pItem)->tabWidget(); /// @todo r=bird: same as pTabWidget?
             pResult = static_cast<UISelectorActionItem*>(
-                findItemByPage(static_cast<UISettingsPage*>(pTabWidget->widget(iIndex))));
+                findItemByPage(static_cast<UISettingsPage*>(pTabWidget2->widget(iIndex))));
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp

@@ -254 +254 @@
         if (guiType.is64bit && (!m_fSupportsHWVirtEx || !m_fSupportsLongMode))
             continue;
-        const int iIndex = m_pComboType->count();
-        m_pComboType->insertItem(iIndex, guiType.typeDescription);
-        m_pComboType->setItemData(iIndex, guiType.typeId, TypeID);
+        const int idxItem = m_pComboType->count();
+        m_pComboType->insertItem(idxItem, guiType.typeDescription);
+        m_pComboType->setItemData(idxItem, guiType.typeId, TypeID);
     }