Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 41395)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 41396)
@@ -47,8 +47,8 @@
         {
             m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QHBoxLayout *pNameAndSystemLayout = new QHBoxLayout(m_pNameAndSystemCnt);
+            QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
             {
                 m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt);
-                pNameAndSystemLayout->addWidget(m_pNameAndSystemEditor);
+                pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
             }
         }
@@ -56,5 +56,5 @@
         {
             m_pMemoryCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QGridLayout *pMemoryLayout = new QGridLayout(m_pMemoryCnt);
+            QGridLayout *pMemoryCntLayout = new QGridLayout(m_pMemoryCnt);
             {
                 m_pRamSlider = new VBoxGuestRAMSlider(m_pMemoryCnt);
@@ -85,10 +85,10 @@
                     m_pRamMax->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
                 }
-                pMemoryLayout->addWidget(m_pRamSlider, 0, 0, 1, 3);
-                pMemoryLayout->addWidget(m_pRamEditor, 0, 3);
-                pMemoryLayout->addWidget(m_pRamUnits, 0, 4);
-                pMemoryLayout->addWidget(m_pRamMin, 1, 0);
-                pMemoryLayout->setColumnStretch(1, 1);
-                pMemoryLayout->addWidget(m_pRamMax, 1, 2);
+                pMemoryCntLayout->addWidget(m_pRamSlider, 0, 0, 1, 3);
+                pMemoryCntLayout->addWidget(m_pRamEditor, 0, 3);
+                pMemoryCntLayout->addWidget(m_pRamUnits, 0, 4);
+                pMemoryCntLayout->addWidget(m_pRamMin, 1, 0);
+                pMemoryCntLayout->setColumnStretch(1, 1);
+                pMemoryCntLayout->addWidget(m_pRamMax, 1, 2);
             }
         }
@@ -96,5 +96,5 @@
         {
             m_pDiskCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QGridLayout *pDiskLayout = new QGridLayout(m_pDiskCnt);
+            QGridLayout *pDiskCntLayout = new QGridLayout(m_pDiskCnt);
             {
                 m_pDiskSkip = new QRadioButton(m_pDiskCnt);
@@ -107,5 +107,5 @@
                 options.initFrom(m_pDiskPresent);
                 int iWidth = m_pDiskPresent->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, &options, m_pDiskPresent);
-                pDiskLayout->setColumnMinimumWidth(0, iWidth);
+                pDiskCntLayout->setColumnMinimumWidth(0, iWidth);
                 m_pDiskSelector = new VBoxMediaComboBox(m_pDiskCnt);
                 {
@@ -118,9 +118,9 @@
                     m_pVMMButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_16px.png"));
                 }
-                pDiskLayout->addWidget(m_pDiskSkip, 0, 0, 1, 3);
-                pDiskLayout->addWidget(m_pDiskCreate, 1, 0, 1, 3);
-                pDiskLayout->addWidget(m_pDiskPresent, 2, 0, 1, 3);
-                pDiskLayout->addWidget(m_pDiskSelector, 3, 1);
-                pDiskLayout->addWidget(m_pVMMButton, 3, 2);
+                pDiskCntLayout->addWidget(m_pDiskSkip, 0, 0, 1, 3);
+                pDiskCntLayout->addWidget(m_pDiskCreate, 1, 0, 1, 3);
+                pDiskCntLayout->addWidget(m_pDiskPresent, 2, 0, 1, 3);
+                pDiskCntLayout->addWidget(m_pDiskSelector, 3, 1);
+                pDiskCntLayout->addWidget(m_pVMMButton, 3, 2);
             }
         }