Changeset 66723 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 28, 2017 2:56:19 PM (8 years ago)

Author:

vboxsync

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

115125

Message:

FE/Qt: bugref:8847: Host Network Manager: Using safe Qt5 way of connect; a bit of code formatting.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork

Files:

• UIHostNetworkDetailsDialog.cpp (modified) (2 diffs)
• UIHostNetworkDetailsDialog.h (modified) (3 diffs)
• UIHostNetworkManager.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp

@@ -238 +238 @@
             {
                 /* Configure check-box: */
-                connect(m_pCheckBoxDHCP, SIGNAL(stateChanged(int)), this, SLOT(sltDhcpServerStatusChanged()));
+                connect(m_pCheckBoxDHCP, &QCheckBox::stateChanged,
+                        this, &UIHostNetworkDetailsDialog::sltDhcpServerStatusChanged);
                 /* Add into layout: */
                 pLayoutDHCPServer->addWidget(m_pCheckBoxDHCP, 0, 0, 1, 3);
@@ -347 +348 @@
         /* Configure button-box: */
         pButtonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-        connect(pButtonBox, SIGNAL(accepted()), this, SLOT(accept()));
-        connect(pButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
+        connect(pButtonBox, &QIDialogButtonBox::accepted,
+                this, &UIHostNetworkDetailsDialog::accept);
+        connect(pButtonBox, &QIDialogButtonBox::rejected,
+                this, &UIHostNetworkDetailsDialog::reject);
         /* Add button-box into layout: */
         layout()->addWidget(pButtonBox);

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.h

@@ -214 +214 @@
         UIDataHostNetwork &m_data;
         /** Holds the tab-widget. */
-        QITabWidget *m_pTabWidget;
+        QITabWidget       *m_pTabWidget;
     /** @} */
 
@@ -220 +220 @@
      * @{ */
         /** Holds the IPv4 address label. */
-        QLabel      *m_pLabelIPv4;
+        QLabel     *m_pLabelIPv4;
         /** Holds the IPv4 address editor. */
-        QILineEdit  *m_pEditorIPv4;
+        QILineEdit *m_pEditorIPv4;
         /** Holds the IPv4 network mask label. */
-        QLabel      *m_pLabelNMv4;
+        QLabel     *m_pLabelNMv4;
         /** Holds the IPv4 network mask editor. */
-        QILineEdit  *m_pEditorNMv4;
+        QILineEdit *m_pEditorNMv4;
         /** Holds the IPv6 address label. */
-        QLabel      *m_pLabelIPv6;
+        QLabel     *m_pLabelIPv6;
         /** Holds the IPv6 address editor. */
-        QILineEdit  *m_pEditorIPv6;
+        QILineEdit *m_pEditorIPv6;
         /** Holds the IPv6 network mask label. */
-        QLabel      *m_pLabelNMv6;
+        QLabel     *m_pLabelNMv6;
         /** Holds the IPv6 network mask editor. */
-        QILineEdit  *m_pEditorNMv6;
+        QILineEdit *m_pEditorNMv6;
     /** @} */
 
@@ -240 +240 @@
      * @{ */
         /** Holds the DHCP server status chack-box. */
-        QCheckBox   *m_pCheckBoxDHCP;
+        QCheckBox  *m_pCheckBoxDHCP;
         /** Holds the DHCP address label. */
-        QLabel      *m_pLabelDHCPAddress;
+        QLabel     *m_pLabelDHCPAddress;
         /** Holds the DHCP address editor. */
-        QILineEdit  *m_pEditorDHCPAddress;
+        QILineEdit *m_pEditorDHCPAddress;
         /** Holds the DHCP network mask label. */
-        QLabel      *m_pLabelDHCPMask;
+        QLabel     *m_pLabelDHCPMask;
         /** Holds the DHCP network mask editor. */
-        QILineEdit  *m_pEditorDHCPMask;
+        QILineEdit *m_pEditorDHCPMask;
         /** Holds the DHCP lower address label. */
-        QLabel      *m_pLabelDHCPLowerAddress;
+        QLabel     *m_pLabelDHCPLowerAddress;
         /** Holds the DHCP lower address editor. */
-        QILineEdit  *m_pEditorDHCPLowerAddress;
+        QILineEdit *m_pEditorDHCPLowerAddress;
         /** Holds the DHCP upper address label. */
-        QLabel      *m_pLabelDHCPUpperAddress;
+        QLabel     *m_pLabelDHCPUpperAddress;
         /** Holds the DHCP upper address editor. */
-        QILineEdit  *m_pEditorDHCPUpperAddress;
+        QILineEdit *m_pEditorDHCPUpperAddress;
     /** @} */
 };

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -700 +700 @@
                                                       ":/add_host_iface_disabled_22px.png",
                                                       ":/add_host_iface_disabled_16px.png"));
-        connect(m_pActionAdd, SIGNAL(triggered()), this, SLOT(sltAddHostNetwork()));
+        connect(m_pActionAdd, &QAction::triggered, this, &UIHostNetworkManager::sltAddHostNetwork);
     }
 
@@ -713 +713 @@
                                                          ":/remove_host_iface_disabled_22px.png",
                                                          ":/remove_host_iface_disabled_16px.png"));
-        connect(m_pActionRemove, SIGNAL(triggered()), this, SLOT(sltRemoveHostNetwork()));
+        connect(m_pActionRemove, &QAction::triggered, this, &UIHostNetworkManager::sltRemoveHostNetwork);
     }
 
@@ -726 +726 @@
                                                        ":/edit_host_iface_disabled_22px.png",
                                                        ":/edit_host_iface_disabled_16px.png"));
-        connect(m_pActionEdit, SIGNAL(triggered()), this, SLOT(sltEditHostNetwork()));
+        connect(m_pActionEdit, &QAction::triggered, this, &UIHostNetworkManager::sltEditHostNetwork);
     }
 
@@ -824 +824 @@
         m_pTreeWidget->setSortingEnabled(true);
         m_pTreeWidget->sortByColumn(Column_Name, Qt::AscendingOrder);
-        connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
-                this, SLOT(sltHandleCurrentItemChange()));
-        connect(m_pTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
-                this, SLOT(sltEditHostNetwork()));
-        connect(m_pTreeWidget, SIGNAL(customContextMenuRequested(const QPoint &)),
-                this, SLOT(sltHandleContextMenuRequest(const QPoint &)));
-        connect(m_pTreeWidget, SIGNAL(itemChanged(QTreeWidgetItem *, int)),
-                this, SLOT(sltHandleItemChange(QTreeWidgetItem *)));
+        connect(m_pTreeWidget, &QITreeWidget::currentItemChanged,
+                this, &UIHostNetworkManager::sltHandleCurrentItemChange);
+        connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
+                this, &UIHostNetworkManager::sltEditHostNetwork);
+        connect(m_pTreeWidget, &QITreeWidget::customContextMenuRequested,
+                this, &UIHostNetworkManager::sltHandleContextMenuRequest);
+        connect(m_pTreeWidget, &QITreeWidget::itemChanged,
+                this, &UIHostNetworkManager::sltHandleItemChange);
         /* Add tree-widget into layout: */
         QVBoxLayout *pMainLayout = qobject_cast<QVBoxLayout*>(centralWidget()->layout());
@@ -847 +847 @@
         m_pButtonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Close);
         m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
-        connect(m_pButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
-        connect(m_pButtonBox, SIGNAL(rejected()), this, SLOT(close()));
+        connect(m_pButtonBox, &QIDialogButtonBox::helpRequested, &msgCenter(), &UIMessageCenter::sltShowHelpHelpDialog);
+        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIHostNetworkManager::close);
         /* Add button-box into layout: */
         QVBoxLayout *pMainLayout = qobject_cast<QVBoxLayout*>(centralWidget()->layout());