Changeset 80699 in vbox

Timestamp:

Sep 10, 2019 12:36:00 PM (5 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIMachineSettingsGeneral.cpp (modified) (2 diffs)
• UIMachineSettingsSystem.cpp (modified) (1 diff)

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

@@ -629 +629 @@
 {
     /* Configure 'Basic' connections: */
-    connect(m_pNameAndSystemEditor, SIGNAL(sigOsTypeChanged()),
-            this, SLOT(revalidate()));
-    connect(m_pNameAndSystemEditor, SIGNAL(sigNameChanged(const QString &)),
-            this, SLOT(revalidate()));
+    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged,
+            this, &UIMachineSettingsGeneral::revalidate);
+    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged,
+            this, &UIMachineSettingsGeneral::revalidate);
 
     /* Configure 'Encryption' connections: */
-    connect(m_pCheckBoxEncryption, SIGNAL(toggled(bool)),
-            this, SLOT(revalidate()));
-    connect(m_pComboCipher, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(sltMarkEncryptionCipherChanged()));
-    connect(m_pComboCipher, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(revalidate()));
-    connect(m_pEditorEncryptionPassword, SIGNAL(textEdited(const QString&)),
-            this, SLOT(sltMarkEncryptionPasswordChanged()));
-    connect(m_pEditorEncryptionPassword, SIGNAL(textEdited(const QString&)),
-            this, SLOT(revalidate()));
-    connect(m_pEditorEncryptionPasswordConfirm, SIGNAL(textEdited(const QString&)),
-            this, SLOT(sltMarkEncryptionPasswordChanged()));
-    connect(m_pEditorEncryptionPasswordConfirm, SIGNAL(textEdited(const QString&)),
-            this, SLOT(revalidate()));
+    connect(m_pCheckBoxEncryption, &QCheckBox::toggled,
+            this, &UIMachineSettingsGeneral::revalidate);
+    connect(m_pComboCipher, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &UIMachineSettingsGeneral::sltMarkEncryptionCipherChanged);
+    connect(m_pComboCipher, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &UIMachineSettingsGeneral::revalidate);
+    connect(m_pEditorEncryptionPassword, &QLineEdit::textEdited,
+            this, &UIMachineSettingsGeneral::sltMarkEncryptionPasswordChanged);
+    connect(m_pEditorEncryptionPassword, &QLineEdit::textEdited,
+            this, &UIMachineSettingsGeneral::revalidate);
+    connect(m_pEditorEncryptionPasswordConfirm, &QLineEdit::textEdited,
+            this, &UIMachineSettingsGeneral::sltMarkEncryptionPasswordChanged);
+    connect(m_pEditorEncryptionPasswordConfirm, &QLineEdit::textEdited,
+            this, &UIMachineSettingsGeneral::revalidate);
 }
 
@@ -916 +916 @@
                     {
                         pDlg = new UIProgress(comProgress);
-                        connect(pDlg, SIGNAL(sigProgressChange(ulong, QString, ulong, ulong)),
-                                this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
+                        connect(pDlg, &UIProgress::sigProgressChange,
+                                this, &UIMachineSettingsGeneral::sigOperationProgressChange,
                                 Qt::QueuedConnection);
-                        connect(pDlg, SIGNAL(sigProgressError(QString)),
-                                this, SIGNAL(sigOperationProgressError(QString)),
+                        connect(pDlg, &UIProgress::sigProgressError,
+                            this, &UIMachineSettingsGeneral::sigOperationProgressError,
                                 Qt::BlockingQueuedConnection);
                         pDlg->run(350);

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

@@ -846 +846 @@
 {
     /* Configure 'Motherboard' connections: */
-    connect(m_pComboChipsetType, SIGNAL(currentIndexChanged(int)), this, SLOT(revalidate()));
-    connect(m_pComboPointingHIDType, SIGNAL(currentIndexChanged(int)), this, SLOT(revalidate()));
+    connect(m_pComboChipsetType, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        this, &UIMachineSettingsSystem::revalidate);
+    connect(m_pComboPointingHIDType, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &UIMachineSettingsSystem::revalidate);
     connect(m_pBaseMemoryEditor, &UIBaseMemoryEditor::sigValidChanged, this, &UIMachineSettingsSystem::revalidate);
-    connect(m_pCheckBoxApic, SIGNAL(stateChanged(int)), this, SLOT(revalidate()));
+    connect(m_pCheckBoxApic, &QCheckBox::stateChanged, this, &UIMachineSettingsSystem::revalidate);
 
     /* Configure 'Processor' connections: */
-    connect(m_pSliderCPUCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleCPUCountSliderChange()));
-    connect(m_pEditorCPUCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleCPUCountEditorChange()));
-    connect(m_pSliderCPUExecCap, SIGNAL(valueChanged(int)), this, SLOT(sltHandleCPUExecCapSliderChange()));
-    connect(m_pEditorCPUExecCap, SIGNAL(valueChanged(int)), this, SLOT(sltHandleCPUExecCapEditorChange()));
-    connect(m_pCheckBoxNestedVirtualization, &QCheckBox::stateChanged,
-            this, &UIMachineSettingsSystem::revalidate);
+    connect(m_pSliderCPUCount, &QIAdvancedSlider::valueChanged, this, &UIMachineSettingsSystem::sltHandleCPUCountSliderChange);
+    connect(m_pEditorCPUCount, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            this, &UIMachineSettingsSystem::sltHandleCPUCountEditorChange);
+    connect(m_pSliderCPUExecCap, &QIAdvancedSlider::valueChanged, this, &UIMachineSettingsSystem::sltHandleCPUExecCapSliderChange);
+    connect(m_pEditorCPUExecCap, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            this, &UIMachineSettingsSystem::sltHandleCPUExecCapEditorChange);
+    connect(m_pCheckBoxNestedVirtualization, &QCheckBox::stateChanged, this, &UIMachineSettingsSystem::revalidate);
 
     /* Configure 'Acceleration' connections: */