Changeset 85958 in vbox

Timestamp:

Aug 31, 2020 1:34:04 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9812: VM settings: A bit of coding-style fixes for audio, network, serial and USB pages.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsAudio.cpp (modified) (2 diffs)
• UIMachineSettingsNetwork.cpp (modified) (4 diffs)
• UIMachineSettingsSerial.cpp (modified) (4 diffs)
• UIMachineSettingsUSB.cpp (modified) (2 diffs)

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

@@ -231 +231 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
+    QGridLayout *pLayoutMain = new QGridLayout(this);
+    if (pLayoutMain)
     {
-        pMainLayout->setRowStretch(2, 1);
+        pLayoutMain->setRowStretch(2, 1);
 
         /* Prepare audio check-box: */
         m_pCheckBoxAudio = new QCheckBox(this);
         if (m_pCheckBoxAudio)
-            pMainLayout->addWidget(m_pCheckBoxAudio, 0, 0, 1, 2);
+            pLayoutMain->addWidget(m_pCheckBoxAudio, 0, 0, 1, 2);
 
         /* Prepare 20-px shifting spacer: */
         QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
         if (pSpacerItem)
-            pMainLayout->addItem(pSpacerItem, 1, 0);
+            pLayoutMain->addItem(pSpacerItem, 1, 0);
 
         /* Prepare audio settings widget: */
@@ -302 +302 @@
                     pLayoutAudioSettings->addWidget(m_pCheckBoxAudioInput, 3, 1);
 
-                pMainLayout->addWidget(m_pWidgetAudioSettings, 1, 1, 1, 1);
+                pLayoutMain->addWidget(m_pWidgetAudioSettings, 1, 1, 1, 1);
             }
         }

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

@@ -743 +743 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
-    {
-        pMainLayout->setRowStretch(2, 1);
+    QGridLayout *pLayoutMain = new QGridLayout(this);
+    if (pLayoutMain)
+    {
+        pLayoutMain->setRowStretch(2, 1);
 
         /* Prepare adapter check-box: */
         m_pCheckBoxAdapter = new QCheckBox(this);
         if (m_pCheckBoxAdapter)
-            pMainLayout->addWidget(m_pCheckBoxAdapter, 0, 0, 1, 2);
+            pLayoutMain->addWidget(m_pCheckBoxAdapter, 0, 0, 1, 2);
 
         /* Prepare 20-px shifting spacer: */
         QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
         if (pSpacerItem)
-            pMainLayout->addItem(pSpacerItem, 1, 0);
+            pLayoutMain->addItem(pSpacerItem, 1, 0);
 
         /* Prepare adapter settings widget: */
@@ -883 +883 @@
             }
 
-            pMainLayout->addWidget(m_pWidgetAdapterSettings, 1, 1);
+            pLayoutMain->addWidget(m_pWidgetAdapterSettings, 1, 1);
         }
     }
@@ -1255 +1255 @@
 
     /* Create main layout: */
-    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    AssertPtrReturnVoid(pMainLayout);
+    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
+    AssertPtrReturnVoid(pLayoutMain);
     {
         /* Creating tab-widget: */
@@ -1286 +1286 @@
 
             /* Add tab-widget into layout: */
-            pMainLayout->addWidget(m_pTabWidget);
+            pLayoutMain->addWidget(m_pTabWidget);
         }
     }

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

@@ -377 +377 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
-    {
-        pMainLayout->setRowStretch(2, 1);
+    QGridLayout *pLayoutMain = new QGridLayout(this);
+    if (pLayoutMain)
+    {
+        pLayoutMain->setRowStretch(2, 1);
 
         /* Prepare port check-box: */
         m_pCheckBoxPort = new QCheckBox(this);
         if (m_pCheckBoxPort)
-            pMainLayout->addWidget(m_pCheckBoxPort, 0, 0, 1, 2);
+            pLayoutMain->addWidget(m_pCheckBoxPort, 0, 0, 1, 2);
 
         /* Prepare 20-px shifting spacer: */
         QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
         if (pSpacerItem)
-            pMainLayout->addItem(pSpacerItem, 1, 0);
+            pLayoutMain->addItem(pSpacerItem, 1, 0);
 
         /* Prepare adapter settings widget: */
@@ -483 +483 @@
             }
 
-            pMainLayout->addWidget(m_pWidgetPortSettings, 1, 1);
+            pLayoutMain->addWidget(m_pWidgetPortSettings, 1, 1);
         }
     }
@@ -768 +768 @@
 
     /* Create main layout: */
-    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    AssertPtrReturnVoid(pMainLayout);
+    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
+    AssertPtrReturnVoid(pLayoutMain);
     {
         /* Creating tab-widget: */
@@ -791 +791 @@
 
             /* Add tab-widget into layout: */
-            pMainLayout->addWidget(m_pTabWidget);
+            pLayoutMain->addWidget(m_pTabWidget);
         }
     }

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

@@ -862 +862 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
-    {
-        pMainLayout->setRowStretch(2, 1);
-        pMainLayout->setColumnStretch(1, 1);
+    QGridLayout *pLayoutMain = new QGridLayout(this);
+    if (pLayoutMain)
+    {
+        pLayoutMain->setRowStretch(2, 1);
+        pLayoutMain->setColumnStretch(1, 1);
 
         /* Prepare USB check-box: */
         m_pCheckBoxUSB = new QCheckBox;
         if (m_pCheckBoxUSB)
-            pMainLayout->addWidget(m_pCheckBoxUSB, 0, 0, 1, 2);
+            pLayoutMain->addWidget(m_pCheckBoxUSB, 0, 0, 1, 2);
 
         /* Prepare 20-px shifting spacer: */
         QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
         if (pSpacerItem)
-            pMainLayout->addItem(pSpacerItem, 1, 0);
+            pLayoutMain->addItem(pSpacerItem, 1, 0);
 
         /* Prepare USB settings widget: */
@@ -912 +912 @@
             }
 
-            pMainLayout->addWidget(m_pWidgetUSBSettings, 1, 1, 1, 2);
+            pLayoutMain->addWidget(m_pWidgetUSBSettings, 1, 1, 1, 2);
         }
     }