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

Timestamp:

Sep 9, 2019 2:29:48 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8938. Converting connection syntaxes under settings. part 3.

Location:

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

Files:

• global/UIGlobalSettingsInput.cpp (modified) (4 diffs)
• machine/UIMachineSettingsNetwork.cpp (modified) (3 diffs)
• machine/UIMachineSettingsNetwork.h (modified) (2 diffs)
• machine/UIMachineSettingsSFDetails.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -386 +386 @@
     bool isAllShortcutsUnique();
 
-private slots:
+public slots:
 
     /* Handler: Filtering stuff: */
@@ -842 +842 @@
 
     /* Connect model: */
-    connect(model(), SIGNAL(sigShortcutsLoaded()), this, SLOT(sltHandleShortcutsLoaded()));
+    connect(qobject_cast<UIHotKeyTableModel*>(model()), &UIHotKeyTableModel::sigShortcutsLoaded,
+            this, &UIHotKeyTable::sltHandleShortcutsLoaded);
 
     /* Check if we do have proper item delegate: */
@@ -1149 +1150 @@
 {
     /* Configure 'Selector UI' connections: */
-    connect(m_pSelectorFilterEditor, SIGNAL(textChanged(const QString &)),
-            m_pSelectorModel, SLOT(sltHandleFilterTextChange(const QString &)));
-    connect(m_pSelectorModel, SIGNAL(sigRevalidationRequired()), this, SLOT(revalidate()));
+    connect(m_pSelectorFilterEditor, &QLineEdit::textChanged,
+            m_pSelectorModel, &UIHotKeyTableModel::sltHandleFilterTextChange);
+    connect(m_pSelectorModel, &UIHotKeyTableModel::sigRevalidationRequired, this, &UIGlobalSettingsInput::revalidate);
 
     /* Configure 'Runtime UI' connections: */
-    connect(m_pMachineFilterEditor, SIGNAL(textChanged(const QString &)),
-            m_pMachineModel, SLOT(sltHandleFilterTextChange(const QString &)));
-    connect(m_pMachineModel, SIGNAL(sigRevalidationRequired()), this, SLOT(revalidate()));
+    connect(m_pMachineFilterEditor, &QLineEdit::textChanged,
+            m_pMachineModel, &UIHotKeyTableModel::sltHandleFilterTextChange);
+    connect(m_pMachineModel, &UIHotKeyTableModel::sigRevalidationRequired, this, &UIGlobalSettingsInput::revalidate);
 }
 
@@ -1206 +1207 @@
 
 # include "UIGlobalSettingsInput.moc"
-

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

@@ -236 +236 @@
 
     /* Setup connections: */
-    connect(m_pEnableAdapterCheckBox, SIGNAL(toggled(bool)), this, SLOT(sltHandleAdapterActivityChange()));
+    connect(m_pEnableAdapterCheckBox, &QCheckBox::toggled, this, &UIMachineSettingsNetwork::sltHandleAdapterActivityChange);
     connect(m_pAttachmentTypeEditor, &UINetworkAttachmentEditor::sigValueTypeChanged,
             this, &UIMachineSettingsNetwork::sltHandleAttachmentTypeChange);
     connect(m_pAttachmentTypeEditor, &UINetworkAttachmentEditor::sigValueNameChanged,
             this, &UIMachineSettingsNetwork::sltHandleAlternativeNameChange);
-    connect(m_pAdvancedArrow, SIGNAL(sigClicked()), this, SLOT(sltHandleAdvancedButtonStateChange()));
-    connect(m_pMACButton, SIGNAL(clicked()), this, SLOT(sltGenerateMac()));
-    connect(m_pPortForwardingButton, SIGNAL(clicked()), this, SLOT(sltOpenPortForwardingDlg()));
-    connect(this, SIGNAL(sigTabUpdated()), m_pParent, SLOT(sltHandleTabUpdate()));
+    connect(m_pAdvancedArrow, &QIArrowButtonSwitch::sigClicked, this, &UIMachineSettingsNetwork::sltHandleAdvancedButtonStateChange);
+    connect(m_pMACButton, &QIToolButton::clicked, this, &UIMachineSettingsNetwork::sltGenerateMac);
+    connect(m_pPortForwardingButton, &QPushButton::clicked, this, &UIMachineSettingsNetwork::sltOpenPortForwardingDlg);
+    connect(this, &UIMachineSettingsNetwork::sigTabUpdated, m_pParent, &UIMachineSettingsNetworkPage::sltHandleTabUpdate);
 
     /* Prepare validation: */
@@ -631 +631 @@
 {
     /* Configure validation: */
-    connect(m_pMACEditor, SIGNAL(textChanged(const QString &)), m_pParent, SLOT(revalidate()));
+    connect(m_pMACEditor, &QILineEdit::textChanged, m_pParent, &UIMachineSettingsNetworkPage::revalidate);
 }
 
@@ -1019 +1019 @@
                 {
                     /* Configure tab: */
-                    connect(pTab, SIGNAL(sigNotifyAdvancedButtonStateChange(bool)),
-                            this, SLOT(sltHandleAdvancedButtonStateChange(bool)));
+                    connect(pTab, &UIMachineSettingsNetwork::sigNotifyAdvancedButtonStateChange,
+                            this, &UIMachineSettingsNetworkPage::sltHandleAdvancedButtonStateChange);
 
                     /* Add tab into tab-widget: */

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

@@ -58 +58 @@
     const QStringList &natNetworkList() const { return m_natNetworkList; }
 
+ public slots:
+
+    /** Handles particular tab update. */
+    void sltHandleTabUpdate();
+
 protected:
 
@@ -87 +92 @@
 
 private slots:
-
-    /** Handles particular tab update. */
-    void sltHandleTabUpdate();
 
     /** Handles whether the advanced button is @a fExpanded. */

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

@@ -43 +43 @@
 
     /* Setup connections: */
-    connect(mPsPath, SIGNAL(currentIndexChanged(int)), this, SLOT(sltSelectPath()));
-    connect(mPsPath, SIGNAL(pathChanged(const QString &)), this, SLOT(sltSelectPath()));
-    connect(mLeName, SIGNAL(textChanged(const QString &)), this, SLOT(sltValidate()));
+    connect(mPsPath, static_cast<void(UIFilePathSelector::*)(int)>(&UIFilePathSelector::currentIndexChanged),
+            this, &UIMachineSettingsSFDetails::sltSelectPath);
+    connect(mPsPath, &UIFilePathSelector::pathChanged, this, &UIMachineSettingsSFDetails::sltSelectPath);
+    connect(mLeName, &QLineEdit::textChanged, this, &UIMachineSettingsSFDetails::sltValidate);
     if (fEnableSelector)
-        connect(mCbPermanent, SIGNAL(toggled(bool)), this, SLOT(sltValidate()));
+        connect(mCbPermanent, &QCheckBox::toggled, this, &UIMachineSettingsSFDetails::sltValidate);
 
      /* Applying language settings: */
@@ -184 +185 @@
     sltValidate();
 }
-