Changeset 80666 in vbox for trunk/src

Timestamp:

Sep 9, 2019 10:47:00 AM (5 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UISettingsDialog.cpp (modified) (3 diffs)
• UISettingsSelector.cpp (modified) (2 diffs)
• UISettingsSerializer.cpp (modified) (5 diffs)
• global/UIGlobalSettingsProxy.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -343 +343 @@
     {
         /* Configure settings loader: */
-        connect(m_pSerializeProcess, SIGNAL(sigNotifyAboutProcessStarted()), this, SLOT(sltHandleProcessStarted()));
-        connect(m_pSerializeProcess, SIGNAL(sigNotifyAboutProcessProgressChanged(int)), this, SLOT(sltHandleProcessProgressChange(int)));
-        connect(m_pSerializeProcess, SIGNAL(sigNotifyAboutProcessFinished()), this, SLOT(sltMarkLoaded()));
+        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessStarted, this, &UISettingsDialog::sltHandleProcessStarted);
+        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessProgressChanged, this, &UISettingsDialog::sltHandleProcessProgressChange);
+        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessFinished, this, &UISettingsDialog::sltMarkLoaded);
 
         /* Raise current page priority: */
@@ -641 +641 @@
 #endif /* !VBOX_GUI_WITH_TOOLBAR_SETTINGS */
 
-        connect(m_pSelector, SIGNAL(sigCategoryChanged(int)), this, SLOT(sltCategoryChanged(int)));
+        connect(m_pSelector, &UISettingsSelectorTreeView::sigCategoryChanged, this, &UISettingsDialog::sltCategoryChanged);
     }
 
@@ -726 +726 @@
     /* Assign validator: */
     UIPageValidator *pValidator = new UIPageValidator(this, pPage);
-    connect(pValidator, SIGNAL(sigValidityChanged(UIPageValidator*)), this, SLOT(sltHandleValidityChange(UIPageValidator*)));
+    connect(pValidator, &UIPageValidator::sigValidityChanged, this, &UISettingsDialog::sltHandleValidityChange);
     pPage->setValidator(pValidator);
     m_pWarningPane->registerValidator(pValidator);

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp

@@ -320 +320 @@
     m_pTreeWidget->hideColumn(TreeWidgetSection_Link);
     /* Setup connections: */
-    connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-             this, SLOT(sltSettingsGroupChanged(QTreeWidgetItem *, QTreeWidgetItem*)));
+    connect(m_pTreeWidget, &QITreeWidget::currentItemChanged,
+            this, &UISettingsSelectorTreeView::sltSettingsGroupChanged);
 }
 
@@ -513 +513 @@
     m_pActionGroup = new QActionGroup(this);
     m_pActionGroup->setExclusive(true);
-    connect(m_pActionGroup, SIGNAL(triggered(QAction*)),
-            this, SLOT(sltSettingsGroupChanged(QAction*)));
+    connect(m_pActionGroup, &QActionGroup::triggered,
+            this, static_cast<void(UISettingsSelectorToolBar::*)(QAction*)>(&UISettingsSelectorToolBar::sltSettingsGroupChanged));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.cpp

@@ -48 +48 @@
 
     /* Handling internal signals, they are also redirected in their handlers: */
-    connect(this, SIGNAL(sigNotifyAboutPageProcessed(int)), this, SLOT(sltHandleProcessedPage(int)), Qt::QueuedConnection);
-    connect(this, SIGNAL(sigNotifyAboutPagesProcessed()), this, SLOT(sltHandleProcessedPages()), Qt::QueuedConnection);
+    connect(this, &UISettingsSerializer::sigNotifyAboutPageProcessed, this, &UISettingsSerializer::sltHandleProcessedPage, Qt::QueuedConnection);
+    connect(this, &UISettingsSerializer::sigNotifyAboutPagesProcessed, this, &UISettingsSerializer::sltHandleProcessedPages, Qt::QueuedConnection);
 
     /* Redirecting unhandled internal signals: */
-    connect(this, SIGNAL(finished()), this, SIGNAL(sigNotifyAboutProcessFinished()), Qt::QueuedConnection);
+    connect(this, &UISettingsSerializer::finished, this, &UISettingsSerializer::sigNotifyAboutProcessFinished, Qt::QueuedConnection);
 }
 
@@ -155 +155 @@
             m_iIdOfHighPriorityPage = -1;
         /* Process this page if its enabled: */
-        connect(pPage, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
-                this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)));
-        connect(pPage, SIGNAL(sigOperationProgressError(QString)),
-                this, SIGNAL(sigOperationProgressError(QString)));
+        connect(pPage, &UISettingsPage::sigOperationProgressChange,
+                this, &UISettingsSerializer::sigOperationProgressChange);
+        connect(pPage, &UISettingsPage::sigOperationProgressError,
+                this, &UISettingsSerializer::sigOperationProgressError);
         if (pPage->isEnabled())
         {
@@ -167 +167 @@
         }
         /* Remember what page was processed: */
-        disconnect(pPage, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
-                   this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)));
-        disconnect(pPage, SIGNAL(sigOperationProgressError(QString)),
-                   this, SIGNAL(sigOperationProgressError(QString)));
+        disconnect(pPage, &UISettingsPage::sigOperationProgressChange,
+                   this, &UISettingsSerializer::sigOperationProgressChange);
+        disconnect(pPage, &UISettingsPage::sigOperationProgressError,
+                   this, &UISettingsSerializer::sigOperationProgressError);
         pPage->setProcessed(true);
         /* Remove processed page from our map: */
@@ -241 +241 @@
     setWindowModality(Qt::WindowModal);
     setWindowTitle(parentWidget()->windowTitle());
-    connect(this, SIGNAL(sigAskForProcessStart()),
-            this, SLOT(sltStartProcess()), Qt::QueuedConnection);
+    connect(this, &UISettingsSerializerProgress::sigAskForProcessStart,
+            this, &UISettingsSerializerProgress::sltStartProcess, Qt::QueuedConnection);
 
     /* Create serializer: */
@@ -249 +249 @@
     {
         /* Install progress handler: */
-        connect(m_pSerializer, SIGNAL(sigNotifyAboutProcessProgressChanged(int)),
-                this, SLOT(sltHandleProcessProgressChange(int)));
-        connect(m_pSerializer, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
-                this, SLOT(sltHandleOperationProgressChange(ulong, QString, ulong, ulong)));
-        connect(m_pSerializer, SIGNAL(sigOperationProgressError(QString)),
-                this, SLOT(sltHandleOperationProgressError(QString)));
+        connect(m_pSerializer, &UISettingsSerializer::sigNotifyAboutProcessProgressChanged,
+                this, &UISettingsSerializerProgress::sltHandleProcessProgressChange);
+        connect(m_pSerializer, &UISettingsSerializer::sigOperationProgressChange,
+                this, &UISettingsSerializerProgress::sltHandleOperationProgressChange);
+        connect(m_pSerializer, &UISettingsSerializer::sigOperationProgressError,
+                this, &UISettingsSerializerProgress::sltHandleOperationProgressError);
     }
 

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

@@ -233 +233 @@
             pButtonGroup->addButton(m_pRadioProxyDisabled);
             pButtonGroup->addButton(m_pRadioProxyEnabled);
-            connect(pButtonGroup, SIGNAL(buttonClicked(QAbstractButton *)), this, SLOT(sltHandleProxyToggle()));
+            connect(pButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
+                    this, &UIGlobalSettingsProxy::sltHandleProxyToggle);
         }
 
@@ -241 +242 @@
             /* Configure editor: */
             m_pHostEditor->setValidator(new QRegExpValidator(QRegExp("\\S+"), m_pHostEditor));
-            connect(m_pHostEditor, SIGNAL(textEdited(const QString &)), this, SLOT(revalidate()));
+            connect(m_pHostEditor, &QILineEdit::textEdited, this, &UIGlobalSettingsProxy::revalidate);
         }
     }
@@ -281 +282 @@
     return fSuccess;
 }
-