Changeset 62081 in vbox for trunk

Timestamp:

Jul 6, 2016 5:45:23 PM (9 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp (modified) (4 diffs)

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

@@ -103 +103 @@
         }
     }
+    AssertPtrReturnVoid(pCheckedButton);
 
     /* Determine chosen type: */
@@ -129 +130 @@
     /* Create main layout: */
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-
-    /* Create label: */
-    m_pLabel = new QILabel(this);
-    /* Configure label: */
-    m_pLabel->setWordWrap(true);
-    m_pLabel->useSizeHintForWidth(450);
-    m_pLabel->updateGeometry();
-    /* Add label into main layout: */
-    pMainLayout->addWidget(m_pLabel);
-
-    /* Create group-box: */
-    m_pGroupBox = new QGroupBox(this);
-    /* Add group-box into main layout: */
-    pMainLayout->addWidget(m_pGroupBox);
-
-    /* Create button-box: */
-    m_pButtonBox = new QIDialogButtonBox(this);
-    /* Configure button-box: */
-    m_pButtonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-    m_pButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-    connect(m_pButtonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(sltAccept()));
-    connect(m_pButtonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(sltReject()));
-    /* Add button-box into main layout: */
-    pMainLayout->addWidget(m_pButtonBox);
-
-    /* Add a stretch to main layout: */
-    pMainLayout->addStretch();
-
-    /* Prepare radio-buttons: */
-    prepareMediumTypeButtons();
+    AssertPtrReturnVoid(pMainLayout);
+    {
+        /* Create label: */
+        m_pLabel = new QILabel;
+        AssertPtrReturnVoid(m_pLabel);
+        {
+            /* Configure label: */
+            m_pLabel->setWordWrap(true);
+            m_pLabel->useSizeHintForWidth(450);
+            m_pLabel->updateGeometry();
+        }
+        /* Add label into main layout: */
+        pMainLayout->addWidget(m_pLabel);
+
+        /* Create group-box: */
+        m_pGroupBox = new QGroupBox;
+        AssertPtrReturnVoid(m_pGroupBox);
+        {
+            /* Configure group-box: */
+            m_pGroupBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+
+            /* Prepares radio-buttons: */
+            prepareMediumTypeButtons();
+        }
+        /* Add group-box into main layout: */
+        pMainLayout->addWidget(m_pGroupBox);
+
+        /* Add a stretch to main layout: */
+        pMainLayout->addStretch();
+
+        /* Create button-box: */
+        m_pButtonBox = new QIDialogButtonBox;
+        AssertPtrReturnVoid(m_pButtonBox);
+        {
+            /* Configure button-box: */
+            m_pButtonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+            connect(m_pButtonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(sltAccept()));
+            connect(m_pButtonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(sltReject()));
+        }
+        /* Add button-box into main layout: */
+        pMainLayout->addWidget(m_pButtonBox);
+    }
 
     /* Retranslate: */
     retranslateUi();
 
+    /* Revalidate: */
+    sltValidate();
+
     /* Resize to minimum size: */
     resize(minimumSizeHint());
@@ -174 +191 @@
     /* Create group-box layout: */
     m_pGroupBoxLayout = new QVBoxLayout(m_pGroupBox);
-    /* Populate radio-buttons: */
-    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_enmMediumTypeOld)
-        {
-            buttons[i]->setChecked(true);
-            buttons[i]->setFocus();
-            break;
-        }
-    }
-    /* Revalidate finally: */
-    sltValidate();
+    AssertPtrReturnVoid(m_pGroupBoxLayout);
+    {
+        /* Populate radio-buttons: */
+        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 = m_pGroupBox->findChildren<QRadioButton*>();
+        for (int i = 0; i < buttons.size(); ++i)
+        {
+            if (buttons[i]->property("mediumType").value<KMediumType>() == m_enmMediumTypeOld)
+            {
+                buttons[i]->setChecked(true);
+                buttons[i]->setFocus();
+                break;
+            }
+        }
+    }
 }
 
@@ -199 +217 @@
     /* Create radio-button: */
     QRadioButton *pRadioButton = new QRadioButton(m_pGroupBox);
-    /* Configure radio-button: */
-    connect(pRadioButton, SIGNAL(clicked()), this, SLOT(sltValidate()));
-    pRadioButton->setProperty("mediumType", QVariant::fromValue(mediumType));
+    AssertPtrReturnVoid(pRadioButton);
+    {
+        /* Configure radio-button: */
+        connect(pRadioButton, SIGNAL(clicked()), this, SLOT(sltValidate()));
+        pRadioButton->setProperty("mediumType", QVariant::fromValue(mediumType));
+    }
     /* Add radio-button into layout: */
     m_pGroupBoxLayout->addWidget(pRadioButton);