Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp	(revision 41396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp	(revision 41397)
@@ -33,5 +33,5 @@
 }
 
-void UIWizardNewVDPage1::addFormatButton(QWidget *pParent, QVBoxLayout *pFormatsLayout, CMediumFormat medFormat)
+void UIWizardNewVDPage1::addFormatButton(QWidget *pParent, QVBoxLayout *pFormatLayout, CMediumFormat medFormat)
 {
     /* Check that medium format supports creation: */
@@ -50,5 +50,5 @@
     /* Create/add corresponding radio-button: */
     QRadioButton *pFormatButton = new QRadioButton(pParent);
-    pFormatsLayout->addWidget(pFormatButton);
+    pFormatLayout->addWidget(pFormatButton);
     m_formats << medFormat;
     m_formatNames << medFormat.GetName();
@@ -77,5 +77,5 @@
     {
         m_pLabel = new QIRichTextLabel(this);
-        QVBoxLayout *pFormatsLayout = new QVBoxLayout;
+        QVBoxLayout *pFormatLayout = new QVBoxLayout;
         {
             m_pFormatButtonGroup = new QButtonGroup(this);
@@ -87,5 +87,5 @@
                     const CMediumFormat &medFormat = medFormats[i];
                     if (medFormat.GetName() == "VDI")
-                        addFormatButton(this, pFormatsLayout, medFormat);
+                        addFormatButton(this, pFormatLayout, medFormat);
                 }
                 for (int i = 0; i < medFormats.size(); ++i)
@@ -93,5 +93,5 @@
                     const CMediumFormat &medFormat = medFormats[i];
                     if (medFormat.GetName() != "VDI")
-                        addFormatButton(this, pFormatsLayout, medFormat);
+                        addFormatButton(this, pFormatLayout, medFormat);
                 }
             }
@@ -100,5 +100,5 @@
         }
         pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addLayout(pFormatsLayout);
+        pMainLayout->addLayout(pFormatLayout);
         pMainLayout->addStretch();
     }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp	(revision 41396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp	(revision 41397)
@@ -80,5 +80,5 @@
         m_pFixedLabel = new QIRichTextLabel(this);
         m_pSplitLabel = new QIRichTextLabel(this);
-        QVBoxLayout *pVariantsLayout = new QVBoxLayout;
+        QVBoxLayout *pVariantLayout = new QVBoxLayout;
         {
             m_pVariantButtonGroup = new QButtonGroup(this);
@@ -94,7 +94,7 @@
             }
             m_pSplitBox = new QCheckBox(this);
-            pVariantsLayout->addWidget(m_pDynamicalButton);
-            pVariantsLayout->addWidget(m_pFixedButton);
-            pVariantsLayout->addWidget(m_pSplitBox);
+            pVariantLayout->addWidget(m_pDynamicalButton);
+            pVariantLayout->addWidget(m_pFixedButton);
+            pVariantLayout->addWidget(m_pSplitBox);
         }
         pMainLayout->addWidget(m_pDescriptionLabel);
@@ -102,5 +102,5 @@
         pMainLayout->addWidget(m_pFixedLabel);
         pMainLayout->addWidget(m_pSplitLabel);
-        pMainLayout->addLayout(pVariantsLayout);
+        pMainLayout->addLayout(pVariantLayout);
         pMainLayout->addStretch();
     }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp	(revision 41396)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp	(revision 41397)
@@ -68,5 +68,5 @@
         {
             m_pSizeCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QGridLayout *m_pSizeCntLayout = new QGridLayout(m_pSizeCnt);
+            QGridLayout *pSizeCntLayout = new QGridLayout(m_pSizeCnt);
             {
                 m_pSizeSlider = new QSlider(m_pSizeCnt);
@@ -99,9 +99,9 @@
                     m_pSizeMax->setText(vboxGlobal().formatSize(m_uMediumSizeMax));
                 }
-                m_pSizeCntLayout->addWidget(m_pSizeSlider, 0, 0, 1, 3);
-                m_pSizeCntLayout->addWidget(m_pSizeEditor, 0, 3);
-                m_pSizeCntLayout->addWidget(m_pSizeMin, 1, 0);
-                m_pSizeCntLayout->setColumnStretch(1, 1);
-                m_pSizeCntLayout->addWidget(m_pSizeMax, 1, 2);
+                pSizeCntLayout->addWidget(m_pSizeSlider, 0, 0, 1, 3);
+                pSizeCntLayout->addWidget(m_pSizeEditor, 0, 3);
+                pSizeCntLayout->addWidget(m_pSizeMin, 1, 0);
+                pSizeCntLayout->setColumnStretch(1, 1);
+                pSizeCntLayout->addWidget(m_pSizeMax, 1, 2);
             }
         }
@@ -135,5 +135,5 @@
         {
             m_pVariantCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QVBoxLayout *pVariantsLayout = new QVBoxLayout(m_pVariantCnt);
+            QVBoxLayout *pVariantCntLayout = new QVBoxLayout(m_pVariantCnt);
             {
                 m_pVariantButtonGroup = new QButtonGroup(m_pVariantCnt);
@@ -149,7 +149,7 @@
                 }
                 m_pSplitBox = new QCheckBox(m_pVariantCnt);
-                pVariantsLayout->addWidget(m_pDynamicalButton);
-                pVariantsLayout->addWidget(m_pFixedButton);
-                pVariantsLayout->addWidget(m_pSplitBox);
+                pVariantCntLayout->addWidget(m_pDynamicalButton);
+                pVariantCntLayout->addWidget(m_pFixedButton);
+                pVariantCntLayout->addWidget(m_pSplitBox);
             }
         }