Changeset 80720 in vbox

Timestamp:

Sep 11, 2019 8:45:49 AM (5 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIMachineSettingsDisplay.cpp (modified) (2 diffs)
• UIMachineSettingsPortForwardingDlg.cpp (modified) (2 diffs)
• UIMachineSettingsUSB.cpp (modified) (2 diffs)

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

@@ -1189 +1189 @@
 {
     /* Configure 'Screen' connections: */
-    connect(m_pVideoMemoryEditor, &UIVideoMemoryEditor::sigValidChanged, this, &UIMachineSettingsDisplay::revalidate);
-    connect(m_pSliderVideoScreenCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleGuestScreenCountSliderChange()));
-    connect(m_pEditorVideoScreenCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleGuestScreenCountEditorChange()));
+    connect(m_pVideoMemoryEditor, &UIVideoMemoryEditor::sigValidChanged,
+            this, &UIMachineSettingsDisplay::revalidate);
+    connect(m_pSliderVideoScreenCount, &QIAdvancedSlider::valueChanged,
+            this, &UIMachineSettingsDisplay::sltHandleGuestScreenCountSliderChange);
+    connect(m_pEditorVideoScreenCount, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            this, &UIMachineSettingsDisplay::sltHandleGuestScreenCountEditorChange);
     connect(m_pGraphicsControllerEditor, &UIGraphicsControllerEditor::sigValueChanged,
             this, &UIMachineSettingsDisplay::sltHandleGraphicsControllerComboChange);
@@ -1204 +1207 @@
 
     /* Configure 'Remote Display' connections: */
-    connect(m_pCheckboxRemoteDisplay, SIGNAL(toggled(bool)), this, SLOT(revalidate()));
-    connect(m_pEditorRemoteDisplayPort, SIGNAL(textChanged(const QString &)), this, SLOT(revalidate()));
-    connect(m_pEditorRemoteDisplayTimeout, SIGNAL(textChanged(const QString &)), this, SLOT(revalidate()));
+    connect(m_pCheckboxRemoteDisplay, &QCheckBox::toggled, this, &UIMachineSettingsDisplay::revalidate);
+    connect(m_pEditorRemoteDisplayPort, &QLineEdit::textChanged, this, &UIMachineSettingsDisplay::revalidate);
+    connect(m_pEditorRemoteDisplayTimeout, &QLineEdit::textChanged, this, &UIMachineSettingsDisplay::revalidate);
 
     /* Configure 'Recording' connections: */
-    connect(m_pCheckboxVideoCapture, SIGNAL(toggled(bool)), this, SLOT(sltHandleRecordingCheckboxToggle()));
-    connect(m_pComboVideoCaptureSize, SIGNAL(currentIndexChanged(int)), this, SLOT(sltHandleRecordingVideoFrameSizeComboboxChange()));
-    connect(m_pEditorVideoCaptureWidth, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoFrameWidthEditorChange()));
-    connect(m_pEditorVideoCaptureHeight, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoFrameHeightEditorChange()));
-    connect(m_pSliderVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoFrameRateSliderChange()));
-    connect(m_pEditorVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoFrameRateEditorChange()));
-    connect(m_pSliderVideoCaptureQuality, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoQualitySliderChange()));
-    connect(m_pEditorVideoCaptureBitRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoBitRateEditorChange()));
+    connect(m_pCheckboxVideoCapture, &QCheckBox::toggled,
+            this, &UIMachineSettingsDisplay::sltHandleRecordingCheckboxToggle);
+    connect(m_pComboVideoCaptureSize, static_cast<void(QComboBox::*)(int)>(&QComboBox:: currentIndexChanged),
+            this, &UIMachineSettingsDisplay::sltHandleRecordingVideoFrameSizeComboboxChange);
+    connect(m_pEditorVideoCaptureWidth, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            this, &UIMachineSettingsDisplay::sltHandleRecordingVideoFrameWidthEditorChange);
+    connect(m_pEditorVideoCaptureHeight, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            this, &UIMachineSettingsDisplay::sltHandleRecordingVideoFrameHeightEditorChange);
+    connect(m_pSliderVideoCaptureFrameRate, &QIAdvancedSlider::valueChanged,
+            this, &UIMachineSettingsDisplay::sltHandleRecordingVideoFrameRateSliderChange);
+    connect(m_pEditorVideoCaptureFrameRate, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            this, &UIMachineSettingsDisplay::sltHandleRecordingVideoFrameRateEditorChange);
+    connect(m_pSliderVideoCaptureQuality, &QIAdvancedSlider::valueChanged,
+            this, &UIMachineSettingsDisplay::sltHandleRecordingVideoQualitySliderChange);
+    connect(m_pEditorVideoCaptureBitRate, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            this, &UIMachineSettingsDisplay::sltHandleRecordingVideoBitRateEditorChange);
 
     connect(m_pComboBoxCaptureMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),

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

@@ -49 +49 @@
         {
             /* Configure button-box: */
-            connect(m_pButtonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(accept()));
-            connect(m_pButtonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
+            connect(m_pButtonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked,
+                    this, &UIMachineSettingsPortForwardingDlg::accept);
+            connect(m_pButtonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked,
+                    this, &UIMachineSettingsPortForwardingDlg::reject);
         }
         /* Add widgets into layout: */
@@ -93 +95 @@
     setWindowTitle(tr("Port Forwarding Rules"));
 }
-

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

@@ -161 +161 @@
     VBoxUSBMenu(QWidget *)
     {
-        connect(this, SIGNAL(aboutToShow()), this, SLOT(processAboutToShow()));
+        connect(this, &VBoxUSBMenu::aboutToShow, this, &VBoxUSBMenu::processAboutToShow);
     }
 
@@ -910 +910 @@
 {
     /* Configure validation connections: */
-    connect(mGbUSB, SIGNAL(stateChanged(int)), this, SLOT(revalidate()));
-    connect(mRbUSB1, SIGNAL(toggled(bool)), this, SLOT(revalidate()));
-    connect(mRbUSB2, SIGNAL(toggled(bool)), this, SLOT(revalidate()));
-    connect(mRbUSB3, SIGNAL(toggled(bool)), this, SLOT(revalidate()));
+    connect(mGbUSB, &QCheckBox::stateChanged, this, &UIMachineSettingsUSB::revalidate);
+    connect(mRbUSB1, &QRadioButton::toggled, this, &UIMachineSettingsUSB::revalidate);
+    connect(mRbUSB2, &QRadioButton::toggled, this, &UIMachineSettingsUSB::revalidate);
+    connect(mRbUSB3, &QRadioButton::toggled, this, &UIMachineSettingsUSB::revalidate);
 
     /* Configure widget connections: */
-    connect(mGbUSB, SIGNAL(toggled(bool)),
-            this, SLOT(sltHandleUsbAdapterToggle(bool)));
-    connect(mTwFilters, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-            this, SLOT(sltHandleCurrentItemChange(QTreeWidgetItem*)));
-    connect(mTwFilters, SIGNAL(customContextMenuRequested(const QPoint &)),
-            this, SLOT(sltHandleContextMenuRequest(const QPoint &)));
-    connect(mTwFilters, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
-            this, SLOT(sltEditFilter()));
-    connect(mTwFilters, SIGNAL(itemChanged(QTreeWidgetItem *, int)),
-            this, SLOT(sltHandleActivityStateChange(QTreeWidgetItem *)));
+    connect(mGbUSB, &QCheckBox::toggled,
+            this, &UIMachineSettingsUSB::sltHandleUsbAdapterToggle);
+    connect(mTwFilters, &QITreeWidget::currentItemChanged,
+            this, &UIMachineSettingsUSB::sltHandleCurrentItemChange);
+    connect(mTwFilters, &QITreeWidget::customContextMenuRequested,
+            this, &UIMachineSettingsUSB::sltHandleContextMenuRequest);
+    connect(mTwFilters, &QITreeWidget::itemDoubleClicked,
+            this, &UIMachineSettingsUSB::sltEditFilter);
+    connect(mTwFilters, &QITreeWidget::itemChanged,
+            this, &UIMachineSettingsUSB::sltHandleActivityStateChange);
 
     /* Configure USB device menu connections: */
-    connect(m_pMenuUSBDevices, SIGNAL(triggered(QAction*)),
-            this, SLOT(sltAddFilterConfirmed(QAction *)));
+    connect(m_pMenuUSBDevices, &VBoxUSBMenu::triggered,
+            this, &UIMachineSettingsUSB::sltAddFilterConfirmed);
 }