Changeset 62079 in vbox for trunk/src

Timestamp:

Jul 6, 2016 5:27:13 PM (9 years ago)

Author:

vboxsync

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

108551

Message:

FE/Qt: bugref:8399: Medium Type Change dialog cleanup/rework (part 02): Renaming.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIMediumTypeChangeDialog.cpp (modified) (7 diffs)
• UIMediumTypeChangeDialog.h (modified) (3 diffs)

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

@@ -38 +38 @@
 
 
-UIMediumTypeChangeDialog::UIMediumTypeChangeDialog(QWidget *pParent, const QString &strMediumId)
+UIMediumTypeChangeDialog::UIMediumTypeChangeDialog(QWidget *pParent, const QString &strMediumID)
     : QIWithRetranslateUI<QIDialog>(pParent)
 {
@@ -50 +50 @@
 
     /* Search for corresponding medium: */
-    m_medium = vboxGlobal().medium(strMediumId).medium();
-    m_oldMediumType = m_medium.GetType();
-    m_newMediumType = m_oldMediumType;
+    m_medium = vboxGlobal().medium(strMediumID).medium();
+    m_enmMediumTypeOld = m_medium.GetType();
+    m_enmMediumTypeNew = m_enmMediumTypeOld;
 
     /* Create main layout: */
@@ -84 +84 @@
     pMainLayout->addStretch();
 
-    /* Create radio-buttons: */
-    createMediumTypeButtons();
+    /* Prepare radio-buttons: */
+    prepareMediumTypeButtons();
 
     /* Retranslate: */
@@ -97 +97 @@
 {
     /* Try to assign new medium type: */
-    m_medium.SetType(m_newMediumType);
+    m_medium.SetType(m_enmMediumTypeNew);
     /* Check for result: */
     if (!m_medium.isOk())
     {
         /* Show error message: */
-        msgCenter().cannotChangeMediumType(m_medium, m_oldMediumType, m_newMediumType, this);
+        msgCenter().cannotChangeMediumType(m_medium, m_enmMediumTypeOld, m_enmMediumTypeNew, this);
         return;
     }
@@ -153 +153 @@
 
     /* Determine chosen type: */
-    m_newMediumType = pCheckedButton->property("mediumType").value<KMediumType>();
+    m_enmMediumTypeNew = pCheckedButton->property("mediumType").value<KMediumType>();
 
     /* Enable/disable OK button depending on chosen type,
      * for now only the previous type is restricted, others are free to choose: */
-    m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(m_oldMediumType != m_newMediumType);
-}
-
-void UIMediumTypeChangeDialog::createMediumTypeButtons()
+    m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(m_enmMediumTypeOld != m_enmMediumTypeNew);
+}
+
+void UIMediumTypeChangeDialog::prepareMediumTypeButtons()
 {
     /* Register required meta-type: */
@@ -168 +168 @@
     m_pGroupBoxLayout = new QVBoxLayout(m_pGroupBox);
     /* Populate radio-buttons: */
-    createMediumTypeButton(KMediumType_Normal);
-    createMediumTypeButton(KMediumType_Immutable);
-    createMediumTypeButton(KMediumType_Writethrough);
-    createMediumTypeButton(KMediumType_Shareable);
-    createMediumTypeButton(KMediumType_MultiAttach);
+    prepareMediumTypeButton(KMediumType_Normal);
+    prepareMediumTypeButton(KMediumType_Immutable);
+    prepareMediumTypeButton(KMediumType_Writethrough);
+    prepareMediumTypeButton(KMediumType_Shareable);
+    prepareMediumTypeButton(KMediumType_MultiAttach);
     /* Make sure button reflecting current type is checked: */
     QList<QRadioButton*> buttons = findChildren<QRadioButton*>();
     for (int i = 0; i < buttons.size(); ++i)
     {
-        if (buttons[i]->property("mediumType").value<KMediumType>() == m_oldMediumType)
+        if (buttons[i]->property("mediumType").value<KMediumType>() == m_enmMediumTypeOld)
         {
             buttons[i]->setChecked(true);
@@ -188 +188 @@
 }
 
-void UIMediumTypeChangeDialog::createMediumTypeButton(KMediumType mediumType)
+void UIMediumTypeChangeDialog::prepareMediumTypeButton(KMediumType mediumType)
 {
     /* Create radio-button: */

trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.h

@@ -44 +44 @@
 
     /** Constructs the dialog passing @a pParent to the base-class.
-      * @param  strMediumId  Brings the ID of the medium to be modified. */
-    UIMediumTypeChangeDialog(QWidget *pParent, const QString &strMediumId);
+      * @param  strMediumID  Brings the ID of the medium to be modified. */
+    UIMediumTypeChangeDialog(QWidget *pParent, const QString &strMediumID);
 
 protected:
 
     /** Handles translation event. */
-    void retranslateUi();
+    void retranslateUi() /* override */;
 
 protected slots:
@@ -65 +65 @@
 
     /** Prepares medium-type radio-buttons. */
-    void createMediumTypeButtons();
+    void prepareMediumTypeButtons();
     /** Prepares radio-button for the passed @a mediumType. */
-    void createMediumTypeButton(KMediumType mediumType);
+    void prepareMediumTypeButton(KMediumType mediumType);
 
     /** Holds the description label instance. */
@@ -81 +81 @@
     CMedium m_medium;
     /** Holds the old medium type. */
-    KMediumType m_oldMediumType;
+    KMediumType m_enmMediumTypeOld;
     /** Holds the new medium type. */
-    KMediumType m_newMediumType;
+    KMediumType m_enmMediumTypeNew;
 };