Changeset 94555 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 11, 2022 1:34:39 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Machine settings: Network page accessibility improvements (part 4); A bit of sanity checks and page cleanup.

Location:

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

Files:

• UIMachineSettingsNetwork.cpp (modified) (15 diffs)
• UIMachineSettingsNetwork.h (modified) (2 diffs)

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

@@ -689 +689 @@
 
 UIMachineSettingsNetworkPage::UIMachineSettingsNetworkPage()
-    : m_pTabWidget(0)
-    , m_pCache(0)
+    : m_pCache(0)
+    , m_pTabWidget(0)
 {
     prepare();
@@ -770 +770 @@
                                                                  forwardingData.at(4),
                                                                  forwardingData.at(5).toUInt());
-
                 const QString &strForwardingKey = forwardingData.at(0);
                 /* Cache old forwarding data: */
@@ -800 +799 @@
         /* Get adapter page: */
         UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        AssertPtrReturnVoid(pTab);
 
         /* Load old adapter data from cache: */
@@ -828 +828 @@
         /* Get adapter page: */
         UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        AssertPtrReturnVoid(pTab);
 
         /* Gather new adapter data: */
@@ -858 +859 @@
     {
         UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(i));
-        AssertMsg(pTab, ("Can't get adapter tab!\n"));
+        AssertPtrReturn(pTab, false);
         if (!pTab->validate(messages))
             fValid = false;
@@ -869 +870 @@
 void UIMachineSettingsNetworkPage::retranslateUi()
 {
-    for (int i = 0; i < m_pTabWidget->count(); ++i)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(i));
-        Assert(pTab);
-        m_pTabWidget->setTabText(i, pTab->tabTitle());
+    for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
+    {
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        AssertPtrReturnVoid(pTab);
+        m_pTabWidget->setTabText(iSlot, pTab->tabTitle());
     }
 }
@@ -879 +880 @@
 void UIMachineSettingsNetworkPage::polishPage()
 {
-    /* Get the count of network adapter tabs: */
     for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
     {
@@ -888 +888 @@
                                      m_pCache->child(iSlot).base().m_fAdapterEnabled));
         UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        AssertPtrReturnVoid(pTab);
         pTab->polishTab();
     }
@@ -896 +897 @@
     /* Determine the sender: */
     UIMachineSettingsNetwork *pSender = qobject_cast<UIMachineSettingsNetwork*>(sender());
-    AssertMsg(pSender, ("This slot should be called only through signal<->slot mechanism from one of UIMachineSettingsNetwork tabs!\n"));
+    AssertPtrReturnVoid(pSender);
 
     /* Determine sender's attachment type: */
-    const KNetworkAttachmentType enmSenderAttachmentType = pSender->attachmentType();
-    switch (enmSenderAttachmentType)
-    {
-        case KNetworkAttachmentType_Internal:
-        {
-            refreshInternalNetworkList();
-            break;
-        }
-        case KNetworkAttachmentType_Generic:
-        {
-            refreshGenericDriverList();
-            break;
-        }
-        default:
-            break;
+    switch (pSender->attachmentType())
+    {
+        case KNetworkAttachmentType_Internal: refreshInternalNetworkList(); break;
+        case KNetworkAttachmentType_Generic: refreshGenericDriverList(); break;
+        default: break;
     }
 
@@ -921 +912 @@
         /* Get the iterated tab: */
         UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
-        AssertMsg(pTab, ("All the tabs of m_pTabWidget should be of the UIMachineSettingsNetwork type!\n"));
+        AssertPtrReturnVoid(pTab);
 
         /* Update all the tabs (except sender): */
@@ -935 +926 @@
     {
         UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        AssertPtrReturnVoid(pTab);
         pTab->setAdvancedButtonState(fExpanded);
     }
@@ -947 +939 @@
     /* Create main layout: */
     QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
-    AssertPtrReturnVoid(pLayoutMain);
+    if (pLayoutMain)
     {
         /* Creating tab-widget: */
         m_pTabWidget = new QITabWidget;
-        AssertPtrReturnVoid(m_pTabWidget);
+        if (m_pTabWidget)
         {
             /* How many adapters to display: */
@@ -965 +957 @@
                 /* Create adapter tab: */
                 UIMachineSettingsNetwork *pTab = new UIMachineSettingsNetwork(this);
-                AssertPtrReturnVoid(pTab);
+                if (pTab)
                 {
                     /* Configure tab: */
@@ -1004 +996 @@
     m_internalNetworkList << m_internalNetworkListSaved;
     /* Append internal network list with names from all the tabs: */
-    for (int iTab = 0; iTab < m_pTabWidget->count(); ++iTab)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iTab));
-        if (pTab)
-        {
-            const QString strName = pTab->alternativeName(KNetworkAttachmentType_Internal);
-            if (!strName.isEmpty() && !m_internalNetworkList.contains(strName))
-                m_internalNetworkList << strName;
-        }
+    for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
+    {
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        AssertPtrReturnVoid(pTab);
+        const QString strName = pTab->alternativeName(KNetworkAttachmentType_Internal);
+        if (!strName.isEmpty() && !m_internalNetworkList.contains(strName))
+            m_internalNetworkList << strName;
     }
 }
@@ -1047 +1037 @@
     m_genericDriverList << m_genericDriverListSaved;
     /* Append generic driver list with names from all the tabs: */
-    for (int iTab = 0; iTab < m_pTabWidget->count(); ++iTab)
-    {
-        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iTab));
-        if (pTab)
-        {
-            const QString strName = pTab->alternativeName(KNetworkAttachmentType_Generic);
-            if (!strName.isEmpty() && !m_genericDriverList.contains(strName))
-                m_genericDriverList << strName;
-        }
+    for (int iSlot = 0; iSlot < m_pTabWidget->count(); ++iSlot)
+    {
+        UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
+        AssertPtrReturnVoid(pTab);
+        const QString strName = pTab->alternativeName(KNetworkAttachmentType_Generic);
+        if (!strName.isEmpty() && !m_genericDriverList.contains(strName))
+            m_genericDriverList << strName;
     }
 }

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

@@ -139 +139 @@
     bool saveAdapterData(int iSlot);
 
-    /** Holds the tab-widget instance. */
-    QITabWidget *m_pTabWidget;
-
     /** Holds the bridged adapter list. */
     QStringList  m_bridgedAdapterList;
@@ -167 +164 @@
     /** Holds the page data cache instance. */
     UISettingsCacheMachineNetwork *m_pCache;
+
+    /** Holds the tab-widget instance. */
+    QITabWidget *m_pTabWidget;
 };