Changeset 92730 in vbox for trunk/src/VBox

Timestamp:

Dec 3, 2021 10:46:28 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10163: UINetworkManager: A bit of cleanup first of all.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• networkmanager/UIDetailsWidgetNATNetwork.h (modified) (2 diffs)
• networkmanager/UINetworkManager.cpp (modified) (2 diffs)
• networkmanager/UINetworkManager.h (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetNATNetwork.h

@@ -235 +235 @@
         /** Holds the 'Options' button-box instance. */
         QIDialogButtonBox *m_pButtonBoxOptions;
+        /** Holds the list of names busy by other
+          * NAT networks. */
+        QStringList        m_busyNames;
     /** @} */
 
@@ -247 +250 @@
         /** Holds the 'Forwarding' button-box instance. */
         QIDialogButtonBox     *m_pButtonBoxForwarding;
-        /** Holds the list of names busy by other
-          * NAT networks. */
-        QStringList            m_busyNames;
         /** Holds whether we should try to keep
           * port forwarding rule position intact. */

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp

@@ -970 +970 @@
     if (pItem)
     {
-        QStringList busyNamesForItem = busyNames();
+        QStringList busyNamesForItem = busyNamesNAT();
         busyNamesForItem.removeAll(pItem->name());
         m_pDetailsWidgetNATNetwork->setData(*pItem, busyNamesForItem, fHoldPosition);
@@ -1639 +1639 @@
 }
 
-QStringList UINetworkManagerWidget::busyNames() const
+QStringList UINetworkManagerWidget::busyNamesNAT() const
 {
     QStringList names;

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.h

@@ -60 +60 @@
     /** Notifies listeners about host network details data @a fDiffers. */
     void sigDetailsDataChangedHostNetwork(bool fDiffers);
-
     /** Notifies listeners about NAT network details data @a fDiffers. */
     void sigDetailsDataChangedNATNetwork(bool fDiffers);
@@ -210 +209 @@
 
         /** Returns a list of busy NAT network names. */
-        QStringList busyNames() const;
+        QStringList busyNamesNAT() const;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -441 +441 @@
         static void cannotCreateNATNetwork(const CVirtualBox &comVBox);
         /** Notifies about inability to remove NAT network.
-          * @param  comVBox         Brings common VBox object trying to remove DHCP server.
+          * @param  comVBox         Brings common VBox object trying to remove NAT network.
           * @param  strNetworkName  Brings the network name. */
         static void cannotRemoveNATNetwork(const CVirtualBox &comVBox, const QString &strNetworkName);