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

Timestamp:

Sep 6, 2019 8:32:17 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8938. Converting connection syntaxes. contd.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBuffer.cpp (modified) (3 diffs)
• UIMachineWindow.cpp (modified) (3 diffs)
• UIMouseHandler.cpp (modified) (2 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (5 diffs)
• normal/UIMachineViewNormal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -1383 +1383 @@
 {
     /* Attach EMT connections: */
-    connect(this, SIGNAL(sigNotifyChange(int, int)),
-            m_pMachineView, SLOT(sltHandleNotifyChange(int, int)),
+    connect(this, &UIFrameBufferPrivate::sigNotifyChange,
+            m_pMachineView, &UIMachineView::sltHandleNotifyChange,
             Qt::QueuedConnection);
-    connect(this, SIGNAL(sigNotifyUpdate(int, int, int, int)),
-            m_pMachineView, SLOT(sltHandleNotifyUpdate(int, int, int, int)),
+    connect(this, &UIFrameBufferPrivate::sigNotifyUpdate,
+            m_pMachineView, &UIMachineView::sltHandleNotifyUpdate,
             Qt::QueuedConnection);
-    connect(this, SIGNAL(sigSetVisibleRegion(QRegion)),
-            m_pMachineView, SLOT(sltHandleSetVisibleRegion(QRegion)),
+    connect(this, &UIFrameBufferPrivate::sigSetVisibleRegion,
+            m_pMachineView, &UIMachineView::sltHandleSetVisibleRegion,
             Qt::QueuedConnection);
-    connect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
-            m_pMachineView, SLOT(sltHandle3DOverlayVisibilityChange(bool)),
+    connect(this, &UIFrameBufferPrivate::sigNotifyAbout3DOverlayVisibilityChange,
+            m_pMachineView, &UIMachineView::sltHandle3DOverlayVisibilityChange,
             Qt::QueuedConnection);
 
@@ -1406 +1406 @@
 {
     /* Detach EMT connections: */
-    disconnect(this, SIGNAL(sigNotifyChange(int, int)),
-               m_pMachineView, SLOT(sltHandleNotifyChange(int, int)));
-    disconnect(this, SIGNAL(sigNotifyUpdate(int, int, int, int)),
-               m_pMachineView, SLOT(sltHandleNotifyUpdate(int, int, int, int)));
-    disconnect(this, SIGNAL(sigSetVisibleRegion(QRegion)),
-               m_pMachineView, SLOT(sltHandleSetVisibleRegion(QRegion)));
-    disconnect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
-               m_pMachineView, SLOT(sltHandle3DOverlayVisibilityChange(bool)));
+    disconnect(this, &UIFrameBufferPrivate::sigNotifyChange,
+               m_pMachineView, &UIMachineView::sltHandleNotifyChange);
+    disconnect(this, &UIFrameBufferPrivate::sigNotifyUpdate,
+               m_pMachineView, &UIMachineView::sltHandleNotifyUpdate);
+    disconnect(this, &UIFrameBufferPrivate::sigSetVisibleRegion,
+               m_pMachineView, &UIMachineView::sltHandleSetVisibleRegion);
+    disconnect(this, &UIFrameBufferPrivate::sigNotifyAbout3DOverlayVisibilityChange,
+               m_pMachineView, &UIMachineView::sltHandle3DOverlayVisibilityChange);
 
     /* Detach GUI connections: */
@@ -1905 +1905 @@
 
 #include "UIFrameBuffer.moc"
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -465 +465 @@
 {
     /* We should watch for console events: */
-    connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
+    connect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineWindow::sltMachineStateChanged);
 }
 
@@ -511 +511 @@
 
     /* Listen for frame-buffer resize: */
-    connect(m_pMachineView, SIGNAL(sigFrameBufferResize()), this, SIGNAL(sigFrameBufferResize()));
+    connect(m_pMachineView, &UIMachineView::sigFrameBufferResize, this, &UIMachineWindow::sigFrameBufferResize);
 
     /* Add machine-view into main-layout: */
@@ -548 +548 @@
 {
     /* We should stop watching for console events: */
-    disconnect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
+    disconnect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineWindow::sltMachineStateChanged);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -109 +109 @@
         m_views[uIndex]->installEventFilter(this);
         /* Make machine-view notify mouse-handler about frame-buffer resize: */
-        connect(m_views[uIndex], SIGNAL(sigFrameBufferResize()), this, SLOT(sltMousePointerShapeChanged()));
+        connect(m_views[uIndex], &UIMachineView::sigFrameBufferResize, this, &UIMouseHandler::sltMousePointerShapeChanged);
     }
 
@@ -518 +518 @@
 {
     /* Machine state-change updater: */
-    connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
+    connect(uisession(), &UISession::sigMachineStateChange, this, &UIMouseHandler::sltMachineStateChanged);
 
     /* Mouse capability state-change updater: */
-    connect(uisession(), SIGNAL(sigMouseCapabilityChange()), this, SLOT(sltMouseCapabilityChanged()));
+    connect(uisession(), &UISession::sigMouseCapabilityChange, this, &UIMouseHandler::sltMouseCapabilityChanged);
 
     /* Mouse pointer shape state-change updaters: */
-    connect(uisession(), SIGNAL(sigMousePointerShapeChange()), this, SLOT(sltMousePointerShapeChanged()));
-    connect(this, SIGNAL(sigStateChange(int)), this, SLOT(sltMousePointerShapeChanged()));
+    connect(uisession(), &UISession::sigMousePointerShapeChange, this, &UIMouseHandler::sltMousePointerShapeChanged);
+    connect(this, &UIMouseHandler::sigStateChange, this, &UIMouseHandler::sltMousePointerShapeChanged);
 
     /* Mouse cursor position state-change updater: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -128 +128 @@
     {
         /* Configure menu-bar editor: */
-        connect(pMenuBarEditor, SIGNAL(destroyed(QObject*)),
-                this, SLOT(sltMenuBarSettingsClosed()));
+        connect(pMenuBarEditor, &UIMenuBarEditorWindow::destroyed,
+                this, &UIMachineLogicNormal::sltMenuBarSettingsClosed);
 #ifdef VBOX_WS_MAC
-        connect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
-                pMenuBarEditor, SLOT(sltActivateWindow()));
+        connect(this, &UIMachineLogicNormal::sigNotifyAbout3DOverlayVisibilityChange,
+                pMenuBarEditor, &UIMenuBarEditorWindow::sltActivateWindow);
 #endif /* VBOX_WS_MAC */
         /* Show window: */
@@ -183 +183 @@
     {
         /* Configure status-bar editor: */
-        connect(pStatusBarEditor, SIGNAL(destroyed(QObject*)),
-                this, SLOT(sltStatusBarSettingsClosed()));
+        connect(pStatusBarEditor, &UIStatusBarEditorWindow::destroyed,
+                this, &UIMachineLogicNormal::sltStatusBarSettingsClosed);
 #ifdef VBOX_WS_MAC
-        connect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
-                pStatusBarEditor, SLOT(sltActivateWindow()));
+        connect(this, &UIMachineLogicNormal::sigNotifyAbout3DOverlayVisibilityChange,
+                pStatusBarEditor, &UIStatusBarEditorWindow::sltActivateWindow);
 #endif /* VBOX_WS_MAC */
         /* Show window: */
@@ -280 +280 @@
 
     /* Prepare 'View' actions connections: */
-    connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
-            this, SLOT(sltChangeVisualStateToFullscreen()));
-    connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
-            this, SLOT(sltChangeVisualStateToSeamless()));
-    connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
-            this, SLOT(sltChangeVisualStateToScale()));
-    connect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings), SIGNAL(triggered(bool)),
-            this, SLOT(sltOpenMenuBarSettings()));
-#ifndef VBOX_WS_MAC
-    connect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility), SIGNAL(triggered(bool)),
-            this, SLOT(sltToggleMenuBar()));
-#endif /* !VBOX_WS_MAC */
-    connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings), SIGNAL(triggered(bool)),
-            this, SLOT(sltOpenStatusBarSettings()));
-    connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), SIGNAL(triggered(bool)),
-            this, SLOT(sltToggleStatusBar()));
-    connect(actionPool(), SIGNAL(sigNotifyAboutTriggeringViewScreenToggle(int, bool)),
-            this, SLOT(sltHandleActionTriggerViewScreenToggle(int, bool)));
-    connect(actionPool(), SIGNAL(sigNotifyAboutTriggeringViewScreenResize(int, const QSize&)),
-            this, SLOT(sltHandleActionTriggerViewScreenResize(int, const QSize&)));
+    connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &UIAction::triggered,
+            this, &UIMachineLogicNormal::sltChangeVisualStateToFullscreen);
+    connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &UIAction::triggered,
+            this, &UIMachineLogicNormal::sltChangeVisualStateToSeamless);
+    connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &UIAction::triggered,
+            this, &UIMachineLogicNormal::sltChangeVisualStateToScale);
+    connect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings), &UIAction::triggered,
+            this, &UIMachineLogicNormal::sltOpenMenuBarSettings);
+#ifndef VBOX_WS_MAC
+    connect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility), &UIAction::triggered,
+            this, &UIMachineLogicNormal::sltToggleMenuBar);
+#endif /* !VBOX_WS_MAC */
+    connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings), &UIAction::triggered,
+            this, &UIMachineLogicNormal::sltOpenStatusBarSettings);
+    connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), &UIAction::triggered,
+            this, &UIMachineLogicNormal::sltToggleStatusBar);
+    connect(qobject_cast<UIActionPoolRuntime*>(actionPool()), &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenToggle,
+            this, &UIMachineLogicNormal::sltHandleActionTriggerViewScreenToggle);
+    connect(qobject_cast<UIActionPoolRuntime*>(actionPool()), &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenResize,
+            this, &UIMachineLogicNormal::sltHandleActionTriggerViewScreenResize);
 }
 
@@ -325 +325 @@
     /* Listen for frame-buffer resize: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
-        connect(pMachineWindow, SIGNAL(sigFrameBufferResize()),
-                this, SIGNAL(sigFrameBufferResize()));
+        connect(pMachineWindow, &UIMachineWindow::sigFrameBufferResize,
+                this, &UIMachineLogicNormal::sigFrameBufferResize);
     emit sigFrameBufferResize();
 
@@ -373 +373 @@
 {
     /* "View" actions disconnections: */
-    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
-               this, SLOT(sltChangeVisualStateToFullscreen()));
-    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
-               this, SLOT(sltChangeVisualStateToSeamless()));
-    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
-               this, SLOT(sltChangeVisualStateToScale()));
-    disconnect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings), SIGNAL(triggered(bool)),
-               this, SLOT(sltOpenMenuBarSettings()));
-#ifndef VBOX_WS_MAC
-    disconnect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility), SIGNAL(triggered(bool)),
-               this, SLOT(sltToggleMenuBar()));
-#endif /* !VBOX_WS_MAC */
-    disconnect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings), SIGNAL(triggered(bool)),
-               this, SLOT(sltOpenStatusBarSettings()));
-    disconnect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), SIGNAL(triggered(bool)),
-               this, SLOT(sltToggleStatusBar()));
+    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &UIAction::triggered,
+               this, &UIMachineLogicNormal::sltChangeVisualStateToFullscreen);
+    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &UIAction::triggered,
+               this, &UIMachineLogicNormal::sltChangeVisualStateToSeamless);
+    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &UIAction::triggered,
+               this, &UIMachineLogicNormal::sltChangeVisualStateToScale);
+    disconnect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings), &UIAction::triggered,
+               this, &UIMachineLogicNormal::sltOpenMenuBarSettings);
+#ifndef VBOX_WS_MAC
+    disconnect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility), &UIAction::triggered,
+               this, &UIMachineLogicNormal::sltToggleMenuBar);
+#endif /* !VBOX_WS_MAC */
+    disconnect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings), &UIAction::triggered,
+               this, &UIMachineLogicNormal::sltOpenStatusBarSettings);
+    disconnect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), &UIAction::triggered,
+               this, &UIMachineLogicNormal::sltToggleStatusBar);
 
     /* Call to base-class: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -132 +132 @@
 
     /* Guest additions state-change updater: */
-    connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged()));
+    connect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineViewNormal::sltAdditionsStateChanged);
 }
 
@@ -258 +258 @@
     return maximumSize - (windowSize - centralWidgetSize.boundedTo(windowSize));
 }
-