Changeset 66245 in vbox

Timestamp:

Mar 24, 2017 1:43:51 PM (8 years ago)

Author:

vboxsync

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

114166

Message:

FE/Qt: Machine settings: Refactoring (renaming and tuning).

Location:

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

Files:

• UISettingsDialogSpecific.cpp (modified) (1 diff)
• machine/UIMachineSettingsDisplay.cpp (modified) (28 diffs)
• machine/UIMachineSettingsDisplay.h (modified) (3 diffs)
• machine/UIMachineSettingsGeneral.h (modified) (1 diff)
• machine/UIMachineSettingsInterface.cpp (modified) (2 diffs)
• machine/UIMachineSettingsInterface.h (modified) (2 diffs)
• machine/UIMachineSettingsNetwork.cpp (modified) (23 diffs)
• machine/UIMachineSettingsNetwork.h (modified) (3 diffs)
• machine/UIMachineSettingsParallel.cpp (modified) (3 diffs)
• machine/UIMachineSettingsSF.cpp (modified) (26 diffs)
• machine/UIMachineSettingsSF.h (modified) (2 diffs)
• machine/UIMachineSettingsSerial.cpp (modified) (4 diffs)
• machine/UIMachineSettingsStorage.cpp (modified) (74 diffs)
• machine/UIMachineSettingsStorage.h (modified) (5 diffs)
• machine/UIMachineSettingsSystem.cpp (modified) (16 diffs)
• machine/UIMachineSettingsSystem.h (modified) (3 diffs)
• machine/UIMachineSettingsUSB.cpp (modified) (21 diffs)
• machine/UIMachineSettingsUSB.h (modified) (2 diffs)

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

@@ -389 +389 @@
                 {
                     pSettingsPage = new UIMachineSettingsStorage;
-                    connect(pSettingsPage, SIGNAL(storageChanged()), this, SLOT(sltResetFirstRunFlag()));
+                    connect(pSettingsPage, SIGNAL(sigStorageChanged()), this, SLOT(sltResetFirstRunFlag()));
                     addItem(":/hd_32px.png", ":/hd_24px.png", ":/hd_16px.png",
                             iPageIndex, "#storage", pSettingsPage);

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

@@ -174 +174 @@
 }
 
-void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType)
+void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType comGuestOSType)
 {
     /* Check if guest os type changed: */
-    if (m_guestOSType == guestOSType)
+    if (m_comGuestOSType == comGuestOSType)
         return;
 
     /* Remember new guest os type: */
-    m_guestOSType = guestOSType;
+    m_comGuestOSType = comGuestOSType;
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
     /* Check if 2D video acceleration supported by the guest OS type: */
-    QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
-    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows";
+    const QString strGuestOSTypeFamily = m_comGuestOSType.GetFamilyId();
+    m_f2DVideoAccelerationSupported = strGuestOSTypeFamily == "Windows";
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 #ifdef VBOX_WITH_CRHGSMI
     /* Check if WDDM mode supported by the guest OS type: */
-    QString strguestOSTypeId = m_guestOSType.GetId();
-    m_fWddmModeSupported = VBoxGlobal::isWddmCompatibleOsType(strguestOSTypeId);
+    const QString strGuestOSTypeId = m_comGuestOSType.GetId();
+    m_fWddmModeSupported = VBoxGlobal::isWddmCompatibleOsType(strGuestOSTypeId);
 #endif /* VBOX_WITH_CRHGSMI */
 
@@ -466 +466 @@
 
         /* Video RAM amount test: */
-        if (shouldWeWarnAboutLowVideoMemory() && !m_guestOSType.isNull())
+        if (shouldWeWarnAboutLowVRAM() && !m_comGuestOSType.isNull())
         {
-            quint64 uNeedBytes = VBoxGlobal::requiredVideoMemory(m_guestOSType.GetId(), m_pEditorVideoScreenCount->value());
+            quint64 uNeedBytes = VBoxGlobal::requiredVideoMemory(m_comGuestOSType.GetId(), m_pEditorVideoScreenCount->value());
 
             /* Basic video RAM amount test: */
@@ -629 +629 @@
     m_pLabelVideoCaptureQualityMax->setText(tr("high", "quality"));
 
-    updateVideoCaptureSizeHint();
+    updateVideoCaptureFileSizeHint();
 }
 
@@ -702 +702 @@
 }
 
-void UIMachineSettingsDisplay::sltHandleVideoScreenCountSliderChange()
+void UIMachineSettingsDisplay::sltHandleGuestScreenCountSliderChange()
 {
     /* Apply proposed screen-count: */
@@ -713 +713 @@
 
     /* Update Video Capture tab screen count: */
-    updateVideoCaptureScreenCount();
+    updateGuestScreenCount();
 
     /* Revalidate: */
@@ -719 +719 @@
 }
 
-void UIMachineSettingsDisplay::sltHandleVideoScreenCountEditorChange()
+void UIMachineSettingsDisplay::sltHandleGuestScreenCountEditorChange()
 {
     /* Apply proposed screen-count: */
@@ -730 +730 @@
 
     /* Update Video Capture tab screen count: */
-    updateVideoCaptureScreenCount();
+    updateGuestScreenCount();
 
     /* Revalidate: */
@@ -757 +757 @@
      * 1. Machine is in 'offline' or 'saved' state and check-box is checked,
      * 2. Machine is in 'online' state, check-box is checked, and video recording is *disabled* currently. */
-    bool fIsVideoCaptureOptionsEnabled = ((isMachineOffline() || isMachineSaved()) && m_pCheckboxVideoCapture->isChecked()) ||
-                                         (isMachineOnline() && !m_pCache->base().m_fVideoCaptureEnabled && m_pCheckboxVideoCapture->isChecked());
+    const bool fIsVideoCaptureOptionsEnabled = ((isMachineOffline() || isMachineSaved()) && m_pCheckboxVideoCapture->isChecked()) ||
+                                               (isMachineOnline() && !m_pCache->base().m_fVideoCaptureEnabled && m_pCheckboxVideoCapture->isChecked());
 
     /* Video Capture Screens option should be enabled only if:
      * Machine is in *any* valid state and check-box is checked. */
-    bool fIsVideoCaptureScreenOptionEnabled = isMachineInValidMode() && m_pCheckboxVideoCapture->isChecked();
+    const bool fIsVideoCaptureScreenOptionEnabled = isMachineInValidMode() && m_pCheckboxVideoCapture->isChecked();
 
     m_pLabelVideoCapturePath->setEnabled(fIsVideoCaptureOptionsEnabled);
@@ -788 +788 @@
 {
     /* Get the proposed size: */
-    int iCurrentIndex = m_pComboVideoCaptureSize->currentIndex();
-    QSize videoCaptureSize = m_pComboVideoCaptureSize->itemData(iCurrentIndex).toSize();
+    const int iCurrentIndex = m_pComboVideoCaptureSize->currentIndex();
+    const QSize videoCaptureSize = m_pComboVideoCaptureSize->itemData(iCurrentIndex).toSize();
 
     /* Make sure its valid: */
@@ -803 +803 @@
 {
     /* Look for preset: */
-    lookForCorrespondingSizePreset();
+    lookForCorrespondingFrameSizePreset();
     /* Update quality and bit-rate: */
     sltHandleVideoCaptureQualitySliderChange();
@@ -811 +811 @@
 {
     /* Look for preset: */
-    lookForCorrespondingSizePreset();
+    lookForCorrespondingFrameSizePreset();
     /* Update quality and bit-rate: */
     sltHandleVideoCaptureQualitySliderChange();
@@ -845 +845 @@
                                                             m_pSliderVideoCaptureQuality->value()));
     m_pEditorVideoCaptureBitRate->blockSignals(false);
-    updateVideoCaptureSizeHint();
+    updateVideoCaptureFileSizeHint();
 }
 
@@ -857 +857 @@
                                                             m_pEditorVideoCaptureBitRate->value()));
     m_pSliderVideoCaptureQuality->blockSignals(false);
-    updateVideoCaptureSizeHint();
+    updateVideoCaptureFileSizeHint();
 }
 
@@ -877 +877 @@
 {
     /* Prepare memory-size slider: */
-    CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
+    const CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
     m_iMinVRAM = sys.GetMinGuestVRAM();
     m_iMaxVRAM = sys.GetMaxGuestVRAM();
@@ -884 +884 @@
     m_pSliderVideoMemorySize->setMinimum(m_iMinVRAM);
     m_pSliderVideoMemorySize->setMaximum(m_iMaxVRAMVisible);
-    m_pSliderVideoMemorySize->setPageStep(calcPageStep(m_iMaxVRAMVisible));
+    m_pSliderVideoMemorySize->setPageStep(calculatePageStep(m_iMaxVRAMVisible));
     m_pSliderVideoMemorySize->setSingleStep(m_pSliderVideoMemorySize->pageStep() / 4);
     m_pSliderVideoMemorySize->setTickInterval(m_pSliderVideoMemorySize->pageStep());
@@ -908 +908 @@
     m_pSliderVideoScreenCount->setOptimalHint(cMinGuestScreens, cHostScreens);
     m_pSliderVideoScreenCount->setWarningHint(cHostScreens, cMaxGuestScreensForSlider);
-    connect(m_pSliderVideoScreenCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoScreenCountSliderChange()));
+    connect(m_pSliderVideoScreenCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleGuestScreenCountSliderChange()));
 
     /* Prepare screen-count editor: */
@@ -914 +914 @@
     m_pEditorVideoScreenCount->setMinimum(1);
     m_pEditorVideoScreenCount->setMaximum(cMaxGuestScreens);
-    connect(m_pEditorVideoScreenCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoScreenCountEditorChange()));
+    connect(m_pEditorVideoScreenCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleGuestScreenCountEditorChange()));
 
     /* Prepare scale-factor slider: */
@@ -1040 +1040 @@
 {
     /* Make sure guest OS type is set: */
-    if (m_guestOSType.isNull())
+    if (m_comGuestOSType.isNull())
         return;
 
     /* Get monitors count and base video memory requirements: */
-    int cGuestScreenCount = m_pEditorVideoScreenCount->value();
-    quint64 uNeedMBytes = VBoxGlobal::requiredVideoMemory(m_guestOSType.GetId(), cGuestScreenCount) / _1M;
+    const int cGuestScreenCount = m_pEditorVideoScreenCount->value();
+    quint64 uNeedMBytes = VBoxGlobal::requiredVideoMemory(m_comGuestOSType.GetId(), cGuestScreenCount) / _1M;
 
     /* Initial value: */
@@ -1081 +1081 @@
     m_pEditorVideoMemorySize->setMaximum(m_iMaxVRAMVisible);
     m_pSliderVideoMemorySize->setMaximum(m_iMaxVRAMVisible);
-    m_pSliderVideoMemorySize->setPageStep(calcPageStep(m_iMaxVRAMVisible));
+    m_pSliderVideoMemorySize->setPageStep(calculatePageStep(m_iMaxVRAMVisible));
     m_pSliderVideoMemorySize->setWarningHint(1, qMin((int)uNeedMBytes, m_iMaxVRAMVisible));
     m_pSliderVideoMemorySize->setOptimalHint(qMin((int)uNeedMBytes, m_iMaxVRAMVisible), m_iMaxVRAMVisible);
@@ -1087 +1087 @@
 }
 
-bool UIMachineSettingsDisplay::shouldWeWarnAboutLowVideoMemory()
+bool UIMachineSettingsDisplay::shouldWeWarnAboutLowVRAM()
 {
     bool fResult = true;
@@ -1093 +1093 @@
     QStringList excludingOSList = QStringList()
         << "Other" << "DOS" << "Netware" << "L4" << "QNX" << "JRockitVE";
-    if (excludingOSList.contains(m_guestOSType.GetId()))
+    if (excludingOSList.contains(m_comGuestOSType.GetId()))
         fResult = false;
 
@@ -1100 +1100 @@
 
 /* static */
-int UIMachineSettingsDisplay::calcPageStep(int iMax)
+int UIMachineSettingsDisplay::calculatePageStep(int iMax)
 {
     /* Reasonable max. number of page steps is 32. */
-    uint page = ((uint)iMax + 31) / 32;
+    uint uPage = ((uint)iMax + 31) / 32;
     /* Make it a power of 2: */
-    uint p = page, p2 = 0x1;
-    while ((p >>= 1))
+    uint uP = uPage, p2 = 0x1;
+    while ((uP >>= 1))
         p2 <<= 1;
-    if (page != p2)
+    if (uPage != p2)
         p2 <<= 1;
     if (p2 < 4)
@@ -1115 +1115 @@
 }
 
-void UIMachineSettingsDisplay::lookForCorrespondingSizePreset()
+void UIMachineSettingsDisplay::lookForCorrespondingFrameSizePreset()
 {
     /* Look for video-capture size preset: */
@@ -1123 +1123 @@
 }
 
-void UIMachineSettingsDisplay::updateVideoCaptureScreenCount()
+void UIMachineSettingsDisplay::updateGuestScreenCount()
 {
     /* Update copy of the cached item to get the desired result: */
@@ -1131 +1131 @@
 }
 
-void UIMachineSettingsDisplay::updateVideoCaptureSizeHint()
+void UIMachineSettingsDisplay::updateVideoCaptureFileSizeHint()
 {
     m_pLabelVideoCaptureSizeHint->setText(tr("<i>About %1MB per 5 minute video</i>").arg(m_pEditorVideoCaptureBitRate->value() * 300 / 8 / 1024));
@@ -1137 +1137 @@
 
 /* static */
-void UIMachineSettingsDisplay::lookForCorrespondingPreset(QComboBox *pWhere, const QVariant &whichData)
+void UIMachineSettingsDisplay::lookForCorrespondingPreset(QComboBox *pComboBox, const QVariant &data)
 {
     /* Use passed iterator to look for corresponding preset of passed combo-box: */
-    int iLookupResult = pWhere->findData(whichData);
-    if (iLookupResult != -1 && pWhere->currentIndex() != iLookupResult)
-        pWhere->setCurrentIndex(iLookupResult);
-    else if (iLookupResult == -1 && pWhere->currentIndex() != 0)
-        pWhere->setCurrentIndex(0);
+    const int iLookupResult = pComboBox->findData(data);
+    if (iLookupResult != -1 && pComboBox->currentIndex() != iLookupResult)
+        pComboBox->setCurrentIndex(iLookupResult);
+    else if (iLookupResult == -1 && pComboBox->currentIndex() != 0)
+        pComboBox->setCurrentIndex(0);
 }
 
@@ -1151 +1151 @@
 {
     /* Linear quality<=>bit-rate scale-factor: */
-    double dResult = (double)iQuality
-                   * (double)iFrameWidth * (double)iFrameHeight * (double)iFrameRate
-                   / (double)10 /* translate quality to [%] */
-                   / (double)1024 /* translate bit-rate to [kbps] */
-                   / (double)18.75 /* linear scale factor */;
+    const double dResult = (double)iQuality
+                         * (double)iFrameWidth * (double)iFrameHeight * (double)iFrameRate
+                         / (double)10 /* translate quality to [%] */
+                         / (double)1024 /* translate bit-rate to [kbps] */
+                         / (double)18.75 /* linear scale factor */;
     return (int)dResult;
 }
@@ -1163 +1163 @@
 {
     /* Linear bit-rate<=>quality scale-factor: */
-    double dResult = (double)iBitRate
-                   / (double)iFrameWidth / (double)iFrameHeight / (double)iFrameRate
-                   * (double)10 /* translate quality to [%] */
-                   * (double)1024 /* translate bit-rate to [kbps] */
-                   * (double)18.75 /* linear scale factor */;
+    const double dResult = (double)iBitRate
+                         / (double)iFrameWidth / (double)iFrameHeight / (double)iFrameRate
+                         * (double)10 /* translate quality to [%] */
+                         * (double)1024 /* translate bit-rate to [kbps] */
+                         * (double)18.75 /* linear scale factor */;
     return (int)dResult;
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

@@ -46 +46 @@
 
     /* API: Correlation stuff: */
-    void setGuestOSType(CGuestOSType guestOSType);
+    void setGuestOSType(CGuestOSType comGuestOSType);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -88 +88 @@
     void sltHandleVideoMemorySizeSliderChange();
     void sltHandleVideoMemorySizeEditorChange();
-    void sltHandleVideoScreenCountSliderChange();
-    void sltHandleVideoScreenCountEditorChange();
+    void sltHandleGuestScreenCountSliderChange();
+    void sltHandleGuestScreenCountEditorChange();
     void sltHandleGuestScreenScaleSliderChange();
     void sltHandleGuestScreenScaleEditorChange();
@@ -116 +116 @@
     /* Helpers: Video stuff: */
     void checkVRAMRequirements();
-    bool shouldWeWarnAboutLowVideoMemory();
-    static int calcPageStep(int iMax);
+    bool shouldWeWarnAboutLowVRAM();
+    static int calculatePageStep(int iMax);
 
     /* Helpers: Video Capture stuff: */
-    void lookForCorrespondingSizePreset();
-    void updateVideoCaptureScreenCount();
-    void updateVideoCaptureSizeHint();
-    static void lookForCorrespondingPreset(QComboBox *pWhere, const QVariant &whichData);
+    void lookForCorrespondingFrameSizePreset();
+    void updateGuestScreenCount();
+    void updateVideoCaptureFileSizeHint();
+    static void lookForCorrespondingPreset(QComboBox *pComboBox, const QVariant &data);
     static int calculateBitRate(int iFrameWidth, int iFrameHeight, int iFrameRate, int iQuality);
     static int calculateQuality(int iFrameWidth, int iFrameHeight, int iFrameRate, int iBitRate);
 
     /* Guest OS type id: */
-    CGuestOSType m_guestOSType;
+    CGuestOSType  m_comGuestOSType;
     /* System minimum lower limit of VRAM (MiB). */
-    int m_iMinVRAM;
+    int           m_iMinVRAM;
     /* System maximum limit of VRAM (MiB). */
-    int m_iMaxVRAM;
+    int           m_iMaxVRAM;
     /* Upper limit of VRAM in MiB for this dialog. This value is lower than
      * m_maxVRAM to save careless users from setting useless big values. */
-    int m_iMaxVRAMVisible;
+    int           m_iMaxVRAMVisible;
     /* Initial VRAM value when the dialog is opened. */
-    int m_iInitialVRAM;
+    int           m_iInitialVRAM;
 #ifdef VBOX_WITH_VIDEOHWACCEL
     /* Specifies whether the guest OS supports 2D video-acceleration: */
-    bool m_f2DVideoAccelerationSupported;
+    bool          m_f2DVideoAccelerationSupported;
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 #ifdef VBOX_WITH_CRHGSMI
     /* Specifies whether the guest OS supports WDDM: */
-    bool m_fWddmModeSupported;
+    bool          m_fWddmModeSupported;
 #endif /* VBOX_WITH_CRHGSMI */
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

@@ -106 +106 @@
 
     /** Holds whether HW virtualization extension is enabled. */
-    bool m_fHWVirtExEnabled;
+    bool  m_fHWVirtExEnabled;
 
     /** Holds whether the encryption cipher was changed.
       * We are holding that argument here because we do not know
       * the old <i>cipher</i> for sure to compare the new one with. */
-    bool m_fEncryptionCipherChanged;
+    bool  m_fEncryptionCipherChanged;
     /** Holds whether the encryption password was changed.
       * We are holding that argument here because we do not know
       * the old <i>password</i> at all to compare the new one with. */
-    bool m_fEncryptionPasswordChanged;
+    bool  m_fEncryptionPasswordChanged;
 
     /** Holds the hard-coded encryption cipher list.
       * We are hard-coding it because there is no place we can get it from. */
-    QStringList m_encryptionCiphers;
+    QStringList  m_encryptionCiphers;
 
     /** Holds the page data cache instance. */

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

@@ -134 +134 @@
 
 
-UIMachineSettingsInterface::UIMachineSettingsInterface(const QString strMachineID)
-    : m_strMachineID(strMachineID)
+UIMachineSettingsInterface::UIMachineSettingsInterface(const QString strMachineId)
+    : m_strMachineId(strMachineId)
     , m_pActionPool(0)
     , m_pCache(new UISettingsCacheMachineInterface)
@@ -344 +344 @@
 
     /* Assign corresponding machine ID: */
-    m_pMenuBarEditor->setMachineID(m_strMachineID);
-    m_pStatusBarEditor->setMachineID(m_strMachineID);
+    m_pMenuBarEditor->setMachineID(m_strMachineId);
+    m_pStatusBarEditor->setMachineID(m_strMachineId);
 
     /* Translate finally: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

@@ -38 +38 @@
 
     /** Constructs User Interface settings page. */
-    UIMachineSettingsInterface(const QString strMachineID);
+    UIMachineSettingsInterface(const QString strMachineId);
     /** Destructs User Interface settings page. */
     ~UIMachineSettingsInterface();
@@ -76 +76 @@
 
     /** Holds the machine ID copy. */
-    const QString m_strMachineID;
+    const QString  m_strMachineId;
     /** Holds the action-pool instance. */
-    UIActionPool *m_pActionPool;
+    UIActionPool  *m_pActionPool;
 
     /** Holds the page data cache instance. */

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

@@ -259 +259 @@
     connect(m_pMACButton, SIGNAL(clicked()), this, SLOT(sltGenerateMac()));
     connect(m_pPortForwardingButton, SIGNAL(clicked()), this, SLOT(sltOpenPortForwardingDlg()));
-    connect(this, SIGNAL(sigTabUpdated()), m_pParent, SLOT(sltHandleUpdatedTab()));
+    connect(this, SIGNAL(sigTabUpdated()), m_pParent, SLOT(sltHandleTabUpdate()));
 
     /* Prepare validation: */
@@ -992 +992 @@
 /* UIMachineSettingsNetworkPage Stuff: */
 UIMachineSettingsNetworkPage::UIMachineSettingsNetworkPage()
-    : m_pTwAdapters(0)
+    : m_pTabWidgetAdapters(0)
     , m_pCache(new UISettingsCacheMachineNetwork)
 {
@@ -1000 +1000 @@
 
     /* Creating tab-widget: */
-    m_pTwAdapters = new QITabWidget(this);
-    pMainLayout->addWidget(m_pTwAdapters);
+    m_pTabWidgetAdapters = new QITabWidget(this);
+    pMainLayout->addWidget(m_pTabWidgetAdapters);
 
     /* How many adapters to display: */
@@ -1016 +1016 @@
         connect(pTab, SIGNAL(sigNotifyAdvancedButtonStateChange(bool)),
                 this, SLOT(sltHandleAdvancedButtonStateChange(bool)));
-        m_pTwAdapters->addTab(pTab, pTab->tabTitle());
+        m_pTabWidgetAdapters->addTab(pTab, pTab->tabTitle());
     }
 }
@@ -1048 +1048 @@
 
     /* For each network adapter: */
-    for (int iSlot = 0; iSlot < m_pTwAdapters->count(); ++iSlot)
+    for (int iSlot = 0; iSlot < m_pTabWidgetAdapters->count(); ++iSlot)
     {
         /* Prepare adapter data: */
@@ -1071 +1071 @@
             adapterData.m_promiscuousMode = adapter.GetPromiscModePolicy();
             adapterData.m_strMACAddress = adapter.GetMACAddress();
-            adapterData.m_strGenericProperties = summarizeGenericProperties(adapter);
+            adapterData.m_strGenericProperties = loadGenericProperties(adapter);
             adapterData.m_fCableConnected = adapter.GetCableConnected();
 
@@ -1101 +1101 @@
     /* Setup tab order: */
     Assert(firstWidget());
-    setTabOrder(firstWidget(), m_pTwAdapters->focusProxy());
-    QWidget *pLastFocusWidget = m_pTwAdapters->focusProxy();
+    setTabOrder(firstWidget(), m_pTabWidgetAdapters->focusProxy());
+    QWidget *pLastFocusWidget = m_pTabWidgetAdapters->focusProxy();
 
     /* For each network adapter: */
-    for (int iSlot = 0; iSlot < m_pTwAdapters->count(); ++iSlot)
+    for (int iSlot = 0; iSlot < m_pTabWidgetAdapters->count(); ++iSlot)
     {
         /* Get adapter page: */
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(iSlot));
 
         /* Load adapter data to page: */
@@ -1130 +1130 @@
 {
     /* For each network adapter: */
-    for (int iSlot = 0; iSlot < m_pTwAdapters->count(); ++iSlot)
+    for (int iSlot = 0; iSlot < m_pTabWidgetAdapters->count(); ++iSlot)
     {
         /* Get adapter page: */
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(iSlot));
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(iSlot));
 
         /* Gather & cache adapter data: */
@@ -1149 +1149 @@
     {
         /* For each network adapter: */
-        for (int iSlot = 0; iSlot < m_pTwAdapters->count(); ++iSlot)
+        for (int iSlot = 0; iSlot < m_pTabWidgetAdapters->count(); ++iSlot)
         {
             /* Check if adapter data was changed: */
@@ -1186 +1186 @@
                             case KNetworkAttachmentType_Generic:
                                 adapter.SetGenericDriver(adapterData.m_strGenericDriverName);
-                                updateGenericProperties(adapter, adapterData.m_strGenericProperties);
+                                saveGenericProperties(adapter, adapterData.m_strGenericProperties);
                                 break;
                             case KNetworkAttachmentType_NATNetwork:
@@ -1231 +1231 @@
 
     /* Delegate validation to adapter tabs: */
-    for (int i = 0; i < m_pTwAdapters->count(); ++i)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(i));
+    for (int i = 0; i < m_pTabWidgetAdapters->count(); ++i)
+    {
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(i));
         AssertMsg(pTab, ("Can't get adapter tab!\n"));
         if (!pTab->validate(messages))
@@ -1245 +1245 @@
 void UIMachineSettingsNetworkPage::retranslateUi()
 {
-    for (int i = 0; i < m_pTwAdapters->count(); ++ i)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(i));
+    for (int i = 0; i < m_pTabWidgetAdapters->count(); ++i)
+    {
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(i));
         Assert(pTab);
-        m_pTwAdapters->setTabText(i, pTab->tabTitle());
+        m_pTabWidgetAdapters->setTabText(i, pTab->tabTitle());
     }
 }
@@ -1256 +1256 @@
 {
     /* Get the count of network adapter tabs: */
-    for (int iSlot = 0; iSlot < m_pTwAdapters->count(); ++iSlot)
-    {
-        m_pTwAdapters->setTabEnabled(iSlot,
-                                     isMachineOffline() ||
-                                     (isMachineInValidMode() && m_pCache->child(iSlot).base().m_fAdapterEnabled));
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(iSlot));
+    for (int iSlot = 0; iSlot < m_pTabWidgetAdapters->count(); ++iSlot)
+    {
+        m_pTabWidgetAdapters->setTabEnabled(iSlot,
+                                            isMachineOffline() ||
+                                            (isMachineInValidMode() && m_pCache->child(iSlot).base().m_fAdapterEnabled));
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(iSlot));
         pTab->polishTab();
     }
 }
 
-void UIMachineSettingsNetworkPage::sltHandleUpdatedTab()
+void UIMachineSettingsNetworkPage::sltHandleTabUpdate()
 {
     /* Determine the sender: */
@@ -1273 +1273 @@
 
     /* Determine sender's attachment type: */
-    KNetworkAttachmentType senderAttachmentType = pSender->attachmentType();
-    switch (senderAttachmentType)
+    const KNetworkAttachmentType enmSenderAttachmentType = pSender->attachmentType();
+    switch (enmSenderAttachmentType)
     {
         case KNetworkAttachmentType_Internal:
@@ -1291 +1291 @@
 
     /* Update all the tabs except the sender: */
-    for (int iSlot = 0; iSlot < m_pTwAdapters->count(); ++iSlot)
+    for (int iSlot = 0; iSlot < m_pTabWidgetAdapters->count(); ++iSlot)
     {
         /* Get the iterated tab: */
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(iSlot));
-        AssertMsg(pTab, ("All the tabs of m_pTwAdapters should be of the UIMachineSettingsNetwork type!\n"));
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(iSlot));
+        AssertMsg(pTab, ("All the tabs of m_pTabWidgetAdapters should be of the UIMachineSettingsNetwork type!\n"));
 
         /* Update all the tabs (except sender) with the same attachment type as sender have: */
-        if (pTab != pSender && pTab->attachmentType() == senderAttachmentType)
+        if (pTab != pSender && pTab->attachmentType() == enmSenderAttachmentType)
             pTab->reloadAlternative();
     }
@@ -1306 +1306 @@
 {
     /* Update the advanced button states for all the pages: */
-    for (int iSlot = 0; iSlot < m_pTwAdapters->count(); ++iSlot)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(iSlot));
+    for (int iSlot = 0; iSlot < m_pTabWidgetAdapters->count(); ++iSlot)
+    {
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(iSlot));
         pTab->setAdvancedButtonState(fExpanded);
     }
@@ -1334 +1334 @@
         m_internalNetworkList << otherInternalNetworkList();
     /* Append internal network list with names from all the tabs: */
-    for (int iTab = 0; iTab < m_pTwAdapters->count(); ++iTab)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(iTab));
+    for (int iTab = 0; iTab < m_pTabWidgetAdapters->count(); ++iTab)
+    {
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(iTab));
         if (pTab)
         {
-            QString strName = pTab->alternativeName(KNetworkAttachmentType_Internal);
+            const QString strName = pTab->alternativeName(KNetworkAttachmentType_Internal);
             if (!strName.isEmpty() && !m_internalNetworkList.contains(strName))
                 m_internalNetworkList << strName;
@@ -1367 +1367 @@
         m_genericDriverList << otherGenericDriverList();
     /* Append generic driver list with names from all the tabs: */
-    for (int iTab = 0; iTab < m_pTwAdapters->count(); ++iTab)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTwAdapters->widget(iTab));
+    for (int iTab = 0; iTab < m_pTabWidgetAdapters->count(); ++iTab)
+    {
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidgetAdapters->widget(iTab));
         if (pTab)
         {
-            QString strName = pTab->alternativeName(KNetworkAttachmentType_Generic);
+            const QString strName = pTab->alternativeName(KNetworkAttachmentType_Generic);
             if (!strName.isEmpty() && !m_genericDriverList.contains(strName))
                 m_genericDriverList << strName;
@@ -1395 +1395 @@
 {
     /* Load total internal network list of all VMs: */
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-    QStringList otherInternalNetworks(QList<QString>::fromVector(vbox.GetInternalNetworks()));
+    const CVirtualBox vbox = vboxGlobal().virtualBox();
+    const QStringList otherInternalNetworks(QList<QString>::fromVector(vbox.GetInternalNetworks()));
     return otherInternalNetworks;
 }
@@ -1404 +1404 @@
 {
     /* Load total generic driver list of all VMs: */
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-    QStringList otherGenericDrivers(QList<QString>::fromVector(vbox.GetGenericNetworkDrivers()));
+    const CVirtualBox vbox = vboxGlobal().virtualBox();
+    const QStringList otherGenericDrivers(QList<QString>::fromVector(vbox.GetGenericNetworkDrivers()));
     return otherGenericDrivers;
 }
 
 /* static */
-QString UIMachineSettingsNetworkPage::summarizeGenericProperties(const CNetworkAdapter &adapter)
+QString UIMachineSettingsNetworkPage::loadGenericProperties(const CNetworkAdapter &adapter)
 {
     /* Prepare formatted string: */
@@ -1429 +1429 @@
 
 /* static */
-void UIMachineSettingsNetworkPage::updateGenericProperties(CNetworkAdapter &adapter, const QString &strPropText)
+void UIMachineSettingsNetworkPage::saveGenericProperties(CNetworkAdapter &adapter, const QString &strProperties)
 {
     /* Parse new properties: */
-    QStringList newProps = strPropText.split("\n");
+    const QStringList newProps = strProperties.split("\n");
     QHash<QString, QString> hash;
 
@@ -1438 +1438 @@
     for (int i = 0; i < newProps.size(); ++i)
     {
-        QString strLine = newProps[i];
-        int iSplitPos = strLine.indexOf("=");
+        const QString strLine = newProps[i];
+        const int iSplitPos = strLine.indexOf("=");
         if (iSplitPos)
         {
-            QString strKey = strLine.left(iSplitPos);
-            QString strVal = strLine.mid(iSplitPos+1);
+            const QString strKey = strLine.left(iSplitPos);
+            const QString strVal = strLine.mid(iSplitPos + 1);
             adapter.SetProperty(strKey, strVal);
             hash[strKey] = strVal;
@@ -1455 +1455 @@
     for (int i = 0; i < names.size(); ++i)
     {
-        QString strName = names[i];
-        QString strValue = props[i];
+        const QString strName = names[i];
+        const QString strValue = props[i];
         if (strValue != hash[strName])
             adapter.SetProperty(strName, hash[strName]);

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

@@ -46 +46 @@
 
     /* Bridged adapter list: */
-    const QStringList& bridgedAdapterList() const { return m_bridgedAdapterList; }
+    const QStringList &bridgedAdapterList() const { return m_bridgedAdapterList; }
     /* Internal network list: */
-    const QStringList& internalNetworkList() const { return m_internalNetworkList; }
+    const QStringList &internalNetworkList() const { return m_internalNetworkList; }
     /* Host-only interface list: */
-    const QStringList& hostInterfaceList() const { return m_hostInterfaceList; }
+    const QStringList &hostInterfaceList() const { return m_hostInterfaceList; }
     /* Generic driver list: */
-    const QStringList& genericDriverList() const { return m_genericDriverList; }
+    const QStringList &genericDriverList() const { return m_genericDriverList; }
     /* NAT network list: */
-    const QStringList& natNetworkList() const { return m_natNetworkList; }
+    const QStringList &natNetworkList() const { return m_natNetworkList; }
 
 protected:
@@ -87 +87 @@
 
     /* Handles tab updates: */
-    void sltHandleUpdatedTab();
+    void sltHandleTabUpdate();
 
     /** Handles advanced button state change to @a fExpanded. */
@@ -104 +104 @@
     static QStringList otherInternalNetworkList();
     static QStringList otherGenericDriverList();
-    static QString summarizeGenericProperties(const CNetworkAdapter &adapter);
-    static void updateGenericProperties(CNetworkAdapter &adapter, const QString &strPropText);
+    static QString loadGenericProperties(const CNetworkAdapter &adapter);
+    static void saveGenericProperties(CNetworkAdapter &adapter, const QString &strProperties);
 
     /* Tab holder: */
-    QITabWidget *m_pTwAdapters;
+    QITabWidget *m_pTabWidgetAdapters;
 
     /* Alternative-name lists: */
-    QStringList m_bridgedAdapterList;
-    QStringList m_internalNetworkList;
-    QStringList m_hostInterfaceList;
-    QStringList m_genericDriverList;
-    QStringList m_natNetworkList;
+    QStringList  m_bridgedAdapterList;
+    QStringList  m_internalNetworkList;
+    QStringList  m_hostInterfaceList;
+    QStringList  m_genericDriverList;
+    QStringList  m_natNetworkList;
 
     /** Holds the page data cache instance. */

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

@@ -443 +443 @@
         /* Get current tab/page: */
         QWidget *pTab = mTabWidget->widget(iIndex);
-        UIMachineSettingsParallel *pPage = static_cast<UIMachineSettingsParallel*> (pTab);
+        UIMachineSettingsParallel *pPage = static_cast<UIMachineSettingsParallel*>(pTab);
         if (!pPage->mGbParallel->isChecked())
             continue;
@@ -455 +455 @@
         const QString strIOPort(pPage->mLeIOPort->text());
         const QString strPath(pPage->mLePath->text());
-        QPair<QString, QString> pair(strIRQ, strIOPort);
+        const QPair<QString, QString> pair(strIRQ, strIOPort);
 
         if (strIRQ.isEmpty())
@@ -497 +497 @@
 void UIMachineSettingsParallelPage::retranslateUi()
 {
-    for (int i = 0; i < mTabWidget->count(); ++ i)
-    {
-        UIMachineSettingsParallel *page =
-            static_cast<UIMachineSettingsParallel*> (mTabWidget->widget (i));
-        mTabWidget->setTabText (i, page->pageTitle());
+    for (int i = 0; i < mTabWidget->count(); ++i)
+    {
+        UIMachineSettingsParallel *pPage =
+            static_cast<UIMachineSettingsParallel*>(mTabWidget->widget(i));
+        mTabWidget->setTabText(i, pPage->pageTitle());
     }
 }

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

@@ -238 +238 @@
 
 UIMachineSettingsSF::UIMachineSettingsSF()
-    : mNewAction(0), mEdtAction(0), mDelAction(0)
+    : m_pActionAdd(0), m_pActionEdit(0), m_pActionRemove(0)
     , m_pCache(new UISettingsCacheSharedFolders)
 {
@@ -245 +245 @@
 
     /* Prepare actions */
-    mNewAction = new QAction (this);
-    mEdtAction = new QAction (this);
-    mDelAction = new QAction (this);
-
-    mNewAction->setShortcut (QKeySequence ("Ins"));
-    mEdtAction->setShortcut (QKeySequence ("Ctrl+Space"));
-    mDelAction->setShortcut (QKeySequence ("Del"));
-
-    mNewAction->setIcon(UIIconPool::iconSet(":/sf_add_16px.png",
+    m_pActionAdd = new QAction (this);
+    m_pActionEdit = new QAction (this);
+    m_pActionRemove = new QAction (this);
+
+    m_pActionAdd->setShortcut (QKeySequence ("Ins"));
+    m_pActionEdit->setShortcut (QKeySequence ("Ctrl+Space"));
+    m_pActionRemove->setShortcut (QKeySequence ("Del"));
+
+    m_pActionAdd->setIcon(UIIconPool::iconSet(":/sf_add_16px.png",
                                             ":/sf_add_disabled_16px.png"));
-    mEdtAction->setIcon(UIIconPool::iconSet(":/sf_edit_16px.png",
+    m_pActionEdit->setIcon(UIIconPool::iconSet(":/sf_edit_16px.png",
                                             ":/sf_edit_disabled_16px.png"));
-    mDelAction->setIcon(UIIconPool::iconSet(":/sf_remove_16px.png",
+    m_pActionRemove->setIcon(UIIconPool::iconSet(":/sf_remove_16px.png",
                                             ":/sf_remove_disabled_16px.png"));
 
@@ -267 +267 @@
     m_pFoldersToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
     m_pFoldersToolBar->setOrientation(Qt::Vertical);
-    m_pFoldersToolBar->addAction(mNewAction);
-    m_pFoldersToolBar->addAction(mEdtAction);
-    m_pFoldersToolBar->addAction(mDelAction);
+    m_pFoldersToolBar->addAction(m_pActionAdd);
+    m_pFoldersToolBar->addAction(m_pActionEdit);
+    m_pFoldersToolBar->addAction(m_pActionRemove);
 
     /* Setup connections */
@@ -277 +277 @@
     mTwFolders->header()->setMovable (false);
 #endif /* QT_VERSION < 0x050000 */
-    connect (mNewAction, SIGNAL (triggered (bool)), this, SLOT (addTriggered()));
-    connect (mEdtAction, SIGNAL (triggered (bool)), this, SLOT (edtTriggered()));
-    connect (mDelAction, SIGNAL (triggered (bool)), this, SLOT (delTriggered()));
+    connect (m_pActionAdd, SIGNAL (triggered (bool)), this, SLOT (sltAddSharedFolder()));
+    connect (m_pActionEdit, SIGNAL (triggered (bool)), this, SLOT (sltEditSharedFolder()));
+    connect (m_pActionRemove, SIGNAL (triggered (bool)), this, SLOT (sltDeleteSharedFolder()));
     connect (mTwFolders, SIGNAL (currentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)),
-             this, SLOT (processCurrentChanged (QTreeWidgetItem *)));
+             this, SLOT (sltHandleCurrentItemChange (QTreeWidgetItem *)));
     connect (mTwFolders, SIGNAL (itemDoubleClicked (QTreeWidgetItem *, int)),
-             this, SLOT (processDoubleClick (QTreeWidgetItem *)));
+             this, SLOT (sltHandleDoubleClick (QTreeWidgetItem *)));
     connect (mTwFolders, SIGNAL (customContextMenuRequested (const QPoint &)),
-             this, SLOT (showContextMenu (const QPoint &)));
+             this, SLOT (sltHandleContextMenuRequest (const QPoint &)));
 
     retranslateUi();
@@ -321 +321 @@
 }
 
-void UIMachineSettingsSF::loadToCacheFrom(UISharedFolderType sharedFoldersType)
+void UIMachineSettingsSF::loadToCacheFrom(UISharedFolderType enmSharedFoldersType)
 {
     /* Get current shared folders: */
-    CSharedFolderVector sharedFolders = getSharedFolders(sharedFoldersType);
+    CSharedFolderVector sharedFolders = getSharedFolders(enmSharedFoldersType);
 
     /* For each shared folder: */
@@ -338 +338 @@
         {
             /* Gather shared folder values: */
-            sharedFolderData.m_type = sharedFoldersType;
+            sharedFolderData.m_type = enmSharedFoldersType;
             sharedFolderData.m_strName = folder.GetName();
             sharedFolderData.m_strHostPath = folder.GetHostPath();
@@ -369 +369 @@
         fields << sharedFolderData.m_strName
                << sharedFolderData.m_strHostPath
-               << (sharedFolderData.m_fAutoMount ? mTrYes : "")
-               << (sharedFolderData.m_fWritable ? mTrFull : mTrReadOnly);
+               << (sharedFolderData.m_fAutoMount ? m_strTrYes : "")
+               << (sharedFolderData.m_fWritable ? m_strTrFull : m_strTrReadOnly);
         /* Create new shared folders item: */
         new SFTreeViewItem(root(sharedFolderData.m_type), fields, SFTreeViewItem::EllipsisFile);
@@ -376 +376 @@
     /* Ensure current item fetched: */
     mTwFolders->setCurrentItem(mTwFolders->topLevelItem(0));
-    processCurrentChanged(mTwFolders->currentItem());
+    sltHandleCurrentItemChange(mTwFolders->currentItem());
 
     /* Polish page finally: */
@@ -399 +399 @@
             sharedFolderData.m_strName = pFolderItem->getText(0);
             sharedFolderData.m_strHostPath = pFolderItem->getText(1);
-            sharedFolderData.m_fAutoMount = pFolderItem->getText(2) == mTrYes ? true : false;
-            sharedFolderData.m_fWritable = pFolderItem->getText(3) == mTrFull ? true : false;
+            sharedFolderData.m_fAutoMount = pFolderItem->getText(2) == m_strTrYes ? true : false;
+            sharedFolderData.m_fWritable = pFolderItem->getText(3) == m_strTrFull ? true : false;
             m_pCache->child(sharedFolderData.m_strName).cacheCurrentData(sharedFolderData);
         }
@@ -426 +426 @@
 }
 
-void UIMachineSettingsSF::saveFromCacheTo(UISharedFolderType sharedFoldersType)
+void UIMachineSettingsSF::saveFromCacheTo(UISharedFolderType enmSharedFoldersType)
 {
     /* For each shared folder data set: */
@@ -441 +441 @@
                 const UIDataSettingsSharedFolder &sharedFolderData = sharedFolderCache.base();
                 /* Check if thats shared folder of required type before removing: */
-                if (sharedFolderData.m_type == sharedFoldersType)
+                if (sharedFolderData.m_type == enmSharedFoldersType)
                     removeSharedFolder(sharedFolderCache);
             }
@@ -451 +451 @@
                 const UIDataSettingsSharedFolder &sharedFolderData = sharedFolderCache.data();
                 /* Check if thats shared folder of required type before creating: */
-                if (sharedFolderData.m_type == sharedFoldersType)
+                if (sharedFolderData.m_type == enmSharedFoldersType)
                     createSharedFolder(sharedFolderCache);
             }
@@ -461 +461 @@
                 const UIDataSettingsSharedFolder &sharedFolderData = sharedFolderCache.data();
                 /* Check if thats shared folder of required type before recreating: */
-                if (sharedFolderData.m_type == sharedFoldersType)
+                if (sharedFolderData.m_type == enmSharedFoldersType)
                 {
                     removeSharedFolder(sharedFolderCache);
@@ -476 +476 @@
     Ui::UIMachineSettingsSF::retranslateUi(this);
 
-    mNewAction->setText(tr("Add Shared Folder"));
-    mEdtAction->setText(tr("Edit Shared Folder"));
-    mDelAction->setText(tr("Remove Shared Folder"));
-
-    mNewAction->setWhatsThis(tr("Adds new shared folder."));
-    mEdtAction->setWhatsThis(tr("Edits selected shared folder."));
-    mDelAction->setWhatsThis(tr("Removes selected shared folder."));
-
-    mNewAction->setToolTip(mNewAction->whatsThis());
-    mEdtAction->setToolTip(mEdtAction->whatsThis());
-    mDelAction->setToolTip(mDelAction->whatsThis());
-
-    mTrFull = tr("Full");
-    mTrReadOnly = tr("Read-only");
-    mTrYes = tr("Yes");
+    m_pActionAdd->setText(tr("Add Shared Folder"));
+    m_pActionEdit->setText(tr("Edit Shared Folder"));
+    m_pActionRemove->setText(tr("Remove Shared Folder"));
+
+    m_pActionAdd->setWhatsThis(tr("Adds new shared folder."));
+    m_pActionEdit->setWhatsThis(tr("Edits selected shared folder."));
+    m_pActionRemove->setWhatsThis(tr("Removes selected shared folder."));
+
+    m_pActionAdd->setToolTip(m_pActionAdd->whatsThis());
+    m_pActionEdit->setToolTip(m_pActionEdit->whatsThis());
+    m_pActionRemove->setToolTip(m_pActionRemove->whatsThis());
+
+    m_strTrFull = tr("Full");
+    m_strTrReadOnly = tr("Read-only");
+    m_strTrYes = tr("Yes");
 }
 
@@ -504 +504 @@
 }
 
-void UIMachineSettingsSF::showEvent (QShowEvent *aEvent)
-{
-    UISettingsPageMachine::showEvent (aEvent);
-
-    /* Connect header-resize signal just before widget is shown after all the items properly loaded and initialized. */
-    connect (mTwFolders->header(), SIGNAL (sectionResized (int, int, int)), this, SLOT (adjustFields()));
-
-    /* Adjusting size after all pending show events are processed. */
-    QTimer::singleShot (0, this, SLOT (adjustList()));
-}
-
-void UIMachineSettingsSF::resizeEvent (QResizeEvent *aEvent)
-{
-    NOREF(aEvent);
-    adjustList();
-}
-
-void UIMachineSettingsSF::addTriggered()
-{
-    /* Invoke Add-Box Dialog */
-    UIMachineSettingsSFDetails dlg (UIMachineSettingsSFDetails::AddType, isSharedFolderTypeSupported(ConsoleType), usedList (true), this);
+void UIMachineSettingsSF::showEvent(QShowEvent *pEvent)
+{
+    UISettingsPageMachine::showEvent(pEvent);
+
+    /* Connect header-resize signal just before widget is shown after all the items properly loaded and initialized: */
+    connect(mTwFolders->header(), SIGNAL(sectionResized(int, int, int)), this, SLOT(sltAdjustTreeFields()));
+
+    /* Adjusting size after all pending show events are processed: */
+    QTimer::singleShot(0, this, SLOT(sltAdjustTree()));
+}
+
+void UIMachineSettingsSF::resizeEvent(QResizeEvent * /* pEvent */)
+{
+    sltAdjustTree();
+}
+
+void UIMachineSettingsSF::sltAddSharedFolder()
+{
+    /* Invoke Add-Box Dialog: */
+    UIMachineSettingsSFDetails dlg(UIMachineSettingsSFDetails::AddType, isSharedFolderTypeSupported(ConsoleType), usedList(true), this);
     if (dlg.exec() == QDialog::Accepted)
     {
-        QString name = dlg.name();
-        QString path = dlg.path();
-        bool isPermanent = dlg.isPermanent();
-        /* Shared folder's name & path could not be empty */
-        Assert (!name.isEmpty() && !path.isEmpty());
-        /* Appending a new listview item to the root */
+        const QString strName = dlg.name();
+        const QString strPath = dlg.path();
+        const bool fPermanent = dlg.isPermanent();
+        /* Shared folder's name & path could not be empty: */
+        Assert(!strName.isEmpty() && !strPath.isEmpty());
+        /* Appending a new listview item to the root: */
         QStringList fields;
-        fields << name /* name */ << path /* path */
-               << (dlg.isAutoMounted() ? mTrYes : "" /* auto mount? */)
-               << (dlg.isWriteable() ? mTrFull : mTrReadOnly /* writable? */);
-        SFTreeViewItem *item = new SFTreeViewItem (root(isPermanent ? MachineType : ConsoleType),
+        fields << strName /* name */ << strPath /* path */
+               << (dlg.isAutoMounted() ? m_strTrYes : "" /* auto mount? */)
+               << (dlg.isWriteable() ? m_strTrFull : m_strTrReadOnly /* writable? */);
+        SFTreeViewItem *pItem = new SFTreeViewItem(root(fPermanent ? MachineType : ConsoleType),
                                                    fields, SFTreeViewItem::EllipsisFile);
-        mTwFolders->sortItems (0, Qt::AscendingOrder);
-        mTwFolders->scrollToItem (item);
-        mTwFolders->setCurrentItem (item);
-        processCurrentChanged (item);
+        mTwFolders->sortItems(0, Qt::AscendingOrder);
+        mTwFolders->scrollToItem(pItem);
+        mTwFolders->setCurrentItem(pItem);
+        sltHandleCurrentItemChange(pItem);
         mTwFolders->setFocus();
-        adjustList();
-    }
-}
-
-void UIMachineSettingsSF::edtTriggered()
-{
-    /* Check selected item */
-    QTreeWidgetItem *selectedItem = mTwFolders->selectedItems().size() == 1 ? mTwFolders->selectedItems() [0] : 0;
-    SFTreeViewItem *item = selectedItem ? static_cast <SFTreeViewItem*> (selectedItem) : 0;
-    Assert (item);
-    Assert (item->parentItem());
-
-    /* Invoke Edit-Box Dialog */
-    UIMachineSettingsSFDetails dlg (UIMachineSettingsSFDetails::EditType, isSharedFolderTypeSupported(ConsoleType), usedList (false), this);
-    dlg.setPath (item->getText (1));
-    dlg.setName (item->getText (0));
-    dlg.setPermanent ((UISharedFolderType)item->parentItem()->text (1).toInt() != ConsoleType);
-    dlg.setAutoMount (item->getText (2) == mTrYes);
-    dlg.setWriteable (item->getText (3) == mTrFull);
+        sltAdjustTree();
+    }
+}
+
+void UIMachineSettingsSF::sltEditSharedFolder()
+{
+    /* Check selected item: */
+    QTreeWidgetItem *pSelectedItem = mTwFolders->selectedItems().size() == 1 ? mTwFolders->selectedItems()[0] : 0;
+    SFTreeViewItem *pItem = pSelectedItem ? static_cast<SFTreeViewItem*>(pSelectedItem) : 0;
+    Assert(pItem);
+    Assert(pItem->parentItem());
+
+    /* Invoke Edit-Box Dialog: */
+    UIMachineSettingsSFDetails dlg(UIMachineSettingsSFDetails::EditType, isSharedFolderTypeSupported(ConsoleType), usedList(false), this);
+    dlg.setPath(pItem->getText(1));
+    dlg.setName(pItem->getText(0));
+    dlg.setPermanent((UISharedFolderType)pItem->parentItem()->text(1).toInt() != ConsoleType);
+    dlg.setAutoMount(pItem->getText(2) == m_strTrYes);
+    dlg.setWriteable(pItem->getText(3) == m_strTrFull);
     if (dlg.exec() == QDialog::Accepted)
     {
-        QString name = dlg.name();
-        QString path = dlg.path();
-        bool isPermanent = dlg.isPermanent();
-        /* Shared folder's name & path could not be empty */
-        Assert (!name.isEmpty() && !path.isEmpty());
-        /* Searching new root for the selected listview item */
-        SFTreeViewItem *pRoot = root(isPermanent ? MachineType : ConsoleType);
-        /* Updating an edited listview item */
+        const QString strName = dlg.name();
+        const QString strPath = dlg.path();
+        const bool fPermanent = dlg.isPermanent();
+        /* Shared folder's name & path could not be empty: */
+        Assert(!strName.isEmpty() && !strPath.isEmpty());
+        /* Searching new root for the selected listview item: */
+        SFTreeViewItem *pRoot = root(fPermanent ? MachineType : ConsoleType);
+        /* Updating an edited listview item: */
         QStringList fields;
-        fields << name /* name */ << path /* path */
-               << (dlg.isAutoMounted() ? mTrYes : "" /* auto mount? */)
-               << (dlg.isWriteable() ? mTrFull : mTrReadOnly /* writable? */);
-        item->updateText (fields);
-        mTwFolders->sortItems (0, Qt::AscendingOrder);
-        if (item->parentItem() != pRoot)
-        {
-            /* Move the selected item into new location */
-            item->parentItem()->takeChild (item->parentItem()->indexOfChild (item));
-            pRoot->insertChild (pRoot->childCount(), item);
-            mTwFolders->scrollToItem (item);
-            mTwFolders->setCurrentItem (item);
-            processCurrentChanged (item);
+        fields << strName /* name */ << strPath /* path */
+               << (dlg.isAutoMounted() ? m_strTrYes : "" /* auto mount? */)
+               << (dlg.isWriteable() ? m_strTrFull : m_strTrReadOnly /* writable? */);
+        pItem->updateText(fields);
+        mTwFolders->sortItems(0, Qt::AscendingOrder);
+        if (pItem->parentItem() != pRoot)
+        {
+            /* Move the selected item into new location: */
+            pItem->parentItem()->takeChild(pItem->parentItem()->indexOfChild(pItem));
+            pRoot->insertChild(pRoot->childCount(), pItem);
+            mTwFolders->scrollToItem(pItem);
+            mTwFolders->setCurrentItem(pItem);
+            sltHandleCurrentItemChange(pItem);
             mTwFolders->setFocus();
         }
-        adjustList();
-    }
-}
-
-void UIMachineSettingsSF::delTriggered()
-{
-    QTreeWidgetItem *selectedItem = mTwFolders->selectedItems().size() == 1 ? mTwFolders->selectedItems() [0] : 0;
-    Assert (selectedItem);
-    delete selectedItem;
-    adjustList();
-}
-
-void UIMachineSettingsSF::processCurrentChanged (QTreeWidgetItem *aCurrentItem)
-{
-    if (aCurrentItem && aCurrentItem->parent() && !aCurrentItem->isSelected())
-        aCurrentItem->setSelected (true);
-    bool addEnabled = aCurrentItem;
-    bool removeEnabled = addEnabled && aCurrentItem->parent();
-    mNewAction->setEnabled (addEnabled);
-    mEdtAction->setEnabled (removeEnabled);
-    mDelAction->setEnabled (removeEnabled);
-}
-
-void UIMachineSettingsSF::processDoubleClick (QTreeWidgetItem *aItem)
-{
-    bool editEnabled = aItem && aItem->parent();
-    if (editEnabled)
-        edtTriggered();
-}
-
-void UIMachineSettingsSF::showContextMenu(const QPoint &pos)
+        sltAdjustTree();
+    }
+}
+
+void UIMachineSettingsSF::sltDeleteSharedFolder()
+{
+    QTreeWidgetItem *pSelectedItem = mTwFolders->selectedItems().size() == 1 ? mTwFolders->selectedItems()[0] : 0;
+    Assert(pSelectedItem);
+    delete pSelectedItem;
+    sltAdjustTree();
+}
+
+void UIMachineSettingsSF::sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem)
+{
+    if (pCurrentItem && pCurrentItem->parent() && !pCurrentItem->isSelected())
+        pCurrentItem->setSelected(true);
+    const bool fAddEnabled = pCurrentItem;
+    const bool fRemoveEnabled = fAddEnabled && pCurrentItem->parent();
+    m_pActionAdd->setEnabled(fAddEnabled);
+    m_pActionEdit->setEnabled(fRemoveEnabled);
+    m_pActionRemove->setEnabled(fRemoveEnabled);
+}
+
+void UIMachineSettingsSF::sltHandleDoubleClick(QTreeWidgetItem *pItem)
+{
+    const bool fEditEnabled = pItem && pItem->parent();
+    if (fEditEnabled)
+        sltEditSharedFolder();
+}
+
+void UIMachineSettingsSF::sltHandleContextMenuRequest(const QPoint &position)
 {
     QMenu menu;
-    QTreeWidgetItem *pItem = mTwFolders->itemAt(pos);
+    QTreeWidgetItem *pItem = mTwFolders->itemAt(position);
     if (mTwFolders->isEnabled() && pItem && pItem->flags() & Qt::ItemIsSelectable)
     {
-        menu.addAction(mEdtAction);
-        menu.addAction(mDelAction);
+        menu.addAction(m_pActionEdit);
+        menu.addAction(m_pActionRemove);
     }
     else
     {
-        menu.addAction(mNewAction);
+        menu.addAction(m_pActionAdd);
     }
     if (!menu.isEmpty())
-        menu.exec(mTwFolders->viewport()->mapToGlobal(pos));
-}
-
-void UIMachineSettingsSF::adjustList()
+        menu.exec(mTwFolders->viewport()->mapToGlobal(position));
+}
+
+void UIMachineSettingsSF::sltAdjustTree()
 {
     /*
@@ -648 +647 @@
      * 3 = Writable flag
      */
-    QAbstractItemView *itemView = mTwFolders;
-    QHeaderView *itemHeader = mTwFolders->header();
-    int total = mTwFolders->viewport()->width();
-
-    int mw0 = qMax (itemView->sizeHintForColumn (0), itemHeader->sectionSizeHint (0));
-    int mw2 = qMax (itemView->sizeHintForColumn (2), itemHeader->sectionSizeHint (2));
-    int mw3 = qMax (itemView->sizeHintForColumn (3), itemHeader->sectionSizeHint (3));
-
-    int w0 = mw0 < total / 4 ? mw0 : total / 4;
-    int w2 = mw2 < total / 4 ? mw2 : total / 4;
-    int w3 = mw3 < total / 4 ? mw3 : total / 4;
+    QAbstractItemView *pItemView = mTwFolders;
+    QHeaderView *pItemHeader = mTwFolders->header();
+    const int iTotal = mTwFolders->viewport()->width();
+
+    const int mw0 = qMax(pItemView->sizeHintForColumn(0), pItemHeader->sectionSizeHint(0));
+    const int mw2 = qMax(pItemView->sizeHintForColumn(2), pItemHeader->sectionSizeHint(2));
+    const int mw3 = qMax(pItemView->sizeHintForColumn(3), pItemHeader->sectionSizeHint(3));
+
+    const int w0 = mw0 < iTotal / 4 ? mw0 : iTotal / 4;
+    const int w2 = mw2 < iTotal / 4 ? mw2 : iTotal / 4;
+    const int w3 = mw3 < iTotal / 4 ? mw3 : iTotal / 4;
 
     /* Giving 1st column all the available space. */
-    mTwFolders->setColumnWidth (0, w0);
-    mTwFolders->setColumnWidth (1, total - w0 - w2 - w3);
-    mTwFolders->setColumnWidth (2, w2);
-    mTwFolders->setColumnWidth (3, w3);
-}
-
-void UIMachineSettingsSF::adjustFields()
-{
-    QTreeWidgetItem *mainRoot = mTwFolders->invisibleRootItem();
-    for (int i = 0; i < mainRoot->childCount(); ++ i)
-    {
-        QTreeWidgetItem *subRoot = mainRoot->child (i);
-        for (int j = 0; j < subRoot->childCount(); ++ j)
-        {
-            SFTreeViewItem *item = subRoot->child (j) ? static_cast <SFTreeViewItem*> (subRoot->child (j)) : 0;
-            if (item)
-                item->adjustText();
-        }
-    }
-}
-
-SFTreeViewItem* UIMachineSettingsSF::root(UISharedFolderType sharedFolderType)
+    mTwFolders->setColumnWidth(0, w0);
+    mTwFolders->setColumnWidth(1, iTotal - w0 - w2 - w3);
+    mTwFolders->setColumnWidth(2, w2);
+    mTwFolders->setColumnWidth(3, w3);
+}
+
+void UIMachineSettingsSF::sltAdjustTreeFields()
+{
+    QTreeWidgetItem *pMainRoot = mTwFolders->invisibleRootItem();
+    for (int i = 0; i < pMainRoot->childCount(); ++i)
+    {
+        QTreeWidgetItem *pSubRoot = pMainRoot->child(i);
+        for (int j = 0; j < pSubRoot->childCount(); ++j)
+        {
+            SFTreeViewItem *pItem = pSubRoot->child(j) ? static_cast <SFTreeViewItem*>(pSubRoot->child(j)) : 0;
+            if (pItem)
+                pItem->adjustText();
+        }
+    }
+}
+
+SFTreeViewItem *UIMachineSettingsSF::root(UISharedFolderType enmSharedFolderType)
 {
     /* Search for the corresponding root item among all the top-level items: */
@@ -692 +691 @@
         QTreeWidgetItem *pIteratedItem = pMainRootItem->child(iFolderTypeIndex);
         /* If iterated item type is what we are looking for: */
-        if (pIteratedItem->text(1).toInt() == sharedFolderType)
+        if (pIteratedItem->text(1).toInt() == enmSharedFolderType)
         {
             /* Remember the item: */
@@ -704 +703 @@
 }
 
-SFoldersNameList UIMachineSettingsSF::usedList (bool aIncludeSelected)
+SFoldersNameList UIMachineSettingsSF::usedList(bool fIncludeSelected)
 {
     /* Make the used names list: */
     SFoldersNameList list;
-    QTreeWidgetItemIterator it (mTwFolders);
+    QTreeWidgetItemIterator it(mTwFolders);
     while (*it)
     {
-        if ((*it)->parent() && (aIncludeSelected || !(*it)->isSelected()))
-        {
-            SFTreeViewItem *item = static_cast <SFTreeViewItem*> (*it);
-            UISharedFolderType type = (UISharedFolderType) item->parentItem()->text (1).toInt();
-            list << qMakePair (item->getText (0), type);
-        }
-        ++ it;
+        if ((*it)->parent() && (fIncludeSelected || !(*it)->isSelected()))
+        {
+            SFTreeViewItem *pItem = static_cast <SFTreeViewItem*>(*it);
+            UISharedFolderType type = (UISharedFolderType)pItem->parentItem()->text(1).toInt();
+            list << qMakePair(pItem->getText(0), type);
+        }
+        ++it;
     }
     return list;
 }
 
-bool UIMachineSettingsSF::isSharedFolderTypeSupported(UISharedFolderType sharedFolderType) const
+bool UIMachineSettingsSF::isSharedFolderTypeSupported(UISharedFolderType enmSharedFolderType) const
 {
     bool fIsSharedFolderTypeSupported = false;
-    switch (sharedFolderType)
+    switch (enmSharedFolderType)
     {
         case MachineType:
@@ -747 +746 @@
 }
 
-void UIMachineSettingsSF::setRootItemVisible(UISharedFolderType sharedFolderType, bool fVisible)
+void UIMachineSettingsSF::setRootItemVisible(UISharedFolderType enmSharedFolderType, bool fVisible)
 {
     /* Search for the corresponding root item among all the top-level items: */
-    SFTreeViewItem *pRootItem = root(sharedFolderType);
+    SFTreeViewItem *pRootItem = root(enmSharedFolderType);
     /* If root item, we are looking for, still not found: */
     if (!pRootItem)
@@ -757 +756 @@
         QStringList fields;
         /* Depending on folder type: */
-        switch (sharedFolderType)
+        switch (enmSharedFolderType)
         {
             case MachineType:
@@ -777 +776 @@
 }
 
-CSharedFolderVector UIMachineSettingsSF::getSharedFolders(UISharedFolderType sharedFoldersType)
+CSharedFolderVector UIMachineSettingsSF::getSharedFolders(UISharedFolderType enmSharedFoldersType)
 {
     CSharedFolderVector sharedFolders;
-    if (isSharedFolderTypeSupported(sharedFoldersType))
-    {
-        switch (sharedFoldersType)
+    if (isSharedFolderTypeSupported(enmSharedFoldersType))
+    {
+        switch (enmSharedFoldersType)
         {
             case MachineType:
@@ -807 +806 @@
     /* Get shared folder data: */
     const UIDataSettingsSharedFolder &folderData = folderCache.data();
-    QString strName = folderData.m_strName;
-    QString strPath = folderData.m_strHostPath;
-    bool fIsWritable = folderData.m_fWritable;
-    bool fIsAutoMount = folderData.m_fAutoMount;
-    UISharedFolderType sharedFoldersType = folderData.m_type;
+    const QString strName = folderData.m_strName;
+    const QString strPath = folderData.m_strHostPath;
+    const bool fIsWritable = folderData.m_fWritable;
+    const bool fIsAutoMount = folderData.m_fAutoMount;
+    const UISharedFolderType enmSharedFoldersType = folderData.m_type;
 
     /* Get current shared folders: */
-    CSharedFolderVector sharedFolders = getSharedFolders(sharedFoldersType);
+    const CSharedFolderVector sharedFolders = getSharedFolders(enmSharedFoldersType);
     /* Check if such shared folder do not exists: */
     CSharedFolder sharedFolder;
@@ -823 +822 @@
     {
         /* Create new shared folder: */
-        switch(sharedFoldersType)
+        switch(enmSharedFoldersType)
         {
             case MachineType:
             {
+                /* Create new shared folder: */
                 m_machine.CreateSharedFolder(strName, strPath, fIsWritable, fIsAutoMount);
                 if (!m_machine.isOk())
@@ -865 +865 @@
     /* Get shared folder data: */
     const UIDataSettingsSharedFolder &folderData = folderCache.base();
-    QString strName = folderData.m_strName;
-    QString strPath = folderData.m_strHostPath;
-    UISharedFolderType sharedFoldersType = folderData.m_type;
+    const QString strName = folderData.m_strName;
+    const QString strPath = folderData.m_strHostPath;
+    const UISharedFolderType enmSharedFoldersType = folderData.m_type;
 
     /* Get current shared folders: */
-    CSharedFolderVector sharedFolders = getSharedFolders(sharedFoldersType);
+    const CSharedFolderVector sharedFolders = getSharedFolders(enmSharedFoldersType);
     /* Check that such shared folder really exists: */
     CSharedFolder sharedFolder;
@@ -879 +879 @@
     {
         /* Remove existing shared folder: */
-        switch(sharedFoldersType)
+        switch(enmSharedFoldersType)
         {
             case MachineType:
             {
+                /* Remove existing shared folder: */
                 m_machine.RemoveSharedFolder(strName);
                 if (!m_machine.isOk())
@@ -897 +898 @@
             case ConsoleType:
             {
+                /* Remove existing shared folder: */
                 m_console.RemoveSharedFolder(strName);
                 if (!m_console.isOk())

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h

@@ -87 +87 @@
 private slots:
 
-    void addTriggered();
-    void edtTriggered();
-    void delTriggered();
+    void sltAddSharedFolder();
+    void sltEditSharedFolder();
+    void sltDeleteSharedFolder();
 
-    void processCurrentChanged (QTreeWidgetItem *aCurrentItem);
-    void processDoubleClick (QTreeWidgetItem *aItem);
-    void showContextMenu (const QPoint &aPos);
+    void sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem);
+    void sltHandleDoubleClick(QTreeWidgetItem *pItem);
+    void sltHandleContextMenuRequest(const QPoint &position);
 
-    void adjustList();
-    void adjustFields();
+    void sltAdjustTree();
+    void sltAdjustTreeFields();
 
 private:
 
-    SFTreeViewItem* root(UISharedFolderType type);
-    SFoldersNameList usedList (bool aIncludeSelected);
+    SFTreeViewItem *root(UISharedFolderType type);
+    SFoldersNameList usedList(bool aIncludeSelected);
 
     bool isSharedFolderTypeSupported(UISharedFolderType sharedFolderType) const;
@@ -112 +112 @@
     bool removeSharedFolder(const UISettingsCacheSharedFolder &folderCache);
 
-    QAction  *mNewAction;
-    QAction  *mEdtAction;
-    QAction  *mDelAction;
-    QString   mTrFull;
-    QString   mTrReadOnly;
-    QString   mTrYes;
+    QAction *m_pActionAdd;
+    QAction *m_pActionEdit;
+    QAction *m_pActionRemove;
+
+    QString  m_strTrFull;
+    QString  m_strTrReadOnly;
+    QString  m_strTrYes;
 
     /** Holds the page data cache instance. */

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

@@ -498 +498 @@
         /* Get current tab/page: */
         QWidget *pTab = mTabWidget->widget(iIndex);
-        UIMachineSettingsSerial *page = static_cast<UIMachineSettingsSerial*>(pTab);
-        if (!page->mGbSerial->isChecked())
+        UIMachineSettingsSerial *pPage = static_cast<UIMachineSettingsSerial*>(pTab);
+        if (!pPage->mGbSerial->isChecked())
             continue;
 
@@ -507 +507 @@
 
         /* Check the port attribute emptiness & uniqueness: */
-        const QString strIRQ(page->mLeIRQ->text());
-        const QString strIOPort(page->mLeIOPort->text());
-        QPair<QString, QString> pair(strIRQ, strIOPort);
+        const QString strIRQ(pPage->mLeIRQ->text());
+        const QString strIOPort(pPage->mLeIOPort->text());
+        const QPair<QString, QString> pair(strIRQ, strIOPort);
 
         if (strIRQ.isEmpty())
@@ -529 +529 @@
         ports << pair;
 
-        KPortMode mode = gpConverter->fromString<KPortMode>(page->mCbMode->currentText());
-        if (mode != KPortMode_Disconnected)
+        const KPortMode enmMode = gpConverter->fromString<KPortMode>(pPage->mCbMode->currentText());
+        if (enmMode != KPortMode_Disconnected)
         {
-            const QString strPath(page->mLePath->text());
+            const QString strPath(pPage->mLePath->text());
 
             if (strPath.isEmpty())
@@ -559 +559 @@
 void UIMachineSettingsSerialPage::retranslateUi()
 {
-    for (int i = 0; i < mTabWidget->count(); ++ i)
-    {
-        UIMachineSettingsSerial *page =
-            static_cast<UIMachineSettingsSerial*> (mTabWidget->widget (i));
-        mTabWidget->setTabText (i, page->pageTitle());
+    for (int i = 0; i < mTabWidget->count(); ++i)
+    {
+        UIMachineSettingsSerial *pPage =
+            static_cast<UIMachineSettingsSerial*>(mTabWidget->widget(i));
+        mTabWidget->setTabText(i, pPage->pageTitle());
     }
 }

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

@@ -2125 +2125 @@
  */
 UIMachineSettingsStorage::UIMachineSettingsStorage()
-    : mStorageModel(0)
-    , mAddCtrAction(0), mDelCtrAction(0)
-    , mAddIDECtrAction(0), mAddSATACtrAction(0), mAddSCSICtrAction(0), mAddSASCtrAction(0), mAddFloppyCtrAction(0), mAddUSBCtrAction(0), mAddNVMeCtrAction(0)
-    , mAddAttAction(0), mDelAttAction(0)
-    , mAddHDAttAction(0), mAddCDAttAction(0), mAddFDAttAction(0)
+    : m_pModelStorage(0)
+    , m_pActionAddController(0), m_pActionRemoveController(0)
+    , m_pActionAddControllerIDE(0), m_pActionAddControllerSATA(0), m_pActionAddControllerSCSI(0), m_pActionAddControllerSAS(0), m_pActionAddControllerFloppy(0), m_pActionAddControllerUSB(0), m_pActionAddControllerNVMe(0)
+    , m_pActionAddAttachment(0), m_pActionRemoveAttachment(0)
+    , m_pActionAddAttachmentHD(0), m_pActionAddAttachmentCD(0), m_pActionAddAttachmentFD(0)
     , m_pMediumIdHolder(new UIMediumIDHolder(this))
-    , mIsPolished(false)
-    , mIsLoadingInProgress(0)
+    , m_fPolished(false)
+    , m_fLoadingInProgress(0)
     , m_pCache(new UISettingsCacheMachineStorage)
 {
@@ -2147 +2147 @@
 
     /* Controller Actions */
-    mAddCtrAction = new QAction (this);
-    mAddCtrAction->setIcon(iconPool()->icon(ControllerAddEn, ControllerAddDis));
-
-    mAddIDECtrAction = new QAction (this);
-    mAddIDECtrAction->setIcon(iconPool()->icon(IDEControllerAddEn, IDEControllerAddDis));
-
-    mAddSATACtrAction = new QAction (this);
-    mAddSATACtrAction->setIcon(iconPool()->icon(SATAControllerAddEn, SATAControllerAddDis));
-
-    mAddSCSICtrAction = new QAction (this);
-    mAddSCSICtrAction->setIcon(iconPool()->icon(SCSIControllerAddEn, SCSIControllerAddDis));
-
-    mAddFloppyCtrAction = new QAction (this);
-    mAddFloppyCtrAction->setIcon(iconPool()->icon(FloppyControllerAddEn, FloppyControllerAddDis));
-
-    mAddSASCtrAction = new QAction (this);
-    mAddSASCtrAction->setIcon(iconPool()->icon(SATAControllerAddEn, SATAControllerAddDis));
-
-    mAddUSBCtrAction = new QAction (this);
-    mAddUSBCtrAction->setIcon(iconPool()->icon(USBControllerAddEn, USBControllerAddDis));
-
-    mAddNVMeCtrAction = new QAction (this);
-    mAddNVMeCtrAction->setIcon(iconPool()->icon(NVMeControllerAddEn, NVMeControllerAddDis));
-
-    mDelCtrAction = new QAction (this);
-    mDelCtrAction->setIcon(iconPool()->icon(ControllerDelEn, ControllerDelDis));
+    m_pActionAddController = new QAction (this);
+    m_pActionAddController->setIcon(iconPool()->icon(ControllerAddEn, ControllerAddDis));
+
+    m_pActionAddControllerIDE = new QAction (this);
+    m_pActionAddControllerIDE->setIcon(iconPool()->icon(IDEControllerAddEn, IDEControllerAddDis));
+
+    m_pActionAddControllerSATA = new QAction (this);
+    m_pActionAddControllerSATA->setIcon(iconPool()->icon(SATAControllerAddEn, SATAControllerAddDis));
+
+    m_pActionAddControllerSCSI = new QAction (this);
+    m_pActionAddControllerSCSI->setIcon(iconPool()->icon(SCSIControllerAddEn, SCSIControllerAddDis));
+
+    m_pActionAddControllerFloppy = new QAction (this);
+    m_pActionAddControllerFloppy->setIcon(iconPool()->icon(FloppyControllerAddEn, FloppyControllerAddDis));
+
+    m_pActionAddControllerSAS = new QAction (this);
+    m_pActionAddControllerSAS->setIcon(iconPool()->icon(SATAControllerAddEn, SATAControllerAddDis));
+
+    m_pActionAddControllerUSB = new QAction (this);
+    m_pActionAddControllerUSB->setIcon(iconPool()->icon(USBControllerAddEn, USBControllerAddDis));
+
+    m_pActionAddControllerNVMe = new QAction (this);
+    m_pActionAddControllerNVMe->setIcon(iconPool()->icon(NVMeControllerAddEn, NVMeControllerAddDis));
+
+    m_pActionRemoveController = new QAction (this);
+    m_pActionRemoveController->setIcon(iconPool()->icon(ControllerDelEn, ControllerDelDis));
 
     /* Attachment Actions */
-    mAddAttAction = new QAction (this);
-    mAddAttAction->setIcon(iconPool()->icon(AttachmentAddEn, AttachmentAddDis));
-
-    mAddHDAttAction = new QAction (this);
-    mAddHDAttAction->setIcon(iconPool()->icon(HDAttachmentAddEn, HDAttachmentAddDis));
-
-    mAddCDAttAction = new QAction (this);
-    mAddCDAttAction->setIcon(iconPool()->icon(CDAttachmentAddEn, CDAttachmentAddDis));
-
-    mAddFDAttAction = new QAction (this);
-    mAddFDAttAction->setIcon(iconPool()->icon(FDAttachmentAddEn, FDAttachmentAddDis));
-
-    mDelAttAction = new QAction (this);
-    mDelAttAction->setIcon(iconPool()->icon(AttachmentDelEn, AttachmentDelDis));
+    m_pActionAddAttachment = new QAction (this);
+    m_pActionAddAttachment->setIcon(iconPool()->icon(AttachmentAddEn, AttachmentAddDis));
+
+    m_pActionAddAttachmentHD = new QAction (this);
+    m_pActionAddAttachmentHD->setIcon(iconPool()->icon(HDAttachmentAddEn, HDAttachmentAddDis));
+
+    m_pActionAddAttachmentCD = new QAction (this);
+    m_pActionAddAttachmentCD->setIcon(iconPool()->icon(CDAttachmentAddEn, CDAttachmentAddDis));
+
+    m_pActionAddAttachmentFD = new QAction (this);
+    m_pActionAddAttachmentFD->setIcon(iconPool()->icon(FDAttachmentAddEn, FDAttachmentAddDis));
+
+    m_pActionRemoveAttachment = new QAction (this);
+    m_pActionRemoveAttachment->setIcon(iconPool()->icon(AttachmentDelEn, AttachmentDelDis));
 
     /* Create storage-view: */
-    mTwStorageTree = new QITreeView(this);
+    m_pTreeStorage = new QITreeView(this);
     {
         /* Configure storage-view: */
-        mLsLeftPane->setBuddy(mTwStorageTree);
+        mLsLeftPane->setBuddy(m_pTreeStorage);
         /* Add storage-view into layout: */
-        mLtStorage->insertWidget(0, mTwStorageTree);
+        mLtStorage->insertWidget(0, m_pTreeStorage);
     }
 
     /* Create storage-model: */
-    mStorageModel = new StorageModel (mTwStorageTree);
-    StorageDelegate *storageDelegate = new StorageDelegate (mTwStorageTree);
-    mTwStorageTree->setMouseTracking (true);
-    mTwStorageTree->setContextMenuPolicy (Qt::CustomContextMenu);
-    mTwStorageTree->setModel (mStorageModel);
-    mTwStorageTree->setItemDelegate (storageDelegate);
-    mTwStorageTree->setRootIndex (mStorageModel->root());
-    mTwStorageTree->setCurrentIndex (mStorageModel->root());
+    m_pModelStorage = new StorageModel (m_pTreeStorage);
+    StorageDelegate *storageDelegate = new StorageDelegate (m_pTreeStorage);
+    m_pTreeStorage->setMouseTracking (true);
+    m_pTreeStorage->setContextMenuPolicy (Qt::CustomContextMenu);
+    m_pTreeStorage->setModel (m_pModelStorage);
+    m_pTreeStorage->setItemDelegate (storageDelegate);
+    m_pTreeStorage->setRootIndex (m_pModelStorage->root());
+    m_pTreeStorage->setCurrentIndex (m_pModelStorage->root());
 
     /* Determine icon metric: */
@@ -2215 +2215 @@
     /* Storage ToolBar */
     mTbStorageBar->setIconSize (QSize (iIconMetric, iIconMetric));
-    mTbStorageBar->addAction (mAddAttAction);
-    mTbStorageBar->addAction (mDelAttAction);
-    mTbStorageBar->addAction (mAddCtrAction);
-    mTbStorageBar->addAction (mDelCtrAction);
+    mTbStorageBar->addAction (m_pActionAddAttachment);
+    mTbStorageBar->addAction (m_pActionRemoveAttachment);
+    mTbStorageBar->addAction (m_pActionAddController);
+    mTbStorageBar->addAction (m_pActionRemoveController);
 
 #ifdef VBOX_WS_MAC
@@ -2249 +2249 @@
     connect(&vboxGlobal(), SIGNAL(sigMediumDeleted(const QString&)),
             this, SLOT(sltHandleMediumDeleted(const QString&)));
-    connect (mAddCtrAction, SIGNAL (triggered (bool)), this, SLOT (addController()));
-    connect (mAddIDECtrAction, SIGNAL (triggered (bool)), this, SLOT (addIDEController()));
-    connect (mAddSATACtrAction, SIGNAL (triggered (bool)), this, SLOT (addSATAController()));
-    connect (mAddSCSICtrAction, SIGNAL (triggered (bool)), this, SLOT (addSCSIController()));
-    connect (mAddSASCtrAction, SIGNAL (triggered (bool)), this, SLOT (addSASController()));
-    connect (mAddFloppyCtrAction, SIGNAL (triggered (bool)), this, SLOT (addFloppyController()));
-    connect (mAddUSBCtrAction, SIGNAL (triggered (bool)), this, SLOT (addUSBController()));
-    connect (mAddNVMeCtrAction, SIGNAL (triggered (bool)), this, SLOT (addNVMeController()));
-    connect (mDelCtrAction, SIGNAL (triggered (bool)), this, SLOT (delController()));
-    connect (mAddAttAction, SIGNAL (triggered (bool)), this, SLOT (addAttachment()));
-    connect (mAddHDAttAction, SIGNAL (triggered (bool)), this, SLOT (addHDAttachment()));
-    connect (mAddCDAttAction, SIGNAL (triggered (bool)), this, SLOT (addCDAttachment()));
-    connect (mAddFDAttAction, SIGNAL (triggered (bool)), this, SLOT (addFDAttachment()));
-    connect (mDelAttAction, SIGNAL (triggered (bool)), this, SLOT (delAttachment()));
-    connect (mStorageModel, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
-             this, SLOT (onRowInserted (const QModelIndex&, int)));
-    connect (mStorageModel, SIGNAL (rowsRemoved (const QModelIndex&, int, int)),
-             this, SLOT (onRowRemoved()));
-    connect (mTwStorageTree, SIGNAL (currentItemChanged (const QModelIndex&, const QModelIndex&)),
-             this, SLOT (onCurrentItemChanged()));
-    connect (mTwStorageTree, SIGNAL (customContextMenuRequested (const QPoint&)),
-             this, SLOT (onContextMenuRequested (const QPoint&)));
-    connect (mTwStorageTree, SIGNAL (drawItemBranches (QPainter*, const QRect&, const QModelIndex&)),
-             this, SLOT (onDrawItemBranches (QPainter *, const QRect &, const QModelIndex &)));
-    connect (mTwStorageTree, SIGNAL (mouseMoved (QMouseEvent*)),
-             this, SLOT (onMouseMoved (QMouseEvent*)));
-    connect (mTwStorageTree, SIGNAL (mousePressed (QMouseEvent*)),
-             this, SLOT (onMouseClicked (QMouseEvent*)));
-    connect (mTwStorageTree, SIGNAL (mouseDoubleClicked (QMouseEvent*)),
-             this, SLOT (onMouseClicked (QMouseEvent*)));
-    connect (mLeName, SIGNAL (textEdited (const QString&)), this, SLOT (setInformation()));
-    connect (mCbType, SIGNAL (activated (int)), this, SLOT (setInformation()));
-    connect (mCbSlot, SIGNAL (activated (int)), this, SLOT (setInformation()));
-    connect (mSbPortCount, SIGNAL (valueChanged (int)), this, SLOT (setInformation()));
-    connect (mCbIoCache, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
-    connect (m_pMediumIdHolder, SIGNAL (sigChanged()), this, SLOT (setInformation()));
+    connect (m_pActionAddController, SIGNAL (triggered (bool)), this, SLOT (sltAddController()));
+    connect (m_pActionAddControllerIDE, SIGNAL (triggered (bool)), this, SLOT (sltAddControllerIDE()));
+    connect (m_pActionAddControllerSATA, SIGNAL (triggered (bool)), this, SLOT (sltAddControllerSATA()));
+    connect (m_pActionAddControllerSCSI, SIGNAL (triggered (bool)), this, SLOT (sltAddControllerSCSI()));
+    connect (m_pActionAddControllerSAS, SIGNAL (triggered (bool)), this, SLOT (sltAddControllerSAS()));
+    connect (m_pActionAddControllerFloppy, SIGNAL (triggered (bool)), this, SLOT (sltAddControllerFloppy()));
+    connect (m_pActionAddControllerUSB, SIGNAL (triggered (bool)), this, SLOT (sltAddControllerUSB()));
+    connect (m_pActionAddControllerNVMe, SIGNAL (triggered (bool)), this, SLOT (sltAddControllerNVMe()));
+    connect (m_pActionRemoveController, SIGNAL (triggered (bool)), this, SLOT (sltRemoveController()));
+    connect (m_pActionAddAttachment, SIGNAL (triggered (bool)), this, SLOT (sltAddAttachment()));
+    connect (m_pActionAddAttachmentHD, SIGNAL (triggered (bool)), this, SLOT (sltAddAttachmentHD()));
+    connect (m_pActionAddAttachmentCD, SIGNAL (triggered (bool)), this, SLOT (sltAddAttachmentCD()));
+    connect (m_pActionAddAttachmentFD, SIGNAL (triggered (bool)), this, SLOT (sltAddAttachmentFD()));
+    connect (m_pActionRemoveAttachment, SIGNAL (triggered (bool)), this, SLOT (sltRemoveAttachment()));
+    connect (m_pModelStorage, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
+             this, SLOT (sltHandleRowInsertion (const QModelIndex&, int)));
+    connect (m_pModelStorage, SIGNAL (rowsRemoved (const QModelIndex&, int, int)),
+             this, SLOT (sltHandleRowRemoval()));
+    connect (m_pTreeStorage, SIGNAL (currentItemChanged (const QModelIndex&, const QModelIndex&)),
+             this, SLOT (sltHandleCurrentItemChange()));
+    connect (m_pTreeStorage, SIGNAL (customContextMenuRequested (const QPoint&)),
+             this, SLOT (sltHandleContextMenuRequest (const QPoint&)));
+    connect (m_pTreeStorage, SIGNAL (drawItemBranches (QPainter*, const QRect&, const QModelIndex&)),
+             this, SLOT (sltHandleDrawItemBranches (QPainter *, const QRect &, const QModelIndex &)));
+    connect (m_pTreeStorage, SIGNAL (mouseMoved (QMouseEvent*)),
+             this, SLOT (sltHandleMouseMove (QMouseEvent*)));
+    connect (m_pTreeStorage, SIGNAL (mousePressed (QMouseEvent*)),
+             this, SLOT (sltHandleMouseClick (QMouseEvent*)));
+    connect (m_pTreeStorage, SIGNAL (mouseDoubleClicked (QMouseEvent*)),
+             this, SLOT (sltHandleMouseClick (QMouseEvent*)));
+    connect (mLeName, SIGNAL (textEdited (const QString&)), this, SLOT (sltSetInformation()));
+    connect (mCbType, SIGNAL (activated (int)), this, SLOT (sltSetInformation()));
+    connect (mCbSlot, SIGNAL (activated (int)), this, SLOT (sltSetInformation()));
+    connect (mSbPortCount, SIGNAL (valueChanged (int)), this, SLOT (sltSetInformation()));
+    connect (mCbIoCache, SIGNAL (stateChanged (int)), this, SLOT (sltSetInformation()));
+    connect (m_pMediumIdHolder, SIGNAL (sigChanged()), this, SLOT (sltSetInformation()));
     connect (mTbOpen, SIGNAL (clicked (bool)), mTbOpen, SLOT (showMenu()));
     connect (pOpenMediumMenu, SIGNAL (aboutToShow()), this, SLOT (sltPrepareOpenMediumMenu()));
-    connect (mCbPassthrough, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
-    connect (mCbTempEject, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
-    connect (mCbNonRotational, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
-    connect(m_pCheckBoxHotPluggable, SIGNAL(stateChanged(int)), this, SLOT(setInformation()));
+    connect (mCbPassthrough, SIGNAL (stateChanged (int)), this, SLOT (sltSetInformation()));
+    connect (mCbTempEject, SIGNAL (stateChanged (int)), this, SLOT (sltSetInformation()));
+    connect (mCbNonRotational, SIGNAL (stateChanged (int)), this, SLOT (sltSetInformation()));
+    connect(m_pCheckBoxHotPluggable, SIGNAL(stateChanged(int)), this, SLOT(sltSetInformation()));
 
     /* Applying language settings */
@@ -2310 +2310 @@
 }
 
-void UIMachineSettingsStorage::setChipsetType(KChipsetType type)
+void UIMachineSettingsStorage::setChipsetType(KChipsetType enmType)
 {
     /* Make sure chipset type has changed: */
-    if (mStorageModel->chipsetType() == type)
+    if (m_pModelStorage->chipsetType() == enmType)
         return;
 
     /* Update chipset type value: */
-    mStorageModel->setChipsetType(type);
-    updateActionsState();
+    m_pModelStorage->setChipsetType(enmType);
+    sltUpdateActionsState();
 
     /* Revalidate: */
@@ -2410 +2410 @@
 {
     /* Clear model initially: */
-    mStorageModel->clear();
+    m_pModelStorage->clear();
 
     /* Load storage data to page: */
-    mStorageModel->setMachineId(m_strMachineId);
+    m_pModelStorage->setMachineId(m_strMachineId);
 
     /* For each storage controller: */
@@ -2424 +2424 @@
 
         /* Load storage controller data to page: */
-        QModelIndex controllerIndex = mStorageModel->addController(controllerData.m_strControllerName,
+        QModelIndex controllerIndex = m_pModelStorage->addController(controllerData.m_strControllerName,
                                                                    controllerData.m_controllerBus,
                                                                    controllerData.m_controllerType);
-        QUuid controllerId = QUuid(mStorageModel->data(controllerIndex, StorageModel::R_ItemId).toString());
-        mStorageModel->setData(controllerIndex, controllerData.m_uPortCount, StorageModel::R_CtrPortCount);
-        mStorageModel->setData(controllerIndex, controllerData.m_fUseHostIOCache, StorageModel::R_CtrIoCache);
+        QUuid controllerId = QUuid(m_pModelStorage->data(controllerIndex, StorageModel::R_ItemId).toString());
+        m_pModelStorage->setData(controllerIndex, controllerData.m_uPortCount, StorageModel::R_CtrPortCount);
+        m_pModelStorage->setData(controllerIndex, controllerData.m_fUseHostIOCache, StorageModel::R_CtrIoCache);
 
         /* For each storage attachment: */
@@ -2440 +2440 @@
 
             /* Load storage attachment data to page: */
-            QModelIndex attachmentIndex = mStorageModel->addAttachment(controllerId, attachmentData.m_attachmentType, attachmentData.m_strAttachmentMediumId);
+            QModelIndex attachmentIndex = m_pModelStorage->addAttachment(controllerId, attachmentData.m_attachmentType, attachmentData.m_strAttachmentMediumId);
             StorageSlot attachmentStorageSlot(controllerData.m_controllerBus,
                                               attachmentData.m_iAttachmentPort,
                                               attachmentData.m_iAttachmentDevice);
-            mStorageModel->setData(attachmentIndex, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
-            mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentPassthrough, StorageModel::R_AttIsPassthrough);
-            mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentTempEject, StorageModel::R_AttIsTempEject);
-            mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentNonRotational, StorageModel::R_AttIsNonRotational);
-            mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentHotPluggable, StorageModel::R_AttIsHotPluggable);
+            m_pModelStorage->setData(attachmentIndex, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
+            m_pModelStorage->setData(attachmentIndex, attachmentData.m_fAttachmentPassthrough, StorageModel::R_AttIsPassthrough);
+            m_pModelStorage->setData(attachmentIndex, attachmentData.m_fAttachmentTempEject, StorageModel::R_AttIsTempEject);
+            m_pModelStorage->setData(attachmentIndex, attachmentData.m_fAttachmentNonRotational, StorageModel::R_AttIsNonRotational);
+            m_pModelStorage->setData(attachmentIndex, attachmentData.m_fAttachmentHotPluggable, StorageModel::R_AttIsHotPluggable);
         }
     }
     /* Set the first controller as current if present */
-    if (mStorageModel->rowCount(mStorageModel->root()) > 0)
-        mTwStorageTree->setCurrentIndex(mStorageModel->index(0, 0, mStorageModel->root()));
+    if (m_pModelStorage->rowCount(m_pModelStorage->root()) > 0)
+        m_pTreeStorage->setCurrentIndex(m_pModelStorage->index(0, 0, m_pModelStorage->root()));
 
     /* Update actions: */
-    updateActionsState();
+    sltUpdateActionsState();
 
     /* Polish page finally: */
@@ -2471 +2471 @@
 
     /* For each storage controller: */
-    QModelIndex rootIndex = mStorageModel->root();
-    for (int iControllerIndex = 0; iControllerIndex < mStorageModel->rowCount(rootIndex); ++iControllerIndex)
+    QModelIndex rootIndex = m_pModelStorage->root();
+    for (int iControllerIndex = 0; iControllerIndex < m_pModelStorage->rowCount(rootIndex); ++iControllerIndex)
     {
         /* Prepare storage controller data & key: */
@@ -2478 +2478 @@
 
         /* Gather storage controller data: */
-        QModelIndex controllerIndex = mStorageModel->index(iControllerIndex, 0, rootIndex);
-        controllerData.m_strControllerName = mStorageModel->data(controllerIndex, StorageModel::R_CtrName).toString();
-        controllerData.m_controllerBus = mStorageModel->data(controllerIndex, StorageModel::R_CtrBusType).value<KStorageBus>();
-        controllerData.m_controllerType = mStorageModel->data(controllerIndex, StorageModel::R_CtrType).value<KStorageControllerType>();
-        controllerData.m_uPortCount = mStorageModel->data(controllerIndex, StorageModel::R_CtrPortCount).toUInt();
-        controllerData.m_fUseHostIOCache = mStorageModel->data(controllerIndex, StorageModel::R_CtrIoCache).toBool();
+        QModelIndex controllerIndex = m_pModelStorage->index(iControllerIndex, 0, rootIndex);
+        controllerData.m_strControllerName = m_pModelStorage->data(controllerIndex, StorageModel::R_CtrName).toString();
+        controllerData.m_controllerBus = m_pModelStorage->data(controllerIndex, StorageModel::R_CtrBusType).value<KStorageBus>();
+        controllerData.m_controllerType = m_pModelStorage->data(controllerIndex, StorageModel::R_CtrType).value<KStorageControllerType>();
+        controllerData.m_uPortCount = m_pModelStorage->data(controllerIndex, StorageModel::R_CtrPortCount).toUInt();
+        controllerData.m_fUseHostIOCache = m_pModelStorage->data(controllerIndex, StorageModel::R_CtrIoCache).toBool();
 
         /* For each storage attachment: */
-        for (int iAttachmentIndex = 0; iAttachmentIndex < mStorageModel->rowCount(controllerIndex); ++iAttachmentIndex)
+        for (int iAttachmentIndex = 0; iAttachmentIndex < m_pModelStorage->rowCount(controllerIndex); ++iAttachmentIndex)
         {
             /* Prepare storage attachment data & key: */
@@ -2492 +2492 @@
 
             /* Gather storage controller data: */
-            QModelIndex attachmentIndex = mStorageModel->index(iAttachmentIndex, 0, controllerIndex);
-            attachmentData.m_attachmentType = mStorageModel->data(attachmentIndex, StorageModel::R_AttDevice).value<KDeviceType>();
-            StorageSlot attachmentSlot = mStorageModel->data(attachmentIndex, StorageModel::R_AttSlot).value<StorageSlot>();
+            QModelIndex attachmentIndex = m_pModelStorage->index(iAttachmentIndex, 0, controllerIndex);
+            attachmentData.m_attachmentType = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttDevice).value<KDeviceType>();
+            StorageSlot attachmentSlot = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttSlot).value<StorageSlot>();
             attachmentData.m_iAttachmentPort = attachmentSlot.port;
             attachmentData.m_iAttachmentDevice = attachmentSlot.device;
-            attachmentData.m_fAttachmentPassthrough = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsPassthrough).toBool();
-            attachmentData.m_fAttachmentTempEject = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsTempEject).toBool();
-            attachmentData.m_fAttachmentNonRotational = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsNonRotational).toBool();
-            attachmentData.m_fAttachmentHotPluggable = mStorageModel->data(attachmentIndex, StorageModel::R_AttIsHotPluggable).toBool();
-            attachmentData.m_strAttachmentMediumId = mStorageModel->data(attachmentIndex, StorageModel::R_AttMediumId).toString();
+            attachmentData.m_fAttachmentPassthrough = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttIsPassthrough).toBool();
+            attachmentData.m_fAttachmentTempEject = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttIsTempEject).toBool();
+            attachmentData.m_fAttachmentNonRotational = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttIsNonRotational).toBool();
+            attachmentData.m_fAttachmentHotPluggable = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttIsHotPluggable).toBool();
+            attachmentData.m_strAttachmentMediumId = m_pModelStorage->data(attachmentIndex, StorageModel::R_AttMediumId).toString();
 
             /* Recache storage attachment data: */
@@ -2537 +2537 @@
     /* Check controllers for name emptiness & coincidence.
      * Check attachments for the hd presence / uniqueness. */
-    QModelIndex rootIndex = mStorageModel->root();
+    const QModelIndex rootIndex = m_pModelStorage->root();
     QMap <QString, QString> config;
     QMap<int, QString> names;
     /* For each controller: */
-    for (int i = 0; i < mStorageModel->rowCount (rootIndex); ++ i)
-    {
-        QModelIndex ctrIndex = rootIndex.child (i, 0);
-        QString ctrName = mStorageModel->data (ctrIndex, StorageModel::R_CtrName).toString();
+    for (int i = 0; i < m_pModelStorage->rowCount(rootIndex); ++i)
+    {
+        const QModelIndex ctrIndex = rootIndex.child(i, 0);
+        const QString ctrName = m_pModelStorage->data(ctrIndex, StorageModel::R_CtrName).toString();
 
         /* Check for name emptiness: */
@@ -2563 +2563 @@
 
         /* For each attachment: */
-        for (int j = 0; j < mStorageModel->rowCount (ctrIndex); ++ j)
-        {
-            QModelIndex attIndex = ctrIndex.child (j, 0);
-            StorageSlot attSlot = mStorageModel->data (attIndex, StorageModel::R_AttSlot).value <StorageSlot>();
-            KDeviceType attDevice = mStorageModel->data (attIndex, StorageModel::R_AttDevice).value <KDeviceType>();
-            QString key (mStorageModel->data (attIndex, StorageModel::R_AttMediumId).toString());
-            QString value (QString ("%1 (%2)").arg (ctrName, gpConverter->toString (attSlot)));
+        for (int j = 0; j < m_pModelStorage->rowCount(ctrIndex); ++j)
+        {
+            const QModelIndex attIndex = ctrIndex.child(j, 0);
+            const StorageSlot attSlot = m_pModelStorage->data(attIndex, StorageModel::R_AttSlot).value <StorageSlot>();
+            const KDeviceType enmAttDevice = m_pModelStorage->data(attIndex, StorageModel::R_AttDevice).value <KDeviceType>();
+            const QString key(m_pModelStorage->data(attIndex, StorageModel::R_AttMediumId).toString());
+            const QString value(QString("%1 (%2)").arg(ctrName, gpConverter->toString(attSlot)));
             /* Check for emptiness: */
-            if (vboxGlobal().medium(key).isNull() && attDevice == KDeviceType_HardDisk)
+            if (vboxGlobal().medium(key).isNull() && enmAttDevice == KDeviceType_HardDisk)
             {
-                message.second << tr("No hard disk is selected for <i>%1</i>.").arg (value);
+                message.second << tr("No hard disk is selected for <i>%1</i>.").arg(value);
                 fPass = false;
             }
             /* Check for coincidence: */
-            if (!vboxGlobal().medium(key).isNull() && config.contains (key))
+            if (!vboxGlobal().medium(key).isNull() && config.contains(key))
             {
                 message.second << tr("<i>%1</i> is using a disk that is already attached to <i>%2</i>.")
-                                     .arg (value).arg (config [key]);
+                                     .arg(value).arg(config[key]);
                 fPass = false;
             }
             else
-                config.insert (key, value);
+                config.insert(key, value);
         }
     }
@@ -2590 +2590 @@
     /* Check for excessive controllers on Storage page controllers list: */
     QStringList excessiveList;
-    QMap<KStorageBus, int> currentType = mStorageModel->currentControllerTypes();
-    QMap<KStorageBus, int> maximumType = mStorageModel->maximumControllerTypes();
+    const QMap<KStorageBus, int> currentType = m_pModelStorage->currentControllerTypes();
+    const QMap<KStorageBus, int> maximumType = m_pModelStorage->maximumControllerTypes();
     for (int iStorageBusType = KStorageBus_IDE; iStorageBusType <= KStorageBus_USB; ++iStorageBusType)
     {
@@ -2609 +2609 @@
                              "Please change the chipset type on the System settings page or reduce the number "
                              "of the following storage controllers on the Storage settings page: %2")
-                             .arg(gpConverter->toString(mStorageModel->chipsetType()))
+                             .arg(gpConverter->toString(m_pModelStorage->chipsetType()))
                              .arg(excessiveList.join(", "));
         fPass = false;
@@ -2622 +2622 @@
 }
 
-void UIMachineSettingsStorage::setConfigurationAccessLevel(ConfigurationAccessLevel newConfigurationAccessLevel)
+void UIMachineSettingsStorage::setConfigurationAccessLevel(ConfigurationAccessLevel enmLevel)
 {
     /* Update model 'configuration access level': */
-    mStorageModel->setConfigurationAccessLevel(newConfigurationAccessLevel);
+    m_pModelStorage->setConfigurationAccessLevel(enmLevel);
     /* Update 'configuration access level' of base class: */
-    UISettingsPageMachine::setConfigurationAccessLevel(newConfigurationAccessLevel);
+    UISettingsPageMachine::setConfigurationAccessLevel(enmLevel);
 }
 
@@ -2636 +2636 @@
 
     /* Translate storage-view: */
-    mTwStorageTree->setWhatsThis(tr("Lists all storage controllers for this machine and "
+    m_pTreeStorage->setWhatsThis(tr("Lists all storage controllers for this machine and "
                                     "the virtual images and host drives attached to them."));
 
     /* Translate tool-bar: */
-    mAddCtrAction->setShortcut(QKeySequence("Ins"));
-    mDelCtrAction->setShortcut(QKeySequence("Del"));
-    mAddAttAction->setShortcut(QKeySequence("+"));
-    mDelAttAction->setShortcut(QKeySequence("-"));
-
-    mAddCtrAction->setText(tr("Add Controller"));
-    mAddIDECtrAction->setText(tr("Add IDE Controller"));
-    mAddSATACtrAction->setText(tr("Add SATA Controller"));
-    mAddSCSICtrAction->setText(tr("Add SCSI Controller"));
-    mAddSASCtrAction->setText(tr("Add SAS Controller"));
-    mAddFloppyCtrAction->setText(tr("Add Floppy Controller"));
-    mAddUSBCtrAction->setText(tr("Add USB Controller"));
-    mAddNVMeCtrAction->setText(tr("Add NVMe Controller"));
-    mDelCtrAction->setText(tr("Remove Controller"));
-    mAddAttAction->setText(tr("Add Attachment"));
-    mAddHDAttAction->setText(tr("Add Hard Disk"));
-    mAddCDAttAction->setText(tr("Add Optical Drive"));
-    mAddFDAttAction->setText(tr("Add Floppy Drive"));
-    mDelAttAction->setText(tr("Remove Attachment"));
-
-    mAddCtrAction->setWhatsThis(tr("Adds new storage controller."));
-    mDelCtrAction->setWhatsThis(tr("Removes selected storage controller."));
-    mAddAttAction->setWhatsThis(tr("Adds new storage attachment."));
-    mDelAttAction->setWhatsThis(tr("Removes selected storage attachment."));
-
-    mAddCtrAction->setToolTip(mAddCtrAction->whatsThis());
-    mDelCtrAction->setToolTip(mDelCtrAction->whatsThis());
-    mAddAttAction->setToolTip(mAddAttAction->whatsThis());
-    mDelAttAction->setToolTip(mDelAttAction->whatsThis());
+    m_pActionAddController->setShortcut(QKeySequence("Ins"));
+    m_pActionRemoveController->setShortcut(QKeySequence("Del"));
+    m_pActionAddAttachment->setShortcut(QKeySequence("+"));
+    m_pActionRemoveAttachment->setShortcut(QKeySequence("-"));
+
+    m_pActionAddController->setText(tr("Add Controller"));
+    m_pActionAddControllerIDE->setText(tr("Add IDE Controller"));
+    m_pActionAddControllerSATA->setText(tr("Add SATA Controller"));
+    m_pActionAddControllerSCSI->setText(tr("Add SCSI Controller"));
+    m_pActionAddControllerSAS->setText(tr("Add SAS Controller"));
+    m_pActionAddControllerFloppy->setText(tr("Add Floppy Controller"));
+    m_pActionAddControllerUSB->setText(tr("Add USB Controller"));
+    m_pActionAddControllerNVMe->setText(tr("Add NVMe Controller"));
+    m_pActionRemoveController->setText(tr("Remove Controller"));
+    m_pActionAddAttachment->setText(tr("Add Attachment"));
+    m_pActionAddAttachmentHD->setText(tr("Add Hard Disk"));
+    m_pActionAddAttachmentCD->setText(tr("Add Optical Drive"));
+    m_pActionAddAttachmentFD->setText(tr("Add Floppy Drive"));
+    m_pActionRemoveAttachment->setText(tr("Remove Attachment"));
+
+    m_pActionAddController->setWhatsThis(tr("Adds new storage controller."));
+    m_pActionRemoveController->setWhatsThis(tr("Removes selected storage controller."));
+    m_pActionAddAttachment->setWhatsThis(tr("Adds new storage attachment."));
+    m_pActionRemoveAttachment->setWhatsThis(tr("Removes selected storage attachment."));
+
+    m_pActionAddController->setToolTip(m_pActionAddController->whatsThis());
+    m_pActionRemoveController->setToolTip(m_pActionRemoveController->whatsThis());
+    m_pActionAddAttachment->setToolTip(m_pActionAddAttachment->whatsThis());
+    m_pActionRemoveAttachment->setToolTip(m_pActionRemoveAttachment->whatsThis());
 }
 
@@ -2674 +2674 @@
 {
     /* Declare required variables: */
-    QModelIndex index = mTwStorageTree->currentIndex();
-    KDeviceType device = mStorageModel->data(index, StorageModel::R_AttDevice).value<KDeviceType>();
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const KDeviceType enmDevice = m_pModelStorage->data(index, StorageModel::R_AttDevice).value<KDeviceType>();
 
     /* Left pane: */
     mLsLeftPane->setEnabled(isMachineInValidMode());
-    mTwStorageTree->setEnabled(isMachineInValidMode());
+    m_pTreeStorage->setEnabled(isMachineInValidMode());
     /* Empty information pane: */
     mLsEmpty->setEnabled(isMachineInValidMode());
@@ -2694 +2694 @@
     /* Attachments pane: */
     mLsAttributes->setEnabled(isMachineInValidMode());
-    mLbMedium->setEnabled(isMachineOffline() || (isMachineOnline() && device != KDeviceType_HardDisk));
+    mLbMedium->setEnabled(isMachineOffline() || (isMachineOnline() && enmDevice != KDeviceType_HardDisk));
     mCbSlot->setEnabled(isMachineOffline());
-    mTbOpen->setEnabled(isMachineOffline() || (isMachineOnline() && device != KDeviceType_HardDisk));
+    mTbOpen->setEnabled(isMachineOffline() || (isMachineOnline() && enmDevice != KDeviceType_HardDisk));
     mCbPassthrough->setEnabled(isMachineOffline());
     mCbTempEject->setEnabled(isMachineInValidMode());
@@ -2722 +2722 @@
 
     /* Update action states: */
-    updateActionsState();
+    sltUpdateActionsState();
 }
 
 void UIMachineSettingsStorage::showEvent(QShowEvent *pEvent)
 {
-    if (!mIsPolished)
-    {
-        mIsPolished = true;
-
-        /* First column indent */
-        mLtEmpty->setColumnMinimumWidth (0, 10);
-        mLtController->setColumnMinimumWidth (0, 10);
-        mLtAttachment->setColumnMinimumWidth (0, 10);
+    if (!m_fPolished)
+    {
+        m_fPolished = true;
+
+        /* First column indent: */
+        mLtEmpty->setColumnMinimumWidth(0, 10);
+        mLtController->setColumnMinimumWidth(0, 10);
+        mLtAttachment->setColumnMinimumWidth(0, 10);
 #if 0
         /* Second column indent minimum width */
@@ -2742 +2742 @@
                    << mLbLocation << mLbUsage;
         int maxWidth = 0;
-        QFontMetrics metrics (font());
+        QFontMetrics metrics(font());
         foreach (QLabel *label, labelsList)
         {
-            int width = metrics.width (label->text());
+            int width = metrics.width(label->text());
             maxWidth = width > maxWidth ? width : maxWidth;
         }
-        mLtAttachment->setColumnMinimumWidth (1, maxWidth);
+        mLtAttachment->setColumnMinimumWidth(1, maxWidth);
 #endif
     }
@@ -2754 +2754 @@
 }
 
-void UIMachineSettingsStorage::sltHandleMediumEnumerated(const QString &strMediumID)
+void UIMachineSettingsStorage::sltHandleMediumEnumerated(const QString &strMediumId)
 {
     /* Search for corresponding medium: */
-    UIMedium medium = vboxGlobal().medium(strMediumID);
-
-    QModelIndex rootIndex = mStorageModel->root();
-    for (int i = 0; i < mStorageModel->rowCount(rootIndex); ++i)
-    {
-        QModelIndex ctrIndex = rootIndex.child(i, 0);
-        for (int j = 0; j < mStorageModel->rowCount(ctrIndex); ++j)
-        {
-            QModelIndex attIndex = ctrIndex.child(j, 0);
-            QString attMediumId = mStorageModel->data(attIndex, StorageModel::R_AttMediumId).toString();
+    const UIMedium medium = vboxGlobal().medium(strMediumId);
+
+    const QModelIndex rootIndex = m_pModelStorage->root();
+    for (int i = 0; i < m_pModelStorage->rowCount(rootIndex); ++i)
+    {
+        const QModelIndex ctrIndex = rootIndex.child(i, 0);
+        for (int j = 0; j < m_pModelStorage->rowCount(ctrIndex); ++j)
+        {
+            const QModelIndex attIndex = ctrIndex.child(j, 0);
+            const QString attMediumId = m_pModelStorage->data(attIndex, StorageModel::R_AttMediumId).toString();
             if (attMediumId == medium.id())
             {
-                mStorageModel->setData(attIndex, attMediumId, StorageModel::R_AttMediumId);
+                m_pModelStorage->setData(attIndex, attMediumId, StorageModel::R_AttMediumId);
 
                 /* Revalidate: */
@@ -2778 +2778 @@
 }
 
-void UIMachineSettingsStorage::sltHandleMediumDeleted(const QString &strMediumID)
-{
-    QModelIndex rootIndex = mStorageModel->root();
-    for (int i = 0; i < mStorageModel->rowCount(rootIndex); ++i)
+void UIMachineSettingsStorage::sltHandleMediumDeleted(const QString &strMediumId)
+{
+    QModelIndex rootIndex = m_pModelStorage->root();
+    for (int i = 0; i < m_pModelStorage->rowCount(rootIndex); ++i)
     {
         QModelIndex ctrIndex = rootIndex.child(i, 0);
-        for (int j = 0; j < mStorageModel->rowCount(ctrIndex); ++j)
+        for (int j = 0; j < m_pModelStorage->rowCount(ctrIndex); ++j)
         {
             QModelIndex attIndex = ctrIndex.child(j, 0);
-            QString attMediumId = mStorageModel->data(attIndex, StorageModel::R_AttMediumId).toString();
-            if (attMediumId == strMediumID)
+            QString attMediumId = m_pModelStorage->data(attIndex, StorageModel::R_AttMediumId).toString();
+            if (attMediumId == strMediumId)
             {
-                mStorageModel->setData(attIndex, UIMedium().id(), StorageModel::R_AttMediumId);
+                m_pModelStorage->setData(attIndex, UIMedium().id(), StorageModel::R_AttMediumId);
 
                 /* Revalidate: */
@@ -2799 +2799 @@
 }
 
-void UIMachineSettingsStorage::addController()
+void UIMachineSettingsStorage::sltAddController()
 {
     QMenu menu;
-    menu.addAction (mAddIDECtrAction);
-    menu.addAction (mAddSATACtrAction);
-    menu.addAction (mAddSCSICtrAction);
-    menu.addAction (mAddSASCtrAction);
-    menu.addAction (mAddFloppyCtrAction);
-    menu.addAction (mAddUSBCtrAction);
-    menu.addAction (mAddNVMeCtrAction);
-    menu.exec (QCursor::pos());
-}
-
-void UIMachineSettingsStorage::addIDEController()
-{
-    addControllerWrapper (generateUniqueName ("IDE"), KStorageBus_IDE, KStorageControllerType_PIIX4);
-}
-
-void UIMachineSettingsStorage::addSATAController()
-{
-    addControllerWrapper (generateUniqueName ("SATA"), KStorageBus_SATA, KStorageControllerType_IntelAhci);
-}
-
-void UIMachineSettingsStorage::addSCSIController()
-{
-    addControllerWrapper (generateUniqueName ("SCSI"), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
-}
-
-void UIMachineSettingsStorage::addFloppyController()
-{
-    addControllerWrapper (generateUniqueName ("Floppy"), KStorageBus_Floppy, KStorageControllerType_I82078);
-}
-
-void UIMachineSettingsStorage::addSASController()
-{
-    addControllerWrapper (generateUniqueName ("SAS"), KStorageBus_SAS, KStorageControllerType_LsiLogicSas);
-}
-
-void UIMachineSettingsStorage::addUSBController()
-{
-    addControllerWrapper (generateUniqueName ("USB"), KStorageBus_USB, KStorageControllerType_USB);
-}
-
-void UIMachineSettingsStorage::addNVMeController()
-{
-    addControllerWrapper (generateUniqueName ("NVMe"), KStorageBus_PCIe, KStorageControllerType_NVMe);
-}
-
-void UIMachineSettingsStorage::delController()
-{
-    QModelIndex index = mTwStorageTree->currentIndex();
-    if (!mStorageModel->data (index, StorageModel::R_IsController).toBool())
+    menu.addAction(m_pActionAddControllerIDE);
+    menu.addAction(m_pActionAddControllerSATA);
+    menu.addAction(m_pActionAddControllerSCSI);
+    menu.addAction(m_pActionAddControllerSAS);
+    menu.addAction(m_pActionAddControllerFloppy);
+    menu.addAction(m_pActionAddControllerUSB);
+    menu.addAction(m_pActionAddControllerNVMe);
+    menu.exec(QCursor::pos());
+}
+
+void UIMachineSettingsStorage::sltAddControllerIDE()
+{
+    addControllerWrapper(generateUniqueControllerName("IDE"), KStorageBus_IDE, KStorageControllerType_PIIX4);
+}
+
+void UIMachineSettingsStorage::sltAddControllerSATA()
+{
+    addControllerWrapper(generateUniqueControllerName("SATA"), KStorageBus_SATA, KStorageControllerType_IntelAhci);
+}
+
+void UIMachineSettingsStorage::sltAddControllerSCSI()
+{
+    addControllerWrapper(generateUniqueControllerName("SCSI"), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
+}
+
+void UIMachineSettingsStorage::sltAddControllerFloppy()
+{
+    addControllerWrapper(generateUniqueControllerName("Floppy"), KStorageBus_Floppy, KStorageControllerType_I82078);
+}
+
+void UIMachineSettingsStorage::sltAddControllerSAS()
+{
+    addControllerWrapper(generateUniqueControllerName("SAS"), KStorageBus_SAS, KStorageControllerType_LsiLogicSas);
+}
+
+void UIMachineSettingsStorage::sltAddControllerUSB()
+{
+    addControllerWrapper(generateUniqueControllerName("USB"), KStorageBus_USB, KStorageControllerType_USB);
+}
+
+void UIMachineSettingsStorage::sltAddControllerNVMe()
+{
+    addControllerWrapper(generateUniqueControllerName("NVMe"), KStorageBus_PCIe, KStorageControllerType_NVMe);
+}
+
+void UIMachineSettingsStorage::sltRemoveController()
+{
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+    if (!m_pModelStorage->data(index, StorageModel::R_IsController).toBool())
         return;
 
-    mStorageModel->delController (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()));
-    emit storageChanged();
+    m_pModelStorage->delController(QUuid(m_pModelStorage->data(index, StorageModel::R_ItemId).toString()));
+    emit sigStorageChanged();
 
     /* Revalidate: */
@@ -2860 +2860 @@
 }
 
-void UIMachineSettingsStorage::addAttachment()
-{
-    QModelIndex index = mTwStorageTree->currentIndex();
-    Assert (mStorageModel->data (index, StorageModel::R_IsController).toBool());
-
-    DeviceTypeList deviceTypeList (mStorageModel->data (index, StorageModel::R_CtrDevices).value <DeviceTypeList>());
-    bool justTrigger = deviceTypeList.size() == 1;
-    bool showMenu = deviceTypeList.size() > 1;
+void UIMachineSettingsStorage::sltAddAttachment()
+{
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+    Assert(m_pModelStorage->data(index, StorageModel::R_IsController).toBool());
+
+    const DeviceTypeList deviceTypeList(m_pModelStorage->data(index, StorageModel::R_CtrDevices).value <DeviceTypeList>());
+    const bool fJustTrigger = deviceTypeList.size() == 1;
+    const bool fShowMenu = deviceTypeList.size() > 1;
     QMenu menu;
     foreach (const KDeviceType &deviceType, deviceTypeList)
@@ -2874 +2874 @@
         {
             case KDeviceType_HardDisk:
-                if (justTrigger)
-                    mAddHDAttAction->trigger();
-                if (showMenu)
-                    menu.addAction (mAddHDAttAction);
+                if (fJustTrigger)
+                    m_pActionAddAttachmentHD->trigger();
+                if (fShowMenu)
+                    menu.addAction(m_pActionAddAttachmentHD);
                 break;
             case KDeviceType_DVD:
-                if (justTrigger)
-                    mAddCDAttAction->trigger();
-                if (showMenu)
-                    menu.addAction (mAddCDAttAction);
+                if (fJustTrigger)
+                    m_pActionAddAttachmentCD->trigger();
+                if (fShowMenu)
+                    menu.addAction(m_pActionAddAttachmentCD);
                 break;
             case KDeviceType_Floppy:
-                if (justTrigger)
-                    mAddFDAttAction->trigger();
-                if (showMenu)
-                    menu.addAction (mAddFDAttAction);
+                if (fJustTrigger)
+                    m_pActionAddAttachmentFD->trigger();
+                if (fShowMenu)
+                    menu.addAction(m_pActionAddAttachmentFD);
                 break;
             default:
@@ -2895 +2895 @@
         }
     }
-    if (showMenu)
-        menu.exec (QCursor::pos());
-}
-
-void UIMachineSettingsStorage::addHDAttachment()
-{
-    addAttachmentWrapper (KDeviceType_HardDisk);
-}
-
-void UIMachineSettingsStorage::addCDAttachment()
-{
-    addAttachmentWrapper (KDeviceType_DVD);
-}
-
-void UIMachineSettingsStorage::addFDAttachment()
-{
-    addAttachmentWrapper (KDeviceType_Floppy);
-}
-
-void UIMachineSettingsStorage::delAttachment()
-{
-    QModelIndex index = mTwStorageTree->currentIndex();
-
-    KDeviceType device = mStorageModel->data (index, StorageModel::R_AttDevice).value <KDeviceType>();
+    if (fShowMenu)
+        menu.exec(QCursor::pos());
+}
+
+void UIMachineSettingsStorage::sltAddAttachmentHD()
+{
+    addAttachmentWrapper(KDeviceType_HardDisk);
+}
+
+void UIMachineSettingsStorage::sltAddAttachmentCD()
+{
+    addAttachmentWrapper(KDeviceType_DVD);
+}
+
+void UIMachineSettingsStorage::sltAddAttachmentFD()
+{
+    addAttachmentWrapper(KDeviceType_Floppy);
+}
+
+void UIMachineSettingsStorage::sltRemoveAttachment()
+{
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+
+    const KDeviceType enmDevice = m_pModelStorage->data(index, StorageModel::R_AttDevice).value <KDeviceType>();
     /* Check if this would be the last DVD. If so let the user confirm this again. */
-    if (   device == KDeviceType_DVD
-        && deviceCount (KDeviceType_DVD) == 1)
+    if (   enmDevice == KDeviceType_DVD
+        && deviceCount(KDeviceType_DVD) == 1)
     {
         if (!msgCenter().confirmRemovingOfLastDVDDevice(this))
@@ -2927 +2927 @@
     }
 
-    QModelIndex parent = index.parent();
+    const QModelIndex parent = index.parent();
     if (!index.isValid() || !parent.isValid() ||
-        !mStorageModel->data (index, StorageModel::R_IsAttachment).toBool() ||
-        !mStorageModel->data (parent, StorageModel::R_IsController).toBool())
+        !m_pModelStorage->data(index, StorageModel::R_IsAttachment).toBool() ||
+        !m_pModelStorage->data(parent, StorageModel::R_IsController).toBool())
         return;
 
-    mStorageModel->delAttachment (QUuid (mStorageModel->data (parent, StorageModel::R_ItemId).toString()),
-                                  QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()));
-    emit storageChanged();
+    m_pModelStorage->delAttachment(QUuid(m_pModelStorage->data(parent, StorageModel::R_ItemId).toString()),
+                                   QUuid(m_pModelStorage->data(index, StorageModel::R_ItemId).toString()));
+    emit sigStorageChanged();
 
     /* Revalidate: */
@@ -2941 +2941 @@
 }
 
-void UIMachineSettingsStorage::getInformation()
-{
-    mIsLoadingInProgress = true;
-
-    QModelIndex index = mTwStorageTree->currentIndex();
-    if (!index.isValid() || index == mStorageModel->root())
-    {
-        /* Showing Initial Page */
-        mSwRightPane->setCurrentIndex (0);
+void UIMachineSettingsStorage::sltGetInformation()
+{
+    m_fLoadingInProgress = true;
+
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+    if (!index.isValid() || index == m_pModelStorage->root())
+    {
+        /* Showing Initial Page: */
+        mSwRightPane->setCurrentIndex(0);
     }
     else
     {
-        switch (mStorageModel->data (index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
+        switch (m_pModelStorage->data(index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
         {
             case AbstractItem::Type_ControllerItem:
             {
-                /* Getting Controller Name */
-                mLeName->setText (mStorageModel->data (index, StorageModel::R_CtrName).toString());
+                /* Getting Controller Name: */
+                mLeName->setText(m_pModelStorage->data(index, StorageModel::R_CtrName).toString());
 
                 /* Getting Controller Sub type */
                 mCbType->clear();
-                ControllerTypeList controllerTypeList (mStorageModel->data (index, StorageModel::R_CtrTypes).value <ControllerTypeList>());
-                for (int i = 0; i < controllerTypeList.size(); ++ i)
-                    mCbType->insertItem (mCbType->count(), gpConverter->toString (controllerTypeList [i]));
-                KStorageControllerType type = mStorageModel->data (index, StorageModel::R_CtrType).value <KStorageControllerType>();
-                int ctrPos = mCbType->findText (gpConverter->toString (type));
-                mCbType->setCurrentIndex (ctrPos == -1 ? 0 : ctrPos);
-
-                KStorageBus bus = mStorageModel->data (index, StorageModel::R_CtrBusType).value <KStorageBus>();
-                mLbPortCount->setVisible (bus == KStorageBus_SATA || bus == KStorageBus_SAS);
-                mSbPortCount->setVisible (bus == KStorageBus_SATA || bus == KStorageBus_SAS);
-                uint uPortCount = mStorageModel->data (index, StorageModel::R_CtrPortCount).toUInt();
-                uint uMaxPortCount = mStorageModel->data (index, StorageModel::R_CtrMaxPortCount).toUInt();
+                const ControllerTypeList controllerTypeList(m_pModelStorage->data(index, StorageModel::R_CtrTypes).value <ControllerTypeList>());
+                for (int i = 0; i < controllerTypeList.size(); ++i)
+                    mCbType->insertItem(mCbType->count(), gpConverter->toString(controllerTypeList[i]));
+                const KStorageControllerType enmType = m_pModelStorage->data(index, StorageModel::R_CtrType).value <KStorageControllerType>();
+                const int iCtrPos = mCbType->findText(gpConverter->toString(enmType));
+                mCbType->setCurrentIndex(iCtrPos == -1 ? 0 : iCtrPos);
+
+                const KStorageBus enmBus = m_pModelStorage->data(index, StorageModel::R_CtrBusType).value <KStorageBus>();
+                mLbPortCount->setVisible(enmBus == KStorageBus_SATA || enmBus == KStorageBus_SAS);
+                mSbPortCount->setVisible(enmBus == KStorageBus_SATA || enmBus == KStorageBus_SAS);
+                const uint uPortCount = m_pModelStorage->data(index, StorageModel::R_CtrPortCount).toUInt();
+                const uint uMaxPortCount = m_pModelStorage->data(index, StorageModel::R_CtrMaxPortCount).toUInt();
                 mSbPortCount->setMaximum(uMaxPortCount);
-                mSbPortCount->setValue (uPortCount);
-
-                bool isUseIoCache = mStorageModel->data (index, StorageModel::R_CtrIoCache).toBool();
-                mCbIoCache->setChecked(isUseIoCache);
+                mSbPortCount->setValue(uPortCount);
+
+                const bool fUseIoCache = m_pModelStorage->data(index, StorageModel::R_CtrIoCache).toBool();
+                mCbIoCache->setChecked(fUseIoCache);
 
                 /* Showing Controller Page */
-                mSwRightPane->setCurrentIndex (1);
+                mSwRightPane->setCurrentIndex(1);
                 break;
             }
@@ -2988 +2988 @@
                 /* Getting Attachment Slot */
                 mCbSlot->clear();
-                SlotsList slotsList (mStorageModel->data (index, StorageModel::R_AttSlots).value <SlotsList>());
-                for (int i = 0; i < slotsList.size(); ++ i)
-                    mCbSlot->insertItem (mCbSlot->count(), gpConverter->toString (slotsList [i]));
-                StorageSlot slt = mStorageModel->data (index, StorageModel::R_AttSlot).value <StorageSlot>();
-                int attSlotPos = mCbSlot->findText (gpConverter->toString (slt));
-                mCbSlot->setCurrentIndex (attSlotPos == -1 ? 0 : attSlotPos);
-                mCbSlot->setToolTip (mCbSlot->itemText (mCbSlot->currentIndex()));
+                const SlotsList slotsList(m_pModelStorage->data(index, StorageModel::R_AttSlots).value <SlotsList>());
+                for (int i = 0; i < slotsList.size(); ++i)
+                    mCbSlot->insertItem(mCbSlot->count(), gpConverter->toString(slotsList[i]));
+                const StorageSlot slt = m_pModelStorage->data(index, StorageModel::R_AttSlot).value <StorageSlot>();
+                const int iAttSlotPos = mCbSlot->findText(gpConverter->toString(slt));
+                mCbSlot->setCurrentIndex(iAttSlotPos == -1 ? 0 : iAttSlotPos);
+                mCbSlot->setToolTip(mCbSlot->itemText(mCbSlot->currentIndex()));
 
                 /* Getting Attachment Medium */
-                KDeviceType device = mStorageModel->data (index, StorageModel::R_AttDevice).value <KDeviceType>();
-                switch (device)
+                const KDeviceType enmDevice = m_pModelStorage->data(index, StorageModel::R_AttDevice).value <KDeviceType>();
+                switch (enmDevice)
                 {
                     case KDeviceType_HardDisk:
@@ -3025 +3025 @@
 
                 /* Get hot-pluggable state: */
-                bool fIsHotPluggable = mStorageModel->data(index, StorageModel::R_AttIsHotPluggable).toBool();
+                const bool fIsHotPluggable = m_pModelStorage->data(index, StorageModel::R_AttIsHotPluggable).toBool();
 
                 /* Fetch device-type, medium-id: */
-                m_pMediumIdHolder->setType(mediumTypeToLocal(device));
-                m_pMediumIdHolder->setId(mStorageModel->data(index, StorageModel::R_AttMediumId).toString());
+                m_pMediumIdHolder->setType(mediumTypeToLocal(enmDevice));
+                m_pMediumIdHolder->setId(m_pModelStorage->data(index, StorageModel::R_AttMediumId).toString());
 
                 /* Get/fetch editable state: */
-                bool fIsEditable =    (isMachineOffline())
-                                   || (isMachineOnline() && device != KDeviceType_HardDisk)
-                                   || (isMachineOnline() && device == KDeviceType_HardDisk && fIsHotPluggable);
+                const bool fIsEditable =    (isMachineOffline())
+                                         || (isMachineOnline() && enmDevice != KDeviceType_HardDisk)
+                                         || (isMachineOnline() && enmDevice == KDeviceType_HardDisk && fIsHotPluggable);
                 mLbMedium->setEnabled(fIsEditable);
                 mTbOpen->setEnabled(fIsEditable);
 
                 /* Getting Passthrough state */
-                bool isHostDrive = mStorageModel->data (index, StorageModel::R_AttIsHostDrive).toBool();
-                mCbPassthrough->setVisible (device == KDeviceType_DVD && isHostDrive);
-                mCbPassthrough->setChecked (isHostDrive && mStorageModel->data (index, StorageModel::R_AttIsPassthrough).toBool());
+                const bool isHostDrive = m_pModelStorage->data(index, StorageModel::R_AttIsHostDrive).toBool();
+                mCbPassthrough->setVisible(enmDevice == KDeviceType_DVD && isHostDrive);
+                mCbPassthrough->setChecked(isHostDrive && m_pModelStorage->data(index, StorageModel::R_AttIsPassthrough).toBool());
 
                 /* Getting TempEject state */
-                mCbTempEject->setVisible (device == KDeviceType_DVD && !isHostDrive);
-                mCbTempEject->setChecked (!isHostDrive && mStorageModel->data (index, StorageModel::R_AttIsTempEject).toBool());
+                mCbTempEject->setVisible(enmDevice == KDeviceType_DVD && !isHostDrive);
+                mCbTempEject->setChecked(!isHostDrive && m_pModelStorage->data(index, StorageModel::R_AttIsTempEject).toBool());
 
                 /* Getting NonRotational state */
-                mCbNonRotational->setVisible (device == KDeviceType_HardDisk);
-                mCbNonRotational->setChecked (mStorageModel->data (index, StorageModel::R_AttIsNonRotational).toBool());
+                mCbNonRotational->setVisible(enmDevice == KDeviceType_HardDisk);
+                mCbNonRotational->setChecked(m_pModelStorage->data(index, StorageModel::R_AttIsNonRotational).toBool());
 
                 /* Fetch hot-pluggable state: */
@@ -3056 +3056 @@
 
                 /* Update optional widgets visibility */
-                updateAdditionalObjects (device);
+                updateAdditionalDetails(enmDevice);
 
                 /* Getting Other Information */
-                mLbHDFormatValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttFormat).toString()));
-                mLbCDFDTypeValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttFormat).toString()));
-                mLbHDVirtualSizeValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttLogicalSize).toString()));
-                mLbHDActualSizeValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttSize).toString()));
-                mLbSizeValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttSize).toString()));
-                mLbHDDetailsValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttDetails).toString()));
-                mLbLocationValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttLocation).toString()));
-                mLbUsageValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttUsage).toString()));
-                m_pLabelEncryptionValue->setText(compressText(mStorageModel->data(index, StorageModel::R_AttEncryptionPasswordID).toString()));
+                mLbHDFormatValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttFormat).toString()));
+                mLbCDFDTypeValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttFormat).toString()));
+                mLbHDVirtualSizeValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttLogicalSize).toString()));
+                mLbHDActualSizeValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttSize).toString()));
+                mLbSizeValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttSize).toString()));
+                mLbHDDetailsValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttDetails).toString()));
+                mLbLocationValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttLocation).toString()));
+                mLbUsageValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttUsage).toString()));
+                m_pLabelEncryptionValue->setText(compressText(m_pModelStorage->data(index, StorageModel::R_AttEncryptionPasswordID).toString()));
 
                 /* Showing Attachment Page */
-                mSwRightPane->setCurrentIndex (2);
+                mSwRightPane->setCurrentIndex(2);
                 break;
             }
@@ -3081 +3081 @@
     revalidate();
 
-    mIsLoadingInProgress = false;
-}
-
-void UIMachineSettingsStorage::setInformation()
-{
-    QModelIndex index = mTwStorageTree->currentIndex();
-    if (mIsLoadingInProgress || !index.isValid() || index == mStorageModel->root())
+    m_fLoadingInProgress = false;
+}
+
+void UIMachineSettingsStorage::sltSetInformation()
+{
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+    if (m_fLoadingInProgress || !index.isValid() || index == m_pModelStorage->root())
         return;
 
-    QObject *sdr = sender();
-    switch (mStorageModel->data (index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
+    QObject *pSdr = sender();
+    switch (m_pModelStorage->data(index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
     {
         case AbstractItem::Type_ControllerItem:
         {
-            /* Setting Controller Name */
-            if (sdr == mLeName)
-                mStorageModel->setData (index, mLeName->text(), StorageModel::R_CtrName);
-            /* Setting Controller Sub-Type */
-            else if (sdr == mCbType)
-                mStorageModel->setData (index, QVariant::fromValue (gpConverter->fromString<KStorageControllerType> (mCbType->currentText())),
+            /* Setting Controller Name: */
+            if (pSdr == mLeName)
+                m_pModelStorage->setData(index, mLeName->text(), StorageModel::R_CtrName);
+            /* Setting Controller Sub-Type: */
+            else if (pSdr == mCbType)
+                m_pModelStorage->setData(index, QVariant::fromValue(gpConverter->fromString<KStorageControllerType>(mCbType->currentText())),
                                         StorageModel::R_CtrType);
-            else if (sdr == mSbPortCount)
-                mStorageModel->setData (index, mSbPortCount->value(), StorageModel::R_CtrPortCount);
-            else if (sdr == mCbIoCache)
-                mStorageModel->setData (index, mCbIoCache->isChecked(), StorageModel::R_CtrIoCache);
+            else if (pSdr == mSbPortCount)
+                m_pModelStorage->setData(index, mSbPortCount->value(), StorageModel::R_CtrPortCount);
+            else if (pSdr == mCbIoCache)
+                m_pModelStorage->setData(index, mCbIoCache->isChecked(), StorageModel::R_CtrIoCache);
             break;
         }
         case AbstractItem::Type_AttachmentItem:
         {
-            /* Setting Attachment Slot */
-            if (sdr == mCbSlot)
+            /* Setting Attachment Slot: */
+            if (pSdr == mCbSlot)
             {
-                QModelIndex controllerIndex = mStorageModel->parent(index);
+                QModelIndex controllerIndex = m_pModelStorage->parent(index);
                 StorageSlot attachmentStorageSlot = gpConverter->fromString<StorageSlot>(mCbSlot->currentText());
-                mStorageModel->setData(index, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
-                QModelIndex theSameIndexAtNewPosition = mStorageModel->attachmentBySlot(controllerIndex, attachmentStorageSlot);
+                m_pModelStorage->setData(index, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
+                QModelIndex theSameIndexAtNewPosition = m_pModelStorage->attachmentBySlot(controllerIndex, attachmentStorageSlot);
                 AssertMsg(theSameIndexAtNewPosition.isValid(), ("Current attachment disappears!\n"));
-                mTwStorageTree->setCurrentIndex(theSameIndexAtNewPosition);
+                m_pTreeStorage->setCurrentIndex(theSameIndexAtNewPosition);
             }
             /* Setting Attachment Medium */
-            else if (sdr == m_pMediumIdHolder)
-                mStorageModel->setData (index, m_pMediumIdHolder->id(), StorageModel::R_AttMediumId);
-            else if (sdr == mCbPassthrough)
+            else if (pSdr == m_pMediumIdHolder)
+                m_pModelStorage->setData(index, m_pMediumIdHolder->id(), StorageModel::R_AttMediumId);
+            else if (pSdr == mCbPassthrough)
             {
-                if (mStorageModel->data (index, StorageModel::R_AttIsHostDrive).toBool())
-                    mStorageModel->setData (index, mCbPassthrough->isChecked(), StorageModel::R_AttIsPassthrough);
+                if (m_pModelStorage->data(index, StorageModel::R_AttIsHostDrive).toBool())
+                    m_pModelStorage->setData(index, mCbPassthrough->isChecked(), StorageModel::R_AttIsPassthrough);
             }
-            else if (sdr == mCbTempEject)
+            else if (pSdr == mCbTempEject)
             {
-                if (!mStorageModel->data (index, StorageModel::R_AttIsHostDrive).toBool())
-                    mStorageModel->setData (index, mCbTempEject->isChecked(), StorageModel::R_AttIsTempEject);
+                if (!m_pModelStorage->data(index, StorageModel::R_AttIsHostDrive).toBool())
+                    m_pModelStorage->setData(index, mCbTempEject->isChecked(), StorageModel::R_AttIsTempEject);
             }
-            else if (sdr == mCbNonRotational)
+            else if (pSdr == mCbNonRotational)
             {
-                mStorageModel->setData (index, mCbNonRotational->isChecked(), StorageModel::R_AttIsNonRotational);
+                m_pModelStorage->setData(index, mCbNonRotational->isChecked(), StorageModel::R_AttIsNonRotational);
             }
-            else if (sdr == m_pCheckBoxHotPluggable)
+            else if (pSdr == m_pCheckBoxHotPluggable)
             {
-                mStorageModel->setData(index, m_pCheckBoxHotPluggable->isChecked(), StorageModel::R_AttIsHotPluggable);
+                m_pModelStorage->setData(index, m_pCheckBoxHotPluggable->isChecked(), StorageModel::R_AttIsHotPluggable);
             }
             break;
@@ -3147 +3147 @@
     }
 
-    emit storageChanged();
-    getInformation();
+    emit sigStorageChanged();
+    sltGetInformation();
 }
 
@@ -3215 +3215 @@
 void UIMachineSettingsStorage::sltCreateNewHardDisk()
 {
-    QString strMediumId = getWithNewHDWizard();
+    const QString strMediumId = getWithNewHDWizard();
     if (!strMediumId.isNull())
         m_pMediumIdHolder->setId(strMediumId);
@@ -3227 +3227 @@
 void UIMachineSettingsStorage::sltChooseExistingMedium()
 {
-    QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
-    QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(m_pMediumIdHolder->type(), this, strMachineFolder);
+    const QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
+    const QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(m_pMediumIdHolder->type(), this, strMachineFolder);
     if (!strMediumId.isNull())
         m_pMediumIdHolder->setId(strMediumId);
@@ -3250 +3250 @@
     {
         /* Get recent medium type & name: */
-        QStringList mediumInfoList = pChooseRecentMediumAction->data().toString().split(',');
-        UIMediumType mediumType = (UIMediumType)mediumInfoList[0].toUInt();
-        QString strMediumLocation = mediumInfoList[1];
-        QString strMediumId = vboxGlobal().openMedium(mediumType, strMediumLocation, this);
+        const QStringList mediumInfoList = pChooseRecentMediumAction->data().toString().split(',');
+        const UIMediumType enmMediumType = (UIMediumType)mediumInfoList[0].toUInt();
+        const QString strMediumLocation = mediumInfoList[1];
+        const QString strMediumId = vboxGlobal().openMedium(enmMediumType, strMediumLocation, this);
         if (!strMediumId.isNull())
             m_pMediumIdHolder->setId(strMediumId);
@@ -3259 +3259 @@
 }
 
-void UIMachineSettingsStorage::updateActionsState()
-{
-    QModelIndex index = mTwStorageTree->currentIndex();
-
-    bool isIDEPossible = mStorageModel->data (index, StorageModel::R_IsMoreIDEControllersPossible).toBool();
-    bool isSATAPossible = mStorageModel->data (index, StorageModel::R_IsMoreSATAControllersPossible).toBool();
-    bool isSCSIPossible = mStorageModel->data (index, StorageModel::R_IsMoreSCSIControllersPossible).toBool();
-    bool isFloppyPossible = mStorageModel->data (index, StorageModel::R_IsMoreFloppyControllersPossible).toBool();
-    bool isSASPossible = mStorageModel->data (index, StorageModel::R_IsMoreSASControllersPossible).toBool();
-    bool isUSBPossible = mStorageModel->data (index, StorageModel::R_IsMoreUSBControllersPossible).toBool();
-    bool isNVMePossible = mStorageModel->data (index, StorageModel::R_IsMoreNVMeControllersPossible).toBool();
-
-    bool isController = mStorageModel->data (index, StorageModel::R_IsController).toBool();
-    bool isAttachment = mStorageModel->data (index, StorageModel::R_IsAttachment).toBool();
-    bool isAttachmentsPossible = mStorageModel->data (index, StorageModel::R_IsMoreAttachmentsPossible).toBool();
-    bool fIsAttachmentHotPluggable = mStorageModel->data(index, StorageModel::R_AttIsHotPluggable).toBool();
+void UIMachineSettingsStorage::sltUpdateActionsState()
+{
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+
+    const bool fIDEPossible = m_pModelStorage->data(index, StorageModel::R_IsMoreIDEControllersPossible).toBool();
+    const bool fSATAPossible = m_pModelStorage->data(index, StorageModel::R_IsMoreSATAControllersPossible).toBool();
+    const bool fSCSIPossible = m_pModelStorage->data(index, StorageModel::R_IsMoreSCSIControllersPossible).toBool();
+    const bool fFloppyPossible = m_pModelStorage->data(index, StorageModel::R_IsMoreFloppyControllersPossible).toBool();
+    const bool fSASPossible = m_pModelStorage->data(index, StorageModel::R_IsMoreSASControllersPossible).toBool();
+    const bool fUSBPossible = m_pModelStorage->data(index, StorageModel::R_IsMoreUSBControllersPossible).toBool();
+    const bool fNVMePossible = m_pModelStorage->data(index, StorageModel::R_IsMoreNVMeControllersPossible).toBool();
+
+    const bool fController = m_pModelStorage->data(index, StorageModel::R_IsController).toBool();
+    const bool fAttachment = m_pModelStorage->data(index, StorageModel::R_IsAttachment).toBool();
+    const bool fAttachmentsPossible = m_pModelStorage->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool();
+    const bool fIsAttachmentHotPluggable = m_pModelStorage->data(index, StorageModel::R_AttIsHotPluggable).toBool();
 
     /* Configure "add controller" actions: */
-    mAddCtrAction->setEnabled (isIDEPossible || isSATAPossible || isSCSIPossible || isFloppyPossible || isSASPossible || isUSBPossible || isNVMePossible);
-    mAddIDECtrAction->setEnabled (isIDEPossible);
-    mAddSATACtrAction->setEnabled (isSATAPossible);
-    mAddSCSICtrAction->setEnabled (isSCSIPossible);
-    mAddFloppyCtrAction->setEnabled (isFloppyPossible);
-    mAddSASCtrAction->setEnabled (isSASPossible);
-    mAddUSBCtrAction->setEnabled (isUSBPossible);
-    mAddNVMeCtrAction->setEnabled (isNVMePossible);
+    m_pActionAddController->setEnabled(fIDEPossible || fSATAPossible || fSCSIPossible || fFloppyPossible || fSASPossible || fUSBPossible || fNVMePossible);
+    m_pActionAddControllerIDE->setEnabled(fIDEPossible);
+    m_pActionAddControllerSATA->setEnabled(fSATAPossible);
+    m_pActionAddControllerSCSI->setEnabled(fSCSIPossible);
+    m_pActionAddControllerFloppy->setEnabled(fFloppyPossible);
+    m_pActionAddControllerSAS->setEnabled(fSASPossible);
+    m_pActionAddControllerUSB->setEnabled(fUSBPossible);
+    m_pActionAddControllerNVMe->setEnabled(fNVMePossible);
 
     /* Configure "add attachment" actions: */
-    mAddAttAction->setEnabled (isController && isAttachmentsPossible);
-    mAddHDAttAction->setEnabled (isController && isAttachmentsPossible);
-    mAddCDAttAction->setEnabled (isController && isAttachmentsPossible);
-    mAddFDAttAction->setEnabled (isController && isAttachmentsPossible);
+    m_pActionAddAttachment->setEnabled(fController && fAttachmentsPossible);
+    m_pActionAddAttachmentHD->setEnabled(fController && fAttachmentsPossible);
+    m_pActionAddAttachmentCD->setEnabled(fController && fAttachmentsPossible);
+    m_pActionAddAttachmentFD->setEnabled(fController && fAttachmentsPossible);
 
     /* Configure "delete controller" action: */
-    bool fControllerInSuitableState = isMachineOffline();
-    mDelCtrAction->setEnabled(isController && fControllerInSuitableState);
+    const bool fControllerInSuitableState = isMachineOffline();
+    m_pActionRemoveController->setEnabled(fController && fControllerInSuitableState);
 
     /* Configure "delete attachment" action: */
-    bool fAttachmentInSuitableState = isMachineOffline() ||
-                                      (isMachineOnline() && fIsAttachmentHotPluggable);
-    mDelAttAction->setEnabled(isAttachment && fAttachmentInSuitableState);
-}
-
-void UIMachineSettingsStorage::onRowInserted (const QModelIndex &aParent, int aPosition)
-{
-    QModelIndex index = mStorageModel->index (aPosition, 0, aParent);
-
-    switch (mStorageModel->data (index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
+    const bool fAttachmentInSuitableState = isMachineOffline() ||
+                                            (isMachineOnline() && fIsAttachmentHotPluggable);
+    m_pActionRemoveAttachment->setEnabled(fAttachment && fAttachmentInSuitableState);
+}
+
+void UIMachineSettingsStorage::sltHandleRowInsertion(const QModelIndex &parent, int iPosition)
+{
+    const QModelIndex index = m_pModelStorage->index(iPosition, 0, parent);
+
+    switch (m_pModelStorage->data(index, StorageModel::R_ItemType).value<AbstractItem::ItemType>())
     {
         case AbstractItem::Type_ControllerItem:
         {
-            /* Select the newly created Controller Item */
-            mTwStorageTree->setCurrentIndex (index);
+            /* Select the newly created Controller Item: */
+            m_pTreeStorage->setCurrentIndex(index);
             break;
         }
         case AbstractItem::Type_AttachmentItem:
         {
-            /* Expand parent if it is not expanded yet */
-            if (!mTwStorageTree->isExpanded (aParent))
-                mTwStorageTree->setExpanded (aParent, true);
+            /* Expand parent if it is not expanded yet: */
+            if (!m_pTreeStorage->isExpanded(parent))
+                m_pTreeStorage->setExpanded(parent, true);
             break;
         }
@@ -3325 +3325 @@
     }
 
-    updateActionsState();
-    getInformation();
-}
-
-void UIMachineSettingsStorage::onRowRemoved()
-{
-    if (mStorageModel->rowCount (mStorageModel->root()) == 0)
-        mTwStorageTree->setCurrentIndex (mStorageModel->root());
-
-    updateActionsState();
-    getInformation();
-}
-
-void UIMachineSettingsStorage::onCurrentItemChanged()
-{
-    updateActionsState();
-    getInformation();
-}
-
-void UIMachineSettingsStorage::onContextMenuRequested (const QPoint &aPosition)
-{
-    QModelIndex index = mTwStorageTree->indexAt (aPosition);
-    if (!index.isValid()) return addController();
+    sltUpdateActionsState();
+    sltGetInformation();
+}
+
+void UIMachineSettingsStorage::sltHandleRowRemoval()
+{
+    if (m_pModelStorage->rowCount (m_pModelStorage->root()) == 0)
+        m_pTreeStorage->setCurrentIndex (m_pModelStorage->root());
+
+    sltUpdateActionsState();
+    sltGetInformation();
+}
+
+void UIMachineSettingsStorage::sltHandleCurrentItemChange()
+{
+    sltUpdateActionsState();
+    sltGetInformation();
+}
+
+void UIMachineSettingsStorage::sltHandleContextMenuRequest(const QPoint &position)
+{
+    const QModelIndex index = m_pTreeStorage->indexAt(position);
+    if (!index.isValid())
+        return sltAddController();
 
     QMenu menu;
-    switch (mStorageModel->data (index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
+    switch (m_pModelStorage->data(index, StorageModel::R_ItemType).value<AbstractItem::ItemType>())
     {
         case AbstractItem::Type_ControllerItem:
         {
-            DeviceTypeList deviceTypeList (mStorageModel->data (index, StorageModel::R_CtrDevices).value <DeviceTypeList>());
+            const DeviceTypeList deviceTypeList(m_pModelStorage->data(index, StorageModel::R_CtrDevices).value<DeviceTypeList>());
             foreach (KDeviceType deviceType, deviceTypeList)
             {
@@ -3360 +3361 @@
                 {
                     case KDeviceType_HardDisk:
-                        menu.addAction (mAddHDAttAction);
+                        menu.addAction(m_pActionAddAttachmentHD);
                         break;
                     case KDeviceType_DVD:
-                        menu.addAction (mAddCDAttAction);
+                        menu.addAction(m_pActionAddAttachmentCD);
                         break;
                     case KDeviceType_Floppy:
-                        menu.addAction (mAddFDAttAction);
+                        menu.addAction(m_pActionAddAttachmentFD);
                         break;
                     default:
@@ -3372 +3373 @@
                 }
             }
-            menu.addAction (mDelCtrAction);
+            menu.addAction(m_pActionRemoveController);
             break;
         }
         case AbstractItem::Type_AttachmentItem:
         {
-            menu.addAction (mDelAttAction);
+            menu.addAction(m_pActionRemoveAttachment);
             break;
         }
@@ -3384 +3385 @@
     }
     if (!menu.isEmpty())
-        menu.exec (mTwStorageTree->viewport()->mapToGlobal (aPosition));
-}
-
-void UIMachineSettingsStorage::onDrawItemBranches (QPainter *aPainter, const QRect &aRect, const QModelIndex &aIndex)
-{
-    if (!aIndex.parent().isValid() || !aIndex.parent().parent().isValid())
+        menu.exec(m_pTreeStorage->viewport()->mapToGlobal(position));
+}
+
+void UIMachineSettingsStorage::sltHandleDrawItemBranches(QPainter *pPainter, const QRect &rect, const QModelIndex &index)
+{
+    if (!index.parent().isValid() || !index.parent().parent().isValid())
         return;
 
-    aPainter->save();
+    pPainter->save();
     QStyleOption options;
-    options.initFrom (mTwStorageTree);
-    options.rect = aRect;
+    options.initFrom(m_pTreeStorage);
+    options.rect = rect;
     options.state |= QStyle::State_Item;
-    if (aIndex.row() < mStorageModel->rowCount (aIndex.parent()) - 1)
+    if (index.row() < m_pModelStorage->rowCount(index.parent()) - 1)
         options.state |= QStyle::State_Sibling;
     /* This pen is commonly used by different
      * look and feel styles to paint tree-view branches. */
-    QPen pen (QBrush (options.palette.dark().color(), Qt::Dense4Pattern), 0);
-    aPainter->setPen (pen);
+    const QPen pen(QBrush(options.palette.dark().color(), Qt::Dense4Pattern), 0);
+    pPainter->setPen(pen);
     /* If we want tree-view branches to be always painted we have to use QCommonStyle::drawPrimitive()
      * because QCommonStyle performs branch painting as opposed to particular inherited sub-classing styles. */
-    qobject_cast <QCommonStyle*> (style())->QCommonStyle::drawPrimitive (QStyle::PE_IndicatorBranch, &options, aPainter);
-    aPainter->restore();
-}
-
-void UIMachineSettingsStorage::onMouseMoved (QMouseEvent *aEvent)
-{
-    QModelIndex index = mTwStorageTree->indexAt (aEvent->pos());
-    QRect indexRect = mTwStorageTree->visualRect (index);
+    qobject_cast<QCommonStyle*>(style())->QCommonStyle::drawPrimitive(QStyle::PE_IndicatorBranch, &options, pPainter);
+    pPainter->restore();
+}
+
+void UIMachineSettingsStorage::sltHandleMouseMove(QMouseEvent *pEvent)
+{
+    const QModelIndex index = m_pTreeStorage->indexAt(pEvent->pos());
+    const QRect indexRect = m_pTreeStorage->visualRect(index);
 
     /* Expander tool-tip */
-    if (mStorageModel->data (index, StorageModel::R_IsController).toBool())
-    {
-        QRect expanderRect = mStorageModel->data (index, StorageModel::R_ItemPixmapRect).toRect();
-        expanderRect.translate (indexRect.x(), indexRect.y());
-        if (expanderRect.contains (aEvent->pos()))
-        {
-            aEvent->setAccepted (true);
-            if (mStorageModel->data (index, StorageModel::R_ToolTipType).value <StorageModel::ToolTipType>() != StorageModel::ExpanderToolTip)
-                mStorageModel->setData (index, QVariant::fromValue (StorageModel::ExpanderToolTip), StorageModel::R_ToolTipType);
+    if (m_pModelStorage->data(index, StorageModel::R_IsController).toBool())
+    {
+        QRect expanderRect = m_pModelStorage->data(index, StorageModel::R_ItemPixmapRect).toRect();
+        expanderRect.translate(indexRect.x(), indexRect.y());
+        if (expanderRect.contains(pEvent->pos()))
+        {
+            pEvent->setAccepted(true);
+            if (m_pModelStorage->data(index, StorageModel::R_ToolTipType).value<StorageModel::ToolTipType>() != StorageModel::ExpanderToolTip)
+                m_pModelStorage->setData(index, QVariant::fromValue(StorageModel::ExpanderToolTip), StorageModel::R_ToolTipType);
             return;
         }
@@ -3429 +3430 @@
 
     /* Adder tool-tip */
-    if (mStorageModel->data (index, StorageModel::R_IsController).toBool() &&
-        mTwStorageTree->currentIndex() == index)
-    {
-        DeviceTypeList devicesList (mStorageModel->data (index, StorageModel::R_CtrDevices).value <DeviceTypeList>());
+    if (m_pModelStorage->data(index, StorageModel::R_IsController).toBool() &&
+        m_pTreeStorage->currentIndex() == index)
+    {
+        const DeviceTypeList devicesList(m_pModelStorage->data(index, StorageModel::R_CtrDevices).value<DeviceTypeList>());
         for (int i = 0; i < devicesList.size(); ++ i)
         {
-            KDeviceType deviceType = devicesList [i];
+            const KDeviceType enmDeviceType = devicesList[i];
 
             QRect deviceRect;
-            switch (deviceType)
+            switch (enmDeviceType)
             {
                 case KDeviceType_HardDisk:
                 {
-                    deviceRect = mStorageModel->data (index, StorageModel::R_HDPixmapRect).toRect();
+                    deviceRect = m_pModelStorage->data(index, StorageModel::R_HDPixmapRect).toRect();
                     break;
                 }
                 case KDeviceType_DVD:
                 {
-                    deviceRect = mStorageModel->data (index, StorageModel::R_CDPixmapRect).toRect();
+                    deviceRect = m_pModelStorage->data (index, StorageModel::R_CDPixmapRect).toRect();
                     break;
                 }
                 case KDeviceType_Floppy:
                 {
-                    deviceRect = mStorageModel->data (index, StorageModel::R_FDPixmapRect).toRect();
+                    deviceRect = m_pModelStorage->data (index, StorageModel::R_FDPixmapRect).toRect();
                     break;
                 }
@@ -3458 +3459 @@
                     break;
             }
-            deviceRect.translate (indexRect.x() + indexRect.width(), indexRect.y());
-
-            if (deviceRect.contains (aEvent->pos()))
+            deviceRect.translate(indexRect.x() + indexRect.width(), indexRect.y());
+
+            if (deviceRect.contains(pEvent->pos()))
             {
-                aEvent->setAccepted (true);
-                switch (deviceType)
+                pEvent->setAccepted(true);
+                switch (enmDeviceType)
                 {
                     case KDeviceType_HardDisk:
                     {
-                        if (mStorageModel->data (index, StorageModel::R_ToolTipType).value <StorageModel::ToolTipType>() != StorageModel::HDAdderToolTip)
-                            mStorageModel->setData (index, QVariant::fromValue (StorageModel::HDAdderToolTip), StorageModel::R_ToolTipType);
+                        if (m_pModelStorage->data(index, StorageModel::R_ToolTipType).value<StorageModel::ToolTipType>() != StorageModel::HDAdderToolTip)
+                            m_pModelStorage->setData(index, QVariant::fromValue(StorageModel::HDAdderToolTip), StorageModel::R_ToolTipType);
                         break;
                     }
                     case KDeviceType_DVD:
                     {
-                        if (mStorageModel->data (index, StorageModel::R_ToolTipType).value <StorageModel::ToolTipType>() != StorageModel::CDAdderToolTip)
-                            mStorageModel->setData (index, QVariant::fromValue (StorageModel::CDAdderToolTip), StorageModel::R_ToolTipType);
+                        if (m_pModelStorage->data(index, StorageModel::R_ToolTipType).value<StorageModel::ToolTipType>() != StorageModel::CDAdderToolTip)
+                            m_pModelStorage->setData(index, QVariant::fromValue(StorageModel::CDAdderToolTip), StorageModel::R_ToolTipType);
                         break;
                     }
                     case KDeviceType_Floppy:
                     {
-                        if (mStorageModel->data (index, StorageModel::R_ToolTipType).value <StorageModel::ToolTipType>() != StorageModel::FDAdderToolTip)
-                            mStorageModel->setData (index, QVariant::fromValue (StorageModel::FDAdderToolTip), StorageModel::R_ToolTipType);
+                        if (m_pModelStorage->data(index, StorageModel::R_ToolTipType).value<StorageModel::ToolTipType>() != StorageModel::FDAdderToolTip)
+                            m_pModelStorage->setData(index, QVariant::fromValue(StorageModel::FDAdderToolTip), StorageModel::R_ToolTipType);
                         break;
                     }
@@ -3492 +3493 @@
 
     /* Default tool-tip */
-    if (mStorageModel->data (index, StorageModel::R_ToolTipType).value <StorageModel::ToolTipType>() != StorageModel::DefaultToolTip)
-        mStorageModel->setData (index, StorageModel::DefaultToolTip, StorageModel::R_ToolTipType);
-}
-
-void UIMachineSettingsStorage::onMouseClicked (QMouseEvent *aEvent)
-{
-    QModelIndex index = mTwStorageTree->indexAt (aEvent->pos());
-    QRect indexRect = mTwStorageTree->visualRect (index);
+    if (m_pModelStorage->data(index, StorageModel::R_ToolTipType).value<StorageModel::ToolTipType>() != StorageModel::DefaultToolTip)
+        m_pModelStorage->setData(index, StorageModel::DefaultToolTip, StorageModel::R_ToolTipType);
+}
+
+void UIMachineSettingsStorage::sltHandleMouseClick(QMouseEvent *pEvent)
+{
+    const QModelIndex index = m_pTreeStorage->indexAt(pEvent->pos());
+    const QRect indexRect = m_pTreeStorage->visualRect(index);
 
     /* Expander icon */
-    if (mStorageModel->data (index, StorageModel::R_IsController).toBool())
-    {
-        QRect expanderRect = mStorageModel->data (index, StorageModel::R_ItemPixmapRect).toRect();
-        expanderRect.translate (indexRect.x(), indexRect.y());
-        if (expanderRect.contains (aEvent->pos()))
-        {
-            aEvent->setAccepted (true);
-            mTwStorageTree->setExpanded (index, !mTwStorageTree->isExpanded (index));
+    if (m_pModelStorage->data(index, StorageModel::R_IsController).toBool())
+    {
+        QRect expanderRect = m_pModelStorage->data(index, StorageModel::R_ItemPixmapRect).toRect();
+        expanderRect.translate(indexRect.x(), indexRect.y());
+        if (expanderRect.contains(pEvent->pos()))
+        {
+            pEvent->setAccepted(true);
+            m_pTreeStorage->setExpanded(index, !m_pTreeStorage->isExpanded(index));
             return;
         }
@@ -3515 +3516 @@
 
     /* Adder icons */
-    if (mStorageModel->data (index, StorageModel::R_IsController).toBool() &&
-        mTwStorageTree->currentIndex() == index)
-    {
-        DeviceTypeList devicesList (mStorageModel->data (index, StorageModel::R_CtrDevices).value <DeviceTypeList>());
+    if (m_pModelStorage->data(index, StorageModel::R_IsController).toBool() &&
+        m_pTreeStorage->currentIndex() == index)
+    {
+        const DeviceTypeList devicesList(m_pModelStorage->data(index, StorageModel::R_CtrDevices).value <DeviceTypeList>());
         for (int i = 0; i < devicesList.size(); ++ i)
         {
-            KDeviceType deviceType = devicesList [i];
+            const KDeviceType enmDeviceType = devicesList[i];
 
             QRect deviceRect;
-            switch (deviceType)
+            switch (enmDeviceType)
             {
                 case KDeviceType_HardDisk:
                 {
-                    deviceRect = mStorageModel->data (index, StorageModel::R_HDPixmapRect).toRect();
+                    deviceRect = m_pModelStorage->data(index, StorageModel::R_HDPixmapRect).toRect();
                     break;
                 }
                 case KDeviceType_DVD:
                 {
-                    deviceRect = mStorageModel->data (index, StorageModel::R_CDPixmapRect).toRect();
+                    deviceRect = m_pModelStorage->data (index, StorageModel::R_CDPixmapRect).toRect();
                     break;
                 }
                 case KDeviceType_Floppy:
                 {
-                    deviceRect = mStorageModel->data (index, StorageModel::R_FDPixmapRect).toRect();
+                    deviceRect = m_pModelStorage->data (index, StorageModel::R_FDPixmapRect).toRect();
                     break;
                 }
@@ -3544 +3545 @@
                     break;
             }
-            deviceRect.translate (indexRect.x() + indexRect.width(), indexRect.y());
-
-            if (deviceRect.contains (aEvent->pos()))
+            deviceRect.translate(indexRect.x() + indexRect.width(), indexRect.y());
+
+            if (deviceRect.contains(pEvent->pos()))
             {
-                aEvent->setAccepted (true);
-                if (mAddAttAction->isEnabled())
-                    addAttachmentWrapper (deviceType);
+                pEvent->setAccepted(true);
+                if (m_pActionAddAttachment->isEnabled())
+                    addAttachmentWrapper(enmDeviceType);
                 return;
             }
@@ -3557 +3558 @@
 }
 
-void UIMachineSettingsStorage::addControllerWrapper (const QString &aName, KStorageBus aBus, KStorageControllerType aType)
+void UIMachineSettingsStorage::addControllerWrapper(const QString &strName, KStorageBus enmBus, KStorageControllerType enmType)
 {
 #ifdef RT_STRICT
-    QModelIndex index = mTwStorageTree->currentIndex();
-    switch (aBus)
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+    switch (enmBus)
     {
         case KStorageBus_IDE:
-            Assert (mStorageModel->data (index, StorageModel::R_IsMoreIDEControllersPossible).toBool());
+            Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreIDEControllersPossible).toBool());
             break;
         case KStorageBus_SATA:
-            Assert (mStorageModel->data (index, StorageModel::R_IsMoreSATAControllersPossible).toBool());
+            Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreSATAControllersPossible).toBool());
             break;
         case KStorageBus_SCSI:
-            Assert (mStorageModel->data (index, StorageModel::R_IsMoreSCSIControllersPossible).toBool());
+            Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreSCSIControllersPossible).toBool());
             break;
         case KStorageBus_SAS:
-            Assert (mStorageModel->data (index, StorageModel::R_IsMoreSASControllersPossible).toBool());
+            Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreSASControllersPossible).toBool());
             break;
         case KStorageBus_Floppy:
-            Assert (mStorageModel->data (index, StorageModel::R_IsMoreFloppyControllersPossible).toBool());
+            Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreFloppyControllersPossible).toBool());
             break;
         case KStorageBus_USB:
-            Assert (mStorageModel->data (index, StorageModel::R_IsMoreUSBControllersPossible).toBool());
+            Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreUSBControllersPossible).toBool());
             break;
         case KStorageBus_PCIe:
-            Assert (mStorageModel->data (index, StorageModel::R_IsMoreNVMeControllersPossible).toBool());
+            Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreNVMeControllersPossible).toBool());
             break;
         default:
@@ -3589 +3590 @@
 #endif
 
-    mStorageModel->addController (aName, aBus, aType);
-    emit storageChanged();
-}
-
-void UIMachineSettingsStorage::addAttachmentWrapper(KDeviceType deviceType)
-{
-    QModelIndex index = mTwStorageTree->currentIndex();
-    Assert(mStorageModel->data(index, StorageModel::R_IsController).toBool());
-    Assert(mStorageModel->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
-    QString strControllerName(mStorageModel->data(index, StorageModel::R_CtrName).toString());
-    QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
+    m_pModelStorage->addController(strName, enmBus, enmType);
+    emit sigStorageChanged();
+}
+
+void UIMachineSettingsStorage::addAttachmentWrapper(KDeviceType enmDevice)
+{
+    const QModelIndex index = m_pTreeStorage->currentIndex();
+    Assert(m_pModelStorage->data(index, StorageModel::R_IsController).toBool());
+    Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
+    const QString strControllerName(m_pModelStorage->data(index, StorageModel::R_CtrName).toString());
+    const QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
 
     QString strMediumId;
-    switch (deviceType)
+    switch (enmDevice)
     {
         case KDeviceType_HardDisk:
         {
-            int iAnswer = msgCenter().confirmHardDiskAttachmentCreation(strControllerName, this);
+            const int iAnswer = msgCenter().confirmHardDiskAttachmentCreation(strControllerName, this);
             if (iAnswer == AlertButton_Choice1)
                 strMediumId = getWithNewHDWizard();
@@ -3636 +3637 @@
     if (!strMediumId.isEmpty())
     {
-        mStorageModel->addAttachment(QUuid(mStorageModel->data(index, StorageModel::R_ItemId).toString()), deviceType, strMediumId);
-        mStorageModel->sort();
-        emit storageChanged();
+        m_pModelStorage->addAttachment(QUuid(m_pModelStorage->data(index, StorageModel::R_ItemId).toString()), enmDevice, strMediumId);
+        m_pModelStorage->sort();
+        emit sigStorageChanged();
 
         /* Revalidate: */
@@ -3648 +3649 @@
 {
     /* Initialize variables: */
-    CGuestOSType guestOSType = vboxGlobal().virtualBox().GetGuestOSType(m_strMachineGuestOSTypeId);
-    QFileInfo fileInfo(m_strMachineSettingsFilePath);
+    const CGuestOSType comGuestOSType = vboxGlobal().virtualBox().GetGuestOSType(m_strMachineGuestOSTypeId);
+    const QFileInfo fileInfo(m_strMachineSettingsFilePath);
     /* Show New VD wizard: */
-    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(this, QString(), fileInfo.absolutePath(), guestOSType.GetRecommendedHDD());
+    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(this, QString(), fileInfo.absolutePath(), comGuestOSType.GetRecommendedHDD());
     pWizard->prepare();
-    QString strResult = pWizard->exec() == QDialog::Accepted ? pWizard->virtualDisk().GetId() : QString();
+    const QString strResult = pWizard->exec() == QDialog::Accepted ? pWizard->virtualDisk().GetId() : QString();
     if (pWizard)
         delete pWizard;
@@ -3659 +3660 @@
 }
 
-void UIMachineSettingsStorage::updateAdditionalObjects (KDeviceType aType)
-{
-    mLbHDFormat->setVisible (aType == KDeviceType_HardDisk);
-    mLbHDFormatValue->setVisible (aType == KDeviceType_HardDisk);
-
-    mLbCDFDType->setVisible (aType != KDeviceType_HardDisk);
-    mLbCDFDTypeValue->setVisible (aType != KDeviceType_HardDisk);
-
-    mLbHDVirtualSize->setVisible (aType == KDeviceType_HardDisk);
-    mLbHDVirtualSizeValue->setVisible (aType == KDeviceType_HardDisk);
-
-    mLbHDActualSize->setVisible (aType == KDeviceType_HardDisk);
-    mLbHDActualSizeValue->setVisible (aType == KDeviceType_HardDisk);
-
-    mLbSize->setVisible (aType != KDeviceType_HardDisk);
-    mLbSizeValue->setVisible (aType != KDeviceType_HardDisk);
-
-    mLbHDDetails->setVisible (aType == KDeviceType_HardDisk);
-    mLbHDDetailsValue->setVisible (aType == KDeviceType_HardDisk);
-
-    m_pLabelEncryption->setVisible(aType == KDeviceType_HardDisk);
-    m_pLabelEncryptionValue->setVisible(aType == KDeviceType_HardDisk);
-}
-
-QString UIMachineSettingsStorage::generateUniqueName (const QString &aTemplate) const
-{
-    int maxNumber = 0;
-    QModelIndex rootIndex = mStorageModel->root();
-    for (int i = 0; i < mStorageModel->rowCount (rootIndex); ++ i)
-    {
-        QModelIndex ctrIndex = rootIndex.child (i, 0);
-        QString ctrName = mStorageModel->data (ctrIndex, StorageModel::R_CtrName).toString();
-        if (ctrName.startsWith (aTemplate))
-        {
-            QString stringNumber (ctrName.right (ctrName.size() - aTemplate.size()));
-            bool isConverted = false;
-            int number = stringNumber.toInt (&isConverted);
-            maxNumber = isConverted && (number > maxNumber) ? number : 1;
-        }
-    }
-    return maxNumber ? QString ("%1 %2").arg (aTemplate).arg (++ maxNumber) : aTemplate;
-}
-
-uint32_t UIMachineSettingsStorage::deviceCount (KDeviceType aType) const
+void UIMachineSettingsStorage::updateAdditionalDetails(KDeviceType enmType)
+{
+    mLbHDFormat->setVisible(enmType == KDeviceType_HardDisk);
+    mLbHDFormatValue->setVisible(enmType == KDeviceType_HardDisk);
+
+    mLbCDFDType->setVisible(enmType != KDeviceType_HardDisk);
+    mLbCDFDTypeValue->setVisible(enmType != KDeviceType_HardDisk);
+
+    mLbHDVirtualSize->setVisible(enmType == KDeviceType_HardDisk);
+    mLbHDVirtualSizeValue->setVisible(enmType == KDeviceType_HardDisk);
+
+    mLbHDActualSize->setVisible(enmType == KDeviceType_HardDisk);
+    mLbHDActualSizeValue->setVisible(enmType == KDeviceType_HardDisk);
+
+    mLbSize->setVisible(enmType != KDeviceType_HardDisk);
+    mLbSizeValue->setVisible(enmType != KDeviceType_HardDisk);
+
+    mLbHDDetails->setVisible(enmType == KDeviceType_HardDisk);
+    mLbHDDetailsValue->setVisible(enmType == KDeviceType_HardDisk);
+
+    m_pLabelEncryption->setVisible(enmType == KDeviceType_HardDisk);
+    m_pLabelEncryptionValue->setVisible(enmType == KDeviceType_HardDisk);
+}
+
+QString UIMachineSettingsStorage::generateUniqueControllerName(const QString &strTemplate) const
+{
+    int iMaxNumber = 0;
+    const QModelIndex rootIndex = m_pModelStorage->root();
+    for (int i = 0; i < m_pModelStorage->rowCount(rootIndex); ++i)
+    {
+        const QModelIndex ctrIndex = rootIndex.child(i, 0);
+        const QString ctrName = m_pModelStorage->data(ctrIndex, StorageModel::R_CtrName).toString();
+        if (ctrName.startsWith(strTemplate))
+        {
+            const QString stringNumber(ctrName.right(ctrName.size() - strTemplate.size()));
+            bool fConverted = false;
+            const int iNumber = stringNumber.toInt(&fConverted);
+            iMaxNumber = fConverted && (iNumber > iMaxNumber) ? iNumber : 1;
+        }
+    }
+    return iMaxNumber ? QString("%1 %2").arg(strTemplate).arg(++iMaxNumber) : strTemplate;
+}
+
+uint32_t UIMachineSettingsStorage::deviceCount(KDeviceType enmType) const
 {
     uint32_t cDevices = 0;
-    QModelIndex rootIndex = mStorageModel->root();
-    for (int i = 0; i < mStorageModel->rowCount (rootIndex); ++ i)
-    {
-        QModelIndex ctrIndex = rootIndex.child (i, 0);
-        for (int j = 0; j < mStorageModel->rowCount (ctrIndex); ++ j)
-        {
-            QModelIndex attIndex = ctrIndex.child (j, 0);
-            KDeviceType attDevice = mStorageModel->data (attIndex, StorageModel::R_AttDevice).value <KDeviceType>();
-            if (attDevice == aType)
+    const QModelIndex rootIndex = m_pModelStorage->root();
+    for (int i = 0; i < m_pModelStorage->rowCount(rootIndex); ++i)
+    {
+        const QModelIndex ctrIndex = rootIndex.child(i, 0);
+        for (int j = 0; j < m_pModelStorage->rowCount(ctrIndex); ++j)
+        {
+            const QModelIndex attIndex = ctrIndex.child(j, 0);
+            const KDeviceType enmAttDevice = m_pModelStorage->data(attIndex, StorageModel::R_AttDevice).value<KDeviceType>();
+            if (enmAttDevice == enmType)
                 ++cDevices;
         }
@@ -3730 +3731 @@
 void UIMachineSettingsStorage::addChooseHostDriveActions(QMenu *pOpenMediumMenu)
 {
-    foreach (const QString &strMediumID, vboxGlobal().mediumIDs())
-    {
-        const UIMedium medium = vboxGlobal().medium(strMediumID);
+    foreach (const QString &strMediumId, vboxGlobal().mediumIDs())
+    {
+        const UIMedium medium = vboxGlobal().medium(strMediumId);
         if (medium.isHostDrive() && m_pMediumIdHolder->type() == medium.type())
         {
@@ -3742 +3743 @@
 }
 
-void UIMachineSettingsStorage::addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumType recentMediumType)
+void UIMachineSettingsStorage::addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumType enmRecentMediumType)
 {
     /* Get recent-medium list: */
     QStringList recentMediumList;
-    switch (recentMediumType)
+    switch (enmRecentMediumType)
     {
         case UIMediumType_HardDisk: recentMediumList = gEDataManager->recentListOfHardDrives(); break;
@@ -3754 +3755 @@
     }
     /* For every list-item: */
-    for (int index = 0; index < recentMediumList.size(); ++index)
+    for (int iIndex = 0; iIndex < recentMediumList.size(); ++iIndex)
     {
         /* Prepare corresponding action: */
-        QString strRecentMediumLocation = recentMediumList[index];
+        const QString &strRecentMediumLocation = recentMediumList.at(iIndex);
         if (QFile::exists(strRecentMediumLocation))
         {
             QAction *pChooseRecentMediumAction = pOpenMediumMenu->addAction(QFileInfo(strRecentMediumLocation).fileName(),
                                                                             this, SLOT(sltChooseRecentMedium()));
-            pChooseRecentMediumAction->setData(QString("%1,%2").arg(recentMediumType).arg(strRecentMediumLocation));
+            pChooseRecentMediumAction->setData(QString("%1,%2").arg(enmRecentMediumType).arg(strRecentMediumLocation));
         }
     }
@@ -3836 +3837 @@
 
         /* Get storage controller name: */
-        QString strControllerName = controllerData.m_strControllerName;
+        const QString strControllerName = controllerData.m_strControllerName;
 
         /* Check that storage controller exists: */
@@ -3865 +3866 @@
 
         /* Get storage controller attributes: */
-        QString strControllerName = controllerData.m_strControllerName;
-        KStorageBus controllerBus = controllerData.m_controllerBus;
-        KStorageControllerType controllerType = controllerData.m_controllerType;
-        bool fUseHostIOCache = controllerData.m_fUseHostIOCache;
+        const QString strControllerName = controllerData.m_strControllerName;
+        const KStorageBus enmControllerBus = controllerData.m_controllerBus;
+        const KStorageControllerType enmControllerType = controllerData.m_controllerType;
+        const bool fUseHostIOCache = controllerData.m_fUseHostIOCache;
         ULONG uPortCount = controllerData.m_uPortCount;
 
@@ -3879 +3880 @@
         {
             /* Create new storage controller: */
-            controller = m_machine.AddStorageController(strControllerName, controllerBus);
+            controller = m_machine.AddStorageController(strControllerName, enmControllerBus);
             /* Check that machine is OK: */
             fSuccess = m_machine.isOk();
@@ -3886 +3887 @@
             {
                 /* Set storage controller attributes: */
-                controller.SetControllerType(controllerType);
+                controller.SetControllerType(enmControllerType);
                 controller.SetUseHostIOCache(fUseHostIOCache);
-                if (controllerBus == KStorageBus_SATA || controllerBus == KStorageBus_SAS || controllerBus == KStorageBus_PCIe)
+                if (enmControllerBus == KStorageBus_SATA || enmControllerBus == KStorageBus_SAS || enmControllerBus == KStorageBus_PCIe)
                 {
                     uPortCount = qMax(uPortCount, controller.GetMinPortCount());
@@ -3921 +3922 @@
 
         /* Get storage controller attributes: */
-        QString strControllerName = controllerData.m_strControllerName;
-        KStorageBus controllerBus = controllerData.m_controllerBus;
-        KStorageControllerType controllerType = controllerData.m_controllerType;
-        bool fUseHostIOCache = controllerData.m_fUseHostIOCache;
+        const QString strControllerName = controllerData.m_strControllerName;
+        const KStorageBus enmControllerBus = controllerData.m_controllerBus;
+        const KStorageControllerType enmControllerType = controllerData.m_controllerType;
+        const bool fUseHostIOCache = controllerData.m_fUseHostIOCache;
         ULONG uPortCount = controllerData.m_uPortCount;
 
@@ -3935 +3936 @@
         {
             /* Set storage controller attributes: */
-            controller.SetControllerType(controllerType);
+            controller.SetControllerType(enmControllerType);
             controller.SetUseHostIOCache(fUseHostIOCache);
-            if (controllerBus == KStorageBus_SATA || controllerBus == KStorageBus_SAS)
+            if (enmControllerBus == KStorageBus_SATA || enmControllerBus == KStorageBus_SAS)
             {
                 uPortCount = qMax(uPortCount, controller.GetMinPortCount());
@@ -3978 +3979 @@
 
         /* Get storage controller attributes: */
-        QString strControllerName = controllerData.m_strControllerName;
+        const QString strControllerName = controllerData.m_strControllerName;
         /* Get storage attachment attributes: */
-        int iAttachmentPort = attachmentData.m_iAttachmentPort;
-        int iAttachmentDevice = attachmentData.m_iAttachmentDevice;
+        const int iAttachmentPort = attachmentData.m_iAttachmentPort;
+        const int iAttachmentDevice = attachmentData.m_iAttachmentDevice;
 
         /* Check that storage attachment exists: */
@@ -4013 +4014 @@
 
         /* Get storage controller attributes: */
-        QString strControllerName = controllerData.m_strControllerName;
-        KStorageBus controllerBus = controllerData.m_controllerBus;
+        const QString strControllerName = controllerData.m_strControllerName;
+        const KStorageBus enmControllerBus = controllerData.m_controllerBus;
         /* Get storage attachment attributes: */
-        int iAttachmentPort = attachmentData.m_iAttachmentPort;
-        int iAttachmentDevice = attachmentData.m_iAttachmentDevice;
-        KDeviceType attachmentDeviceType = attachmentData.m_attachmentType;
-        QString strAttachmentMediumId = attachmentData.m_strAttachmentMediumId;
-        bool fAttachmentPassthrough = attachmentData.m_fAttachmentPassthrough;
-        bool fAttachmentTempEject = attachmentData.m_fAttachmentTempEject;
-        bool fAttachmentNonRotational = attachmentData.m_fAttachmentNonRotational;
-        bool fAttachmentHotPluggable = attachmentData.m_fAttachmentHotPluggable;
+        const int iAttachmentPort = attachmentData.m_iAttachmentPort;
+        const int iAttachmentDevice = attachmentData.m_iAttachmentDevice;
+        const KDeviceType enmAttachmentDeviceType = attachmentData.m_attachmentType;
+        const QString strAttachmentMediumId = attachmentData.m_strAttachmentMediumId;
+        const bool fAttachmentPassthrough = attachmentData.m_fAttachmentPassthrough;
+        const bool fAttachmentTempEject = attachmentData.m_fAttachmentTempEject;
+        const bool fAttachmentNonRotational = attachmentData.m_fAttachmentNonRotational;
+        const bool fAttachmentHotPluggable = attachmentData.m_fAttachmentHotPluggable;
         /* Get GUI medium object: */
-        UIMedium vboxMedium = vboxGlobal().medium(strAttachmentMediumId);
+        const UIMedium vboxMedium = vboxGlobal().medium(strAttachmentMediumId);
         /* Get COM medium object: */
-        CMedium comMedium = vboxMedium.medium();
+        const CMedium comMedium = vboxMedium.medium();
 
         /* Check that storage attachment doesn't exists: */
@@ -4037 +4038 @@
         {
             /* Create storage attachment: */
-            m_machine.AttachDevice(strControllerName, iAttachmentPort, iAttachmentDevice, attachmentDeviceType, comMedium);
+            m_machine.AttachDevice(strControllerName, iAttachmentPort, iAttachmentDevice, enmAttachmentDeviceType, comMedium);
             /* Check that machine is OK: */
             fSuccess = m_machine.isOk();
             if (fSuccess)
             {
-                if (attachmentDeviceType == KDeviceType_DVD)
+                if (enmAttachmentDeviceType == KDeviceType_DVD)
                 {
                     if (fSuccess && isMachineOffline())
@@ -4057 +4058 @@
                     }
                 }
-                else if (attachmentDeviceType == KDeviceType_HardDisk)
+                else if (enmAttachmentDeviceType == KDeviceType_HardDisk)
                 {
                     if (fSuccess && isMachineOffline())
@@ -4066 +4067 @@
                     }
                 }
-                if ((controllerBus == KStorageBus_SATA) || (controllerBus == KStorageBus_USB))
+                if ((enmControllerBus == KStorageBus_SATA) || (enmControllerBus == KStorageBus_USB))
                 {
                     if (fSuccess && isMachineOffline())
@@ -4079 +4080 @@
             {
                 /* Show error message: */
-                msgCenter().cannotAttachDevice(m_machine, mediumTypeToLocal(attachmentDeviceType),
+                msgCenter().cannotAttachDevice(m_machine, mediumTypeToLocal(enmAttachmentDeviceType),
                                                vboxMedium.location(),
-                                               StorageSlot(controllerBus, iAttachmentPort, iAttachmentDevice), this);
+                                               StorageSlot(enmControllerBus, iAttachmentPort, iAttachmentDevice), this);
             }
         }
@@ -4102 +4103 @@
 
         /* Get storage controller attributes: */
-        QString strControllerName = controllerData.m_strControllerName;
-        KStorageBus controllerBus = controllerData.m_controllerBus;
+        const QString strControllerName = controllerData.m_strControllerName;
+        const KStorageBus enmControllerBus = controllerData.m_controllerBus;
         /* Get storage attachment attributes: */
-        int iAttachmentPort = attachmentData.m_iAttachmentPort;
-        int iAttachmentDevice = attachmentData.m_iAttachmentDevice;
-        QString strAttachmentMediumId = attachmentData.m_strAttachmentMediumId;
-        bool fAttachmentPassthrough = attachmentData.m_fAttachmentPassthrough;
-        bool fAttachmentTempEject = attachmentData.m_fAttachmentTempEject;
-        bool fAttachmentNonRotational = attachmentData.m_fAttachmentNonRotational;
-        bool fAttachmentHotPluggable = attachmentData.m_fAttachmentHotPluggable;
-        KDeviceType attachmentDeviceType = attachmentData.m_attachmentType;
+        const int iAttachmentPort = attachmentData.m_iAttachmentPort;
+        const int iAttachmentDevice = attachmentData.m_iAttachmentDevice;
+        const QString strAttachmentMediumId = attachmentData.m_strAttachmentMediumId;
+        const bool fAttachmentPassthrough = attachmentData.m_fAttachmentPassthrough;
+        const bool fAttachmentTempEject = attachmentData.m_fAttachmentTempEject;
+        const bool fAttachmentNonRotational = attachmentData.m_fAttachmentNonRotational;
+        const bool fAttachmentHotPluggable = attachmentData.m_fAttachmentHotPluggable;
+        const KDeviceType enmAttachmentDeviceType = attachmentData.m_attachmentType;
 
         /* Check that storage attachment exists: */
-        CMediumAttachment attachment = m_machine.GetMediumAttachment(strControllerName, iAttachmentPort, iAttachmentDevice);
+        const CMediumAttachment attachment = m_machine.GetMediumAttachment(strControllerName, iAttachmentPort, iAttachmentDevice);
         /* Check that machine is OK: */
         fSuccess = m_machine.isOk();
@@ -4122 +4123 @@
         {
             /* Get GUI medium object: */
-            UIMedium vboxMedium = vboxGlobal().medium(strAttachmentMediumId);
+            const UIMedium vboxMedium = vboxGlobal().medium(strAttachmentMediumId);
             /* Get COM medium object: */
-            CMedium comMedium = vboxMedium.medium();
+            const CMedium comMedium = vboxMedium.medium();
             /* Remount storage attachment: */
             m_machine.MountMedium(strControllerName, iAttachmentPort, iAttachmentDevice, comMedium, true /* force? */);
@@ -4131 +4132 @@
             if (fSuccess)
             {
-                if (attachmentDeviceType == KDeviceType_DVD)
+                if (enmAttachmentDeviceType == KDeviceType_DVD)
                 {
                     if (fSuccess && isMachineOffline())
@@ -4146 +4147 @@
                     }
                 }
-                else if (attachmentDeviceType == KDeviceType_HardDisk)
+                else if (enmAttachmentDeviceType == KDeviceType_HardDisk)
                 {
                     if (fSuccess && isMachineOffline())
@@ -4155 +4156 @@
                     }
                 }
-                if ((controllerBus == KStorageBus_SATA) || (controllerBus == KStorageBus_USB))
+                if ((enmControllerBus == KStorageBus_SATA) || (enmControllerBus == KStorageBus_USB))
                 {
                     if (fSuccess && isMachineOffline())
@@ -4168 +4169 @@
             {
                 /* Show error message: */
-                msgCenter().cannotAttachDevice(m_machine, mediumTypeToLocal(attachmentDeviceType),
+                msgCenter().cannotAttachDevice(m_machine, mediumTypeToLocal(enmAttachmentDeviceType),
                                                vboxMedium.location(),
-                                               StorageSlot(controllerBus, iAttachmentPort, iAttachmentDevice), this);
+                                               StorageSlot(enmControllerBus, iAttachmentPort, iAttachmentDevice), this);
             }
         }
@@ -4198 +4199 @@
     const UIDataSettingsMachineStorageAttachment &initialAttachmentData = attachmentCache.base();
     const UIDataSettingsMachineStorageAttachment &currentAttachmentData = attachmentCache.data();
-    KDeviceType initialAttachmentDeviceType = initialAttachmentData.m_attachmentType;
-    KDeviceType currentAttachmentDeviceType = currentAttachmentData.m_attachmentType;
-    LONG iInitialAttachmentDevice = initialAttachmentData.m_iAttachmentDevice;
-    LONG iCurrentAttachmentDevice = currentAttachmentData.m_iAttachmentDevice;
-    LONG iInitialAttachmentPort = initialAttachmentData.m_iAttachmentPort;
-    LONG iCurrentAttachmentPort = currentAttachmentData.m_iAttachmentPort;
-    return (currentAttachmentDeviceType == initialAttachmentDeviceType) &&
+    const KDeviceType enmInitialAttachmentDeviceType = initialAttachmentData.m_attachmentType;
+    const KDeviceType enmCurrentAttachmentDeviceType = currentAttachmentData.m_attachmentType;
+    const LONG iInitialAttachmentDevice = initialAttachmentData.m_iAttachmentDevice;
+    const LONG iCurrentAttachmentDevice = currentAttachmentData.m_iAttachmentDevice;
+    const LONG iInitialAttachmentPort = initialAttachmentData.m_iAttachmentPort;
+    const LONG iCurrentAttachmentPort = currentAttachmentData.m_iAttachmentPort;
+    return (enmCurrentAttachmentDeviceType == enmInitialAttachmentDeviceType) &&
            (iCurrentAttachmentDevice == iInitialAttachmentDevice) &&
            (iCurrentAttachmentPort == iInitialAttachmentPort) &&
-           (currentAttachmentDeviceType == KDeviceType_Floppy || currentAttachmentDeviceType == KDeviceType_DVD);
+           (enmCurrentAttachmentDeviceType == KDeviceType_Floppy || enmCurrentAttachmentDeviceType == KDeviceType_DVD);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -602 +602 @@
 signals:
 
-    void storageChanged();
+    void sigStorageChanged();
 
 public:
@@ -611 +611 @@
     ~UIMachineSettingsStorage();
 
-    void setChipsetType(KChipsetType type);
+    void setChipsetType(KChipsetType enmType);
 
 protected:
@@ -650 +650 @@
 
     /* Handlers: Medium-processing stuff: */
-    void sltHandleMediumEnumerated(const QString &strMediumID);
-    void sltHandleMediumDeleted(const QString &strMediumID);
-
-    void addController();
-    void addIDEController();
-    void addSATAController();
-    void addSCSIController();
-    void addFloppyController();
-    void addSASController();
-    void addUSBController();
-    void addNVMeController();
-    void delController();
-
-    void addAttachment();
-    void addHDAttachment();
-    void addCDAttachment();
-    void addFDAttachment();
-    void delAttachment();
-
-    void getInformation();
-    void setInformation();
+    void sltHandleMediumEnumerated(const QString &strMediumId);
+    void sltHandleMediumDeleted(const QString &strMediumId);
+
+    void sltAddController();
+    void sltAddControllerIDE();
+    void sltAddControllerSATA();
+    void sltAddControllerSCSI();
+    void sltAddControllerFloppy();
+    void sltAddControllerSAS();
+    void sltAddControllerUSB();
+    void sltAddControllerNVMe();
+    void sltRemoveController();
+
+    void sltAddAttachment();
+    void sltAddAttachmentHD();
+    void sltAddAttachmentCD();
+    void sltAddAttachmentFD();
+    void sltRemoveAttachment();
+
+    void sltGetInformation();
+    void sltSetInformation();
 
     void sltPrepareOpenMediumMenu();
@@ -679 +679 @@
     void sltChooseRecentMedium();
 
-    void updateActionsState();
-
-    void onRowInserted (const QModelIndex &aParent, int aIndex);
-    void onRowRemoved();
-
-    void onCurrentItemChanged();
-
-    void onContextMenuRequested (const QPoint &aPosition);
-
-    void onDrawItemBranches (QPainter *aPainter, const QRect &aRect, const QModelIndex &aIndex);
-
-    void onMouseMoved (QMouseEvent *aEvent);
-    void onMouseClicked (QMouseEvent *aEvent);
-
-private:
-
-    void addControllerWrapper (const QString &aName, KStorageBus aBus, KStorageControllerType aType);
-    void addAttachmentWrapper (KDeviceType aDevice);
+    void sltUpdateActionsState();
+
+    void sltHandleRowInsertion(const QModelIndex &parent, int iPosition);
+    void sltHandleRowRemoval();
+
+    void sltHandleCurrentItemChange();
+
+    void sltHandleContextMenuRequest(const QPoint &position);
+
+    void sltHandleDrawItemBranches(QPainter *pPainter, const QRect &rect, const QModelIndex &index);
+
+    void sltHandleMouseMove(QMouseEvent *pEvent);
+    void sltHandleMouseClick(QMouseEvent *pEvent);
+
+private:
+
+    void addControllerWrapper(const QString &strName, KStorageBus enmBus, KStorageControllerType enmType);
+    void addAttachmentWrapper(KDeviceType enmDevice);
 
     QString getWithNewHDWizard();
 
-    void updateAdditionalObjects (KDeviceType aType);
-
-    QString generateUniqueName (const QString &aTemplate) const;
-
-    uint32_t deviceCount (KDeviceType aType) const;
+    void updateAdditionalDetails(KDeviceType enmType);
+
+    QString generateUniqueControllerName(const QString &strTemplate) const;
+
+    uint32_t deviceCount(KDeviceType enmType) const;
 
     void addChooseExistingMediumAction(QMenu *pOpenMediumMenu, const QString &strActionName);
     void addChooseHostDriveActions(QMenu *pOpenMediumMenu);
-    void addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumType recentMediumType);
+    void addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumType enmRecentMediumType);
 
     bool updateStorageData();
@@ -723 +723 @@
     bool isAttachmentCouldBeUpdated(const UISettingsCacheMachineStorageAttachment &attachmentCache) const;
 
-    QString m_strMachineId;
-    QString m_strMachineSettingsFilePath;
-    QString m_strMachineGuestOSTypeId;
+    QString  m_strMachineId;
+    QString  m_strMachineSettingsFilePath;
+    QString  m_strMachineGuestOSTypeId;
 
     /** Holds the storage-tree instance. */
-    QITreeView *mTwStorageTree;
+    QITreeView   *m_pTreeStorage;
     /** Holds the storage-model instance. */
-    StorageModel *mStorageModel;
-
-    QAction *mAddCtrAction;
-    QAction *mDelCtrAction;
-    QAction *mAddIDECtrAction;
-    QAction *mAddSATACtrAction;
-    QAction *mAddSCSICtrAction;
-    QAction *mAddSASCtrAction;
-    QAction *mAddFloppyCtrAction;
-    QAction *mAddUSBCtrAction;
-    QAction *mAddNVMeCtrAction;
-    QAction *mAddAttAction;
-    QAction *mDelAttAction;
-    QAction *mAddHDAttAction;
-    QAction *mAddCDAttAction;
-    QAction *mAddFDAttAction;
+    StorageModel *m_pModelStorage;
+
+    QAction *m_pActionAddController;
+    QAction *m_pActionRemoveController;
+    QAction *m_pActionAddControllerIDE;
+    QAction *m_pActionAddControllerSATA;
+    QAction *m_pActionAddControllerSCSI;
+    QAction *m_pActionAddControllerSAS;
+    QAction *m_pActionAddControllerFloppy;
+    QAction *m_pActionAddControllerUSB;
+    QAction *m_pActionAddControllerNVMe;
+    QAction *m_pActionAddAttachment;
+    QAction *m_pActionRemoveAttachment;
+    QAction *m_pActionAddAttachmentHD;
+    QAction *m_pActionAddAttachmentCD;
+    QAction *m_pActionAddAttachmentFD;
 
     UIMediumIDHolder *m_pMediumIdHolder;
 
-    bool  mIsPolished;
-    bool  mIsLoadingInProgress;
+    bool  m_fPolished;
+    bool  m_fLoadingInProgress;
 
     /** Holds the page data cache instance. */

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

@@ -430 +430 @@
 
         /* RAM amount test: */
-        ulong uFullSize = vboxGlobal().host().GetMemorySize();
+        const ulong uFullSize = vboxGlobal().host().GetMemorySize();
         if (m_pSliderMemorySize->value() > (int)m_pSliderMemorySize->maxRAMAlw())
         {
@@ -479 +479 @@
 
         /* VCPU amount test: */
-        int cTotalCPUs = vboxGlobal().host().GetProcessorOnlineCoreCount();
+        const int cTotalCPUs = vboxGlobal().host().GetProcessorOnlineCoreCount();
         if (m_pSliderCPUCount->value() > 2 * cTotalCPUs)
         {
@@ -651 +651 @@
                     mTwBootOrder->setCurrentItem(mTwBootOrder->item(0));
                 else
-                    sltCurrentBootItemChanged(mTwBootOrder->currentRow());
+                    sltHandleCurrentBootItemChange(mTwBootOrder->currentRow());
                 mTwBootOrder->currentItem()->setSelected(true);
             }
@@ -694 +694 @@
 }
 
-void UIMachineSettingsSystem::sltCurrentBootItemChanged(int iCurrentItem)
+void UIMachineSettingsSystem::sltHandleCurrentBootItemChange(int iCurrentItem)
 {
     /* Update boot-order tool-buttons: */
-    bool fEnabledUP = iCurrentItem > 0;
-    bool fEnabledDOWN = iCurrentItem < mTwBootOrder->count() - 1;
+    const bool fEnabledUP = iCurrentItem > 0;
+    const bool fEnabledDOWN = iCurrentItem < mTwBootOrder->count() - 1;
     if ((mTbBootItemUp->hasFocus() && !fEnabledUP) ||
         (mTbBootItemDown->hasFocus() && !fEnabledDOWN))
@@ -767 +767 @@
 {
     /* Load configuration: */
-    CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
+    const CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
 
     /* Preconfigure memory-size editor: */
@@ -796 +796 @@
      * Until there will be separate Main getter for list of supported boot device types,
      * this list will be hard-coded here... */
-    int iPossibleBootListSize = qMin((ULONG)4, properties.GetMaxBootPosition());
+    const int iPossibleBootListSize = qMin((ULONG)4, properties.GetMaxBootPosition());
     for (int iBootPosition = 1; iBootPosition <= iPossibleBootListSize; ++iBootPosition)
     {
@@ -831 +831 @@
     connect(mTbBootItemUp, SIGNAL(clicked()), mTwBootOrder, SLOT(sltMoveItemUp()));
     connect(mTbBootItemDown, SIGNAL(clicked()), mTwBootOrder, SLOT(sltMoveItemDown()));
-    connect(mTwBootOrder, SIGNAL(sigRowChanged(int)), this, SLOT(sltCurrentBootItemChanged(int)));
+    connect(mTwBootOrder, SIGNAL(sigRowChanged(int)), this, SLOT(sltHandleCurrentBootItemChange(int)));
 
     /* Advanced options: */
@@ -840 +840 @@
 {
     /* Load configuration: */
-    CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
-    uint hostCPUs = vboxGlobal().host().GetProcessorOnlineCoreCount();
+    const CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
+    const uint hostCPUs = vboxGlobal().host().GetProcessorOnlineCoreCount();
     m_uMinGuestCPU = properties.GetMinGuestCPUCount();
     m_uMaxGuestCPU = qMin(2 * hostCPUs, (uint)properties.GetMaxGuestCPUCount());
@@ -907 +907 @@
 {
     /* Is there any value currently present/selected? */
-    KPointingHIDType currentValue = KPointingHIDType_None;
-    {
-        int iCurrentIndex = m_pComboPointingHIDType->currentIndex();
+    KPointingHIDType enmCurrentValue = KPointingHIDType_None;
+    {
+        const int iCurrentIndex = m_pComboPointingHIDType->currentIndex();
         if (iCurrentIndex != -1)
-            currentValue = (KPointingHIDType)m_pComboPointingHIDType->itemData(iCurrentIndex).toInt();
+            enmCurrentValue = (KPointingHIDType)m_pComboPointingHIDType->itemData(iCurrentIndex).toInt();
     }
 
@@ -918 +918 @@
 
     /* Repopulate combo taking into account currently cached value: */
-    KPointingHIDType cachedValue = m_pCache->base().m_pointingHIDType;
+    const KPointingHIDType enmCachedValue = m_pCache->base().m_pointingHIDType;
     {
         /* "PS/2 Mouse" value is always here: */
@@ -924 +924 @@
 
         /* "USB Mouse" value is here only if it is currently selected: */
-        if (cachedValue == KPointingHIDType_USBMouse)
+        if (enmCachedValue == KPointingHIDType_USBMouse)
             m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_USBMouse), (int)KPointingHIDType_USBMouse);
 
@@ -931 +931 @@
 
         /* "PS/2 and USB Mouse" value is here only if it is currently selected: */
-        if (cachedValue == KPointingHIDType_ComboMouse)
+        if (enmCachedValue == KPointingHIDType_ComboMouse)
             m_pComboPointingHIDType->addItem(gpConverter->toString(KPointingHIDType_ComboMouse), (int)KPointingHIDType_ComboMouse);
 
@@ -939 +939 @@
 
     /* Was there any value previously present/selected? */
-    if (currentValue != KPointingHIDType_None)
-    {
-        int iPreviousIndex = m_pComboPointingHIDType->findData((int)currentValue);
+    if (enmCurrentValue != KPointingHIDType_None)
+    {
+        int iPreviousIndex = m_pComboPointingHIDType->findData((int)enmCurrentValue);
         if (iPreviousIndex != -1)
             m_pComboPointingHIDType->setCurrentIndex(iPreviousIndex);
@@ -953 +953 @@
     {
         /* Cast to the corresponding type: */
-        KChipsetType type = (KChipsetType)iIndex;
+        const KChipsetType enmType = (KChipsetType)iIndex;
         /* Look for the corresponding item: */
-        int iCorrespondingIndex = m_pComboChipsetType->findData((int)type);
+        const int iCorrespondingIndex = m_pComboChipsetType->findData((int)enmType);
         /* Re-translate if corresponding item was found: */
         if (iCorrespondingIndex != -1)
-            m_pComboChipsetType->setItemText(iCorrespondingIndex, gpConverter->toString(type));
+            m_pComboChipsetType->setItemText(iCorrespondingIndex, gpConverter->toString(enmType));
     }
 }
@@ -968 +968 @@
     {
         /* Cast to the corresponding type: */
-        KPointingHIDType type = (KPointingHIDType)iIndex;
+        const KPointingHIDType enmType = (KPointingHIDType)iIndex;
         /* Look for the corresponding item: */
-        int iCorrespondingIndex = m_pComboPointingHIDType->findData((int)type);
+        const int iCorrespondingIndex = m_pComboPointingHIDType->findData((int)enmType);
         /* Re-translate if corresponding item was found: */
         if (iCorrespondingIndex != -1)
-            m_pComboPointingHIDType->setItemText(iCorrespondingIndex, gpConverter->toString(type));
+            m_pComboPointingHIDType->setItemText(iCorrespondingIndex, gpConverter->toString(enmType));
     }
 }
@@ -983 +983 @@
     {
         /* Cast to the corresponding type: */
-        KParavirtProvider type = (KParavirtProvider)iIndex;
+        const KParavirtProvider enmType = (KParavirtProvider)iIndex;
         /* Look for the corresponding item: */
-        int iCorrespondingIndex = m_pComboParavirtProvider->findData((int)type);
+        const int iCorrespondingIndex = m_pComboParavirtProvider->findData((int)enmType);
         /* Re-translate if corresponding item was found: */
         if (iCorrespondingIndex != -1)
-            m_pComboParavirtProvider->setItemText(iCorrespondingIndex, gpConverter->toString(type));
+            m_pComboParavirtProvider->setItemText(iCorrespondingIndex, gpConverter->toString(enmType));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -43 +43 @@
     /* API: Correlation stuff: */
     bool isHWVirtExEnabled() const;
+
     bool isHIDEnabled() const;
+
     KChipsetType chipsetType() const;
+
     void setUSBEnabled(bool fEnabled);
 
@@ -88 +91 @@
 
     /* Handler: Boot-table stuff: */
-    void sltCurrentBootItemChanged(int iCurrentIndex);
+    void sltHandleCurrentBootItemChange(int iCurrentIndex);
 
     /* Handlers: CPU stuff: */
@@ -116 +119 @@
 
     /* Variable: Boot-table stuff: */
-    QList<KDeviceType> m_possibleBootItems;
+    QList<KDeviceType>  m_possibleBootItems;
 
     /* Variables: CPU stuff: */
-    uint m_uMinGuestCPU;
-    uint m_uMaxGuestCPU;
-    uint m_uMinGuestCPUExecCap;
-    uint m_uMedGuestCPUExecCap;
-    uint m_uMaxGuestCPUExecCap;
+    uint  m_uMinGuestCPU;
+    uint  m_uMaxGuestCPU;
+    uint  m_uMinGuestCPUExecCap;
+    uint  m_uMedGuestCPUExecCap;
+    uint  m_uMaxGuestCPUExecCap;
 
     /* Variable: Correlation stuff: */

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

@@ -277 +277 @@
 UIMachineSettingsUSB::UIMachineSettingsUSB()
     : m_pToolBar(0)
-    , mNewAction(0), mAddAction(0), mEdtAction(0), mDelAction(0)
-    , mMupAction(0), mMdnAction(0)
-    , mUSBDevicesMenu(0)
+    , m_pActionNew(0), m_pActionAdd(0), m_pActionEdit(0), m_pActionRemove(0)
+    , m_pActionMoveUp(0), m_pActionMoveDown(0)
+    , m_pMenuUSBDevices(0)
     , m_pCache(new UISettingsCacheMachineUSB)
 {
     /* Apply UI decorations */
-    Ui::UIMachineSettingsUSB::setupUi (this);
+    Ui::UIMachineSettingsUSB::setupUi(this);
 
     /* Prepare actions */
-    mNewAction = new QAction (mTwFilters);
-    mAddAction = new QAction (mTwFilters);
-    mEdtAction = new QAction (mTwFilters);
-    mDelAction = new QAction (mTwFilters);
-    mMupAction = new QAction (mTwFilters);
-    mMdnAction = new QAction (mTwFilters);
-
-    mNewAction->setShortcut (QKeySequence ("Ins"));
-    mAddAction->setShortcut (QKeySequence ("Alt+Ins"));
-    mEdtAction->setShortcut (QKeySequence ("Ctrl+Return"));
-    mDelAction->setShortcut (QKeySequence ("Del"));
-    mMupAction->setShortcut (QKeySequence ("Ctrl+Up"));
-    mMdnAction->setShortcut (QKeySequence ("Ctrl+Down"));
-
-    mNewAction->setIcon(UIIconPool::iconSet(":/usb_new_16px.png",
+    m_pActionNew = new QAction(mTwFilters);
+    m_pActionAdd = new QAction(mTwFilters);
+    m_pActionEdit = new QAction(mTwFilters);
+    m_pActionRemove = new QAction(mTwFilters);
+    m_pActionMoveUp = new QAction(mTwFilters);
+    m_pActionMoveDown = new QAction(mTwFilters);
+
+    m_pActionNew->setShortcut (QKeySequence ("Ins"));
+    m_pActionAdd->setShortcut (QKeySequence ("Alt+Ins"));
+    m_pActionEdit->setShortcut (QKeySequence ("Ctrl+Return"));
+    m_pActionRemove->setShortcut (QKeySequence ("Del"));
+    m_pActionMoveUp->setShortcut (QKeySequence ("Ctrl+Up"));
+    m_pActionMoveDown->setShortcut (QKeySequence ("Ctrl+Down"));
+
+    m_pActionNew->setIcon(UIIconPool::iconSet(":/usb_new_16px.png",
                                             ":/usb_new_disabled_16px.png"));
-    mAddAction->setIcon(UIIconPool::iconSet(":/usb_add_16px.png",
+    m_pActionAdd->setIcon(UIIconPool::iconSet(":/usb_add_16px.png",
                                             ":/usb_add_disabled_16px.png"));
-    mEdtAction->setIcon(UIIconPool::iconSet(":/usb_filter_edit_16px.png",
+    m_pActionEdit->setIcon(UIIconPool::iconSet(":/usb_filter_edit_16px.png",
                                             ":/usb_filter_edit_disabled_16px.png"));
-    mDelAction->setIcon(UIIconPool::iconSet(":/usb_remove_16px.png",
+    m_pActionRemove->setIcon(UIIconPool::iconSet(":/usb_remove_16px.png",
                                             ":/usb_remove_disabled_16px.png"));
-    mMupAction->setIcon(UIIconPool::iconSet(":/usb_moveup_16px.png",
+    m_pActionMoveUp->setIcon(UIIconPool::iconSet(":/usb_moveup_16px.png",
                                             ":/usb_moveup_disabled_16px.png"));
-    mMdnAction->setIcon(UIIconPool::iconSet(":/usb_movedown_16px.png",
+    m_pActionMoveDown->setIcon(UIIconPool::iconSet(":/usb_movedown_16px.png",
                                             ":/usb_movedown_disabled_16px.png"));
 
@@ -320 +320 @@
     m_pFiltersToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
     m_pFiltersToolBar->setOrientation(Qt::Vertical);
-    m_pFiltersToolBar->addAction(mNewAction);
-    m_pFiltersToolBar->addAction(mAddAction);
-    m_pFiltersToolBar->addAction(mEdtAction);
-    m_pFiltersToolBar->addAction(mDelAction);
-    m_pFiltersToolBar->addAction(mMupAction);
-    m_pFiltersToolBar->addAction(mMdnAction);
+    m_pFiltersToolBar->addAction(m_pActionNew);
+    m_pFiltersToolBar->addAction(m_pActionAdd);
+    m_pFiltersToolBar->addAction(m_pActionEdit);
+    m_pFiltersToolBar->addAction(m_pActionRemove);
+    m_pFiltersToolBar->addAction(m_pActionMoveUp);
+    m_pFiltersToolBar->addAction(m_pActionMoveDown);
 
     /* Setup connections */
@@ -334 +334 @@
 
     connect (mGbUSB, SIGNAL (toggled (bool)),
-             this, SLOT (usbAdapterToggled (bool)));
+             this, SLOT (sltHandleUsbAdapterToggle (bool)));
     connect (mTwFilters, SIGNAL (currentItemChanged (QTreeWidgetItem*, QTreeWidgetItem*)),
-             this, SLOT (currentChanged (QTreeWidgetItem*)));
+             this, SLOT (sltHandleCurrentItemChange (QTreeWidgetItem*)));
     connect (mTwFilters, SIGNAL (customContextMenuRequested (const QPoint &)),
-             this, SLOT (showContextMenu (const QPoint &)));
+             this, SLOT (sltHandleContextMenuRequest (const QPoint &)));
     connect (mTwFilters, SIGNAL (itemDoubleClicked (QTreeWidgetItem *, int)),
-             this, SLOT (edtClicked()));
+             this, SLOT (sltEditFilter()));
     connect (mTwFilters, SIGNAL (itemChanged (QTreeWidgetItem *, int)),
-             this, SLOT (sltUpdateActivityState(QTreeWidgetItem *)));
-
-    mUSBDevicesMenu = new VBoxUSBMenu (this);
-    connect (mUSBDevicesMenu, SIGNAL (triggered (QAction*)),
-             this, SLOT (addConfirmed (QAction *)));
-    connect (mNewAction, SIGNAL (triggered (bool)),
-             this, SLOT (newClicked()));
-    connect (mAddAction, SIGNAL (triggered (bool)),
-             this, SLOT (addClicked()));
-    connect (mEdtAction, SIGNAL (triggered (bool)),
-             this, SLOT (edtClicked()));
-    connect (mDelAction, SIGNAL (triggered (bool)),
-             this, SLOT (delClicked()));
-    connect (mMupAction, SIGNAL (triggered (bool)),
-             this, SLOT (mupClicked()));
-    connect (mMdnAction, SIGNAL (triggered (bool)),
-             this, SLOT (mdnClicked()));
+             this, SLOT (sltHandleActivityStateChange(QTreeWidgetItem *)));
+
+    m_pMenuUSBDevices = new VBoxUSBMenu (this);
+    connect (m_pMenuUSBDevices, SIGNAL (triggered (QAction*)),
+             this, SLOT (sltAddFilterConfirmed (QAction *)));
+    connect (m_pActionNew, SIGNAL (triggered (bool)),
+             this, SLOT (sltNewFilter()));
+    connect (m_pActionAdd, SIGNAL (triggered (bool)),
+             this, SLOT (sltAddFilter()));
+    connect (m_pActionEdit, SIGNAL (triggered (bool)),
+             this, SLOT (sltEditFilter()));
+    connect (m_pActionRemove, SIGNAL (triggered (bool)),
+             this, SLOT (sltRemoveFilter()));
+    connect (m_pActionMoveUp, SIGNAL (triggered (bool)),
+             this, SLOT (sltMoveFilterUp()));
+    connect (m_pActionMoveDown, SIGNAL (triggered (bool)),
+             this, SLOT (sltMoveFilterDown()));
 
     /* Setup dialog */
@@ -373 +373 @@
 UIMachineSettingsUSB::~UIMachineSettingsUSB()
 {
-    delete mUSBDevicesMenu;
+    delete m_pMenuUSBDevices;
 
     /* Cleanup cache: */
@@ -473 +473 @@
 
     /* Update page: */
-    usbAdapterToggled(mGbUSB->isChecked());
+    sltHandleUsbAdapterToggle(mGbUSB->isChecked());
 
     /* Polish page finally: */
@@ -676 +676 @@
 #ifdef VBOX_WITH_EXTPACK
     /* USB 2.0/3.0 Extension Pack presence test: */
-    CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
+    const CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
     if (   mGbUSB->isChecked()
         && (mRbUSB2->isChecked() || mRbUSB3->isChecked())
@@ -698 +698 @@
 }
 
-void UIMachineSettingsUSB::setOrderAfter (QWidget *aWidget)
-{
-    setTabOrder (aWidget, mGbUSB);
-    setTabOrder (mGbUSB, mRbUSB1);
-    setTabOrder (mRbUSB1, mRbUSB2);
-    setTabOrder (mRbUSB2, mRbUSB3);
-    setTabOrder (mRbUSB3, mTwFilters);
+void UIMachineSettingsUSB::setOrderAfter(QWidget *pWidget)
+{
+    setTabOrder(pWidget, mGbUSB);
+    setTabOrder(mGbUSB, mRbUSB1);
+    setTabOrder(mRbUSB1, mRbUSB2);
+    setTabOrder(mRbUSB2, mRbUSB3);
+    setTabOrder(mRbUSB3, mTwFilters);
 }
 
@@ -712 +712 @@
     Ui::UIMachineSettingsUSB::retranslateUi(this);
 
-    mNewAction->setText(tr("Add Empty Filter"));
-    mAddAction->setText(tr("Add Filter From Device"));
-    mEdtAction->setText(tr("Edit Filter"));
-    mDelAction->setText(tr("Remove Filter"));
-    mMupAction->setText(tr("Move Filter Up"));
-    mMdnAction->setText(tr("Move Filter Down"));
-
-    mNewAction->setWhatsThis(tr("Adds new USB filter with all fields initially set to empty strings. "
+    m_pActionNew->setText(tr("Add Empty Filter"));
+    m_pActionAdd->setText(tr("Add Filter From Device"));
+    m_pActionEdit->setText(tr("Edit Filter"));
+    m_pActionRemove->setText(tr("Remove Filter"));
+    m_pActionMoveUp->setText(tr("Move Filter Up"));
+    m_pActionMoveDown->setText(tr("Move Filter Down"));
+
+    m_pActionNew->setWhatsThis(tr("Adds new USB filter with all fields initially set to empty strings. "
                                 "Note that such a filter will match any attached USB device."));
-    mAddAction->setWhatsThis(tr("Adds new USB filter with all fields set to the values of the "
+    m_pActionAdd->setWhatsThis(tr("Adds new USB filter with all fields set to the values of the "
                                 "selected USB device attached to the host PC."));
-    mEdtAction->setWhatsThis(tr("Edits selected USB filter."));
-    mDelAction->setWhatsThis(tr("Removes selected USB filter."));
-    mMupAction->setWhatsThis(tr("Moves selected USB filter up."));
-    mMdnAction->setWhatsThis(tr("Moves selected USB filter down."));
-
-    mNewAction->setToolTip(mNewAction->whatsThis());
-    mAddAction->setToolTip(mAddAction->whatsThis());
-    mEdtAction->setToolTip(mEdtAction->whatsThis());
-    mDelAction->setToolTip(mDelAction->whatsThis());
-    mMupAction->setToolTip(mMupAction->whatsThis());
-    mMdnAction->setToolTip(mMdnAction->whatsThis());
-
-    mUSBFilterName = tr("New Filter %1", "usb");
+    m_pActionEdit->setWhatsThis(tr("Edits selected USB filter."));
+    m_pActionRemove->setWhatsThis(tr("Removes selected USB filter."));
+    m_pActionMoveUp->setWhatsThis(tr("Moves selected USB filter up."));
+    m_pActionMoveDown->setWhatsThis(tr("Moves selected USB filter down."));
+
+    m_pActionNew->setToolTip(m_pActionNew->whatsThis());
+    m_pActionAdd->setToolTip(m_pActionAdd->whatsThis());
+    m_pActionEdit->setToolTip(m_pActionEdit->whatsThis());
+    m_pActionRemove->setToolTip(m_pActionRemove->whatsThis());
+    m_pActionMoveUp->setToolTip(m_pActionMoveUp->whatsThis());
+    m_pActionMoveDown->setToolTip(m_pActionMoveDown->whatsThis());
+
+    m_strTrUSBFilterName = tr("New Filter %1", "usb");
 }
 
@@ -747 +747 @@
 }
 
-void UIMachineSettingsUSB::usbAdapterToggled(bool fEnabled)
+void UIMachineSettingsUSB::sltHandleUsbAdapterToggle(bool fEnabled)
 {
     /* Enable/disable USB children: */
@@ -761 +761 @@
     }
     /* Update current item: */
-    currentChanged(mTwFilters->currentItem());
-}
-
-void UIMachineSettingsUSB::currentChanged(QTreeWidgetItem *aItem)
+    sltHandleCurrentItemChange(mTwFilters->currentItem());
+}
+
+void UIMachineSettingsUSB::sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem)
 {
     /* Get selected items: */
@@ -777 +777 @@
 
     /* Select item if requested: */
-    if (aItem)
-        aItem->setSelected(true);
+    if (pCurrentItem)
+        pCurrentItem->setSelected(true);
 
     /* Update corresponding action states: */
-    mEdtAction->setEnabled(aItem);
-    mDelAction->setEnabled(aItem);
-    mMupAction->setEnabled(aItem && mTwFilters->itemAbove(aItem));
-    mMdnAction->setEnabled(aItem && mTwFilters->itemBelow(aItem));
-}
-
-void UIMachineSettingsUSB::showContextMenu(const QPoint &pos)
+    m_pActionEdit->setEnabled(pCurrentItem);
+    m_pActionRemove->setEnabled(pCurrentItem);
+    m_pActionMoveUp->setEnabled(pCurrentItem && mTwFilters->itemAbove(pCurrentItem));
+    m_pActionMoveDown->setEnabled(pCurrentItem && mTwFilters->itemBelow(pCurrentItem));
+}
+
+void UIMachineSettingsUSB::sltHandleContextMenuRequest(const QPoint &pos)
 {
     QMenu menu;
     if (mTwFilters->isEnabled())
     {
-        menu.addAction(mNewAction);
-        menu.addAction(mAddAction);
+        menu.addAction(m_pActionNew);
+        menu.addAction(m_pActionAdd);
         menu.addSeparator();
-        menu.addAction(mEdtAction);
+        menu.addAction(m_pActionEdit);
         menu.addSeparator();
-        menu.addAction(mDelAction);
+        menu.addAction(m_pActionRemove);
         menu.addSeparator();
-        menu.addAction(mMupAction);
-        menu.addAction(mMdnAction);
+        menu.addAction(m_pActionMoveUp);
+        menu.addAction(m_pActionMoveDown);
     }
     if (!menu.isEmpty())
@@ -806 +806 @@
 }
 
-void UIMachineSettingsUSB::sltUpdateActivityState(QTreeWidgetItem *pChangedItem)
+void UIMachineSettingsUSB::sltHandleActivityStateChange(QTreeWidgetItem *pChangedItem)
 {
     /* Check changed USB filter item: */
@@ -816 +816 @@
 }
 
-void UIMachineSettingsUSB::newClicked()
+void UIMachineSettingsUSB::sltNewFilter()
 {
     /* Search for the max available filter index: */
     int iMaxFilterIndex = 0;
-    QRegExp regExp(QString("^") + mUSBFilterName.arg("([0-9]+)") + QString("$"));
+    const QRegExp regExp(QString("^") + m_strTrUSBFilterName.arg("([0-9]+)") + QString("$"));
     QTreeWidgetItemIterator iterator(mTwFilters);
     while (*iterator)
     {
-        QString filterName = (*iterator)->text(0);
-        int pos = regExp.indexIn(filterName);
+        const QString filterName = (*iterator)->text(0);
+        const int pos = regExp.indexIn(filterName);
         if (pos != -1)
             iMaxFilterIndex = regExp.cap(1).toInt() > iMaxFilterIndex ?
@@ -835 +835 @@
     UIDataSettingsMachineUSBFilter usbFilterData;
     usbFilterData.m_fActive = true;
-    usbFilterData.m_strName = mUSBFilterName.arg(iMaxFilterIndex + 1);
+    usbFilterData.m_strName = m_strTrUSBFilterName.arg(iMaxFilterIndex + 1);
     usbFilterData.m_fHostUSBDevice = false;
 
@@ -845 +845 @@
 }
 
-void UIMachineSettingsUSB::addClicked()
-{
-    mUSBDevicesMenu->exec(QCursor::pos());
-}
-
-void UIMachineSettingsUSB::addConfirmed(QAction *pAction)
+void UIMachineSettingsUSB::sltAddFilter()
+{
+    m_pMenuUSBDevices->exec(QCursor::pos());
+}
+
+void UIMachineSettingsUSB::sltAddFilterConfirmed(QAction *pAction)
 {
     /* Get USB device: */
-    CUSBDevice usb = mUSBDevicesMenu->getUSB(pAction);
+    const CUSBDevice usb = m_pMenuUSBDevices->getUSB(pAction);
     if (usb.isNull())
         return;
@@ -884 +884 @@
 }
 
-void UIMachineSettingsUSB::edtClicked()
+void UIMachineSettingsUSB::sltEditFilter()
 {
     /* Get current USB filter item: */
@@ -932 +932 @@
 }
 
-void UIMachineSettingsUSB::delClicked()
+void UIMachineSettingsUSB::sltRemoveFilter()
 {
     /* Get current USB filter item: */
@@ -943 +943 @@
 
     /* Update current item: */
-    currentChanged(mTwFilters->currentItem());
+    sltHandleCurrentItemChange(mTwFilters->currentItem());
 
     /* Revalidate: */
@@ -949 +949 @@
 }
 
-void UIMachineSettingsUSB::mupClicked()
-{
-    QTreeWidgetItem *item = mTwFilters->currentItem();
-    Assert (item);
-
-    int index = mTwFilters->indexOfTopLevelItem (item);
-    QTreeWidgetItem *takenItem = mTwFilters->takeTopLevelItem (index);
-    Assert (item == takenItem);
-    mTwFilters->insertTopLevelItem (index - 1, takenItem);
-    m_filters.swap (index, index - 1);
-
-    mTwFilters->setCurrentItem (takenItem);
-}
-
-void UIMachineSettingsUSB::mdnClicked()
-{
-    QTreeWidgetItem *item = mTwFilters->currentItem();
-    Assert (item);
-
-    int index = mTwFilters->indexOfTopLevelItem (item);
-    QTreeWidgetItem *takenItem = mTwFilters->takeTopLevelItem (index);
-    Assert (item == takenItem);
-    mTwFilters->insertTopLevelItem (index + 1, takenItem);
-    m_filters.swap (index, index + 1);
-
-    mTwFilters->setCurrentItem (takenItem);
-}
-
-void UIMachineSettingsUSB::addUSBFilter(const UIDataSettingsMachineUSBFilter &usbFilterData, bool fIsNew)
+void UIMachineSettingsUSB::sltMoveFilterUp()
+{
+    QTreeWidgetItem *pItem = mTwFilters->currentItem();
+    Assert(pItem);
+
+    const int index = mTwFilters->indexOfTopLevelItem(pItem);
+    QTreeWidgetItem *takenItem = mTwFilters->takeTopLevelItem(index);
+    Assert(pItem == takenItem);
+    mTwFilters->insertTopLevelItem(index - 1, takenItem);
+    m_filters.swap(index, index - 1);
+
+    mTwFilters->setCurrentItem(takenItem);
+}
+
+void UIMachineSettingsUSB::sltMoveFilterDown()
+{
+    QTreeWidgetItem *pItem = mTwFilters->currentItem();
+    Assert(pItem);
+
+    const int index = mTwFilters->indexOfTopLevelItem(pItem);
+    QTreeWidgetItem *takenItem = mTwFilters->takeTopLevelItem(index);
+    Assert(pItem == takenItem);
+    mTwFilters->insertTopLevelItem(index + 1, takenItem);
+    m_filters.swap(index, index + 1);
+
+    mTwFilters->setCurrentItem(takenItem);
+}
+
+void UIMachineSettingsUSB::addUSBFilter(const UIDataSettingsMachineUSBFilter &usbFilterData, bool fChoose)
 {
     /* Append internal list with data: */
@@ -990 +990 @@
 
     /* Select this item if its new: */
-    if (fIsNew)
+    if (fChoose)
         mTwFilters->setCurrentItem(pItem);
 }
@@ -1000 +1000 @@
     QString strToolTip;
 
-    QString strVendorId = usbFilterData.m_strVendorId;
+    const QString strVendorId = usbFilterData.m_strVendorId;
     if (!strVendorId.isEmpty())
         strToolTip += tr("<nobr>Vendor ID: %1</nobr>", "USB filter tooltip").arg(strVendorId);
 
-    QString strProductId = usbFilterData.m_strProductId;
+    const QString strProductId = usbFilterData.m_strProductId;
     if (!strProductId.isEmpty())
         strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Product ID: %2</nobr>", "USB filter tooltip").arg(strProductId);
 
-    QString strRevision = usbFilterData.m_strRevision;
+    const QString strRevision = usbFilterData.m_strRevision;
     if (!strRevision.isEmpty())
         strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Revision: %3</nobr>", "USB filter tooltip").arg(strRevision);
 
-    QString strProduct = usbFilterData.m_strProduct;
+    const QString strProduct = usbFilterData.m_strProduct;
     if (!strProduct.isEmpty())
         strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Product: %4</nobr>", "USB filter tooltip").arg(strProduct);
 
-    QString strManufacturer = usbFilterData.m_strManufacturer;
+    const QString strManufacturer = usbFilterData.m_strManufacturer;
     if (!strManufacturer.isEmpty())
         strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Manufacturer: %5</nobr>", "USB filter tooltip").arg(strManufacturer);
 
-    QString strSerial = usbFilterData.m_strSerialNumber;
+    const QString strSerial = usbFilterData.m_strSerialNumber;
     if (!strSerial.isEmpty())
         strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Serial No.: %1</nobr>", "USB filter tooltip").arg(strSerial);
 
-    QString strPort = usbFilterData.m_strPort;
+    const QString strPort = usbFilterData.m_strPort;
     if (!strPort.isEmpty())
         strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Port: %1</nobr>", "USB filter tooltip").arg(strPort);

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

@@ -82 +82 @@
 private slots:
 
-    void usbAdapterToggled(bool fEnabled);
+    void sltHandleUsbAdapterToggle(bool fEnabled);
 
-    void currentChanged (QTreeWidgetItem *aItem = 0);
-    void showContextMenu(const QPoint &pos);
-    void sltUpdateActivityState(QTreeWidgetItem *pChangedItem);
+    void sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem);
+    void sltHandleContextMenuRequest(const QPoint &position);
+    void sltHandleActivityStateChange(QTreeWidgetItem *pChangedItem);
 
-    void newClicked();
-    void addClicked();
-    void edtClicked();
-    void addConfirmed (QAction *aAction);
-    void delClicked();
-    void mupClicked();
-    void mdnClicked();
+    void sltNewFilter();
+    void sltAddFilter();
+    void sltEditFilter();
+    void sltAddFilterConfirmed(QAction *pAction);
+    void sltRemoveFilter();
+    void sltMoveFilterUp();
+    void sltMoveFilterDown();
 
 private:
 
-    void addUSBFilter(const UIDataSettingsMachineUSBFilter &usbFilterData, bool fIsNew);
+    void addUSBFilter(const UIDataSettingsMachineUSBFilter &usbFilterData, bool fChoose);
 
     /* Returns the multi-line description of the given USB filter: */
@@ -104 +104 @@
 
     /* Other variables: */
-    UIToolBar *m_pToolBar;
-    QAction *mNewAction;
-    QAction *mAddAction;
-    QAction *mEdtAction;
-    QAction *mDelAction;
-    QAction *mMupAction;
-    QAction *mMdnAction;
-    VBoxUSBMenu *mUSBDevicesMenu;
+    UIToolBar   *m_pToolBar;
+    QAction     *m_pActionNew;
+    QAction     *m_pActionAdd;
+    QAction     *m_pActionEdit;
+    QAction     *m_pActionRemove;
+    QAction     *m_pActionMoveUp;
+    QAction     *m_pActionMoveDown;
+    VBoxUSBMenu *m_pMenuUSBDevices;
 
-    QString mUSBFilterName;
+    QString  m_strTrUSBFilterName;
 
-    QList<UIDataSettingsMachineUSBFilter> m_filters;
+    QList<UIDataSettingsMachineUSBFilter>  m_filters;
 
     /** Holds the page data cache instance. */