Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (revision 80575) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (revision 80576) @@ -220,60 +220,60 @@ { /* Create direct (sync) connections for signals of main listener: */ - connect(m_pQtListener->getWrapped(), SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector)), - this, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)), - this, SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigCursorPositionChange(bool, unsigned long, unsigned long)), - this, SIGNAL(sigCursorPositionChange(bool, unsigned long, unsigned long)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)), - this, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigStateChange(KMachineState)), - this, SIGNAL(sigStateChange(KMachineState)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigAdditionsChange()), - this, SIGNAL(sigAdditionsChange()), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)), - this, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)), - this, SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigMediumChange(CMediumAttachment)), - this, SIGNAL(sigMediumChange(CMediumAttachment)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigVRDEChange()), - this, SIGNAL(sigVRDEChange()), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigRecordingChange()), - this, SIGNAL(sigRecordingChange()), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigUSBControllerChange()), - this, SIGNAL(sigUSBControllerChange()), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)), - this, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigSharedFolderChange()), - this, SIGNAL(sigSharedFolderChange()), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigCPUExecutionCapChange()), - this, SIGNAL(sigCPUExecutionCapChange()), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)), - this, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigRuntimeError(bool, QString, QString)), - this, SIGNAL(sigRuntimeError(bool, QString, QString)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigCanShowWindow(bool &, QString &)), - this, SLOT(sltCanShowWindow(bool &, QString &)), - Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigShowWindow(qint64 &)), - this, SLOT(sltShowWindow(qint64 &)), + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigMousePointerShapeChange, + this, &UIConsoleEventHandlerProxy::sigMousePointerShapeChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigMouseCapabilityChange, + this, &UIConsoleEventHandlerProxy::sigMouseCapabilityChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigCursorPositionChange, + this, &UIConsoleEventHandlerProxy::sigCursorPositionChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigKeyboardLedsChangeEvent, + this, &UIConsoleEventHandlerProxy::sigKeyboardLedsChangeEvent, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigStateChange, + this, &UIConsoleEventHandlerProxy::sigStateChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigAdditionsChange, + this, &UIConsoleEventHandlerProxy::sigAdditionsChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigNetworkAdapterChange, + this, &UIConsoleEventHandlerProxy::sigNetworkAdapterChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigStorageDeviceChange, + this, &UIConsoleEventHandlerProxy::sigStorageDeviceChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigMediumChange, + this, &UIConsoleEventHandlerProxy::sigMediumChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigVRDEChange, + this, &UIConsoleEventHandlerProxy::sigVRDEChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigRecordingChange, + this, &UIConsoleEventHandlerProxy::sigRecordingChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigUSBControllerChange, + this, &UIConsoleEventHandlerProxy::sigUSBControllerChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigUSBDeviceStateChange, + this, &UIConsoleEventHandlerProxy::sigUSBDeviceStateChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigSharedFolderChange, + this, &UIConsoleEventHandlerProxy::sigSharedFolderChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigCPUExecutionCapChange, + this, &UIConsoleEventHandlerProxy::sigCPUExecutionCapChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestMonitorChange, + this, &UIConsoleEventHandlerProxy::sigGuestMonitorChange, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigRuntimeError, + this, &UIConsoleEventHandlerProxy::sigRuntimeError, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigCanShowWindow, + this, &UIConsoleEventHandlerProxy::sltCanShowWindow, + Qt::DirectConnection); + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigShowWindow, + this, &UIConsoleEventHandlerProxy::sltShowWindow, Qt::DirectConnection); connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigAudioAdapterChange, @@ -388,62 +388,62 @@ { /* Create queued (async) connections for signals of event proxy object: */ - connect(m_pProxy, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector)), - this, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)), - this, SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigCursorPositionChange(bool, unsigned long, unsigned long)), - this, SIGNAL(sigCursorPositionChange(bool, unsigned long, unsigned long)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)), - this, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigStateChange(KMachineState)), - this, SIGNAL(sigStateChange(KMachineState)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigAdditionsChange()), - this, SIGNAL(sigAdditionsChange()), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)), - this, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)), - this, SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigMediumChange(CMediumAttachment)), - this, SIGNAL(sigMediumChange(CMediumAttachment)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigVRDEChange()), - this, SIGNAL(sigVRDEChange()), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigRecordingChange()), - this, SIGNAL(sigRecordingChange()), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigUSBControllerChange()), - this, SIGNAL(sigUSBControllerChange()), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)), - this, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigSharedFolderChange()), - this, SIGNAL(sigSharedFolderChange()), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigCPUExecutionCapChange()), - this, SIGNAL(sigCPUExecutionCapChange()), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)), - this, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)), - Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigRuntimeError(bool, QString, QString)), - this, SIGNAL(sigRuntimeError(bool, QString, QString)), + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigMousePointerShapeChange, + this, &UIConsoleEventHandler::sigMousePointerShapeChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigMouseCapabilityChange, + this, &UIConsoleEventHandler::sigMouseCapabilityChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigCursorPositionChange, + this, &UIConsoleEventHandler::sigCursorPositionChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigKeyboardLedsChangeEvent, + this, &UIConsoleEventHandler::sigKeyboardLedsChangeEvent, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigStateChange, + this, &UIConsoleEventHandler::sigStateChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigAdditionsChange, + this, &UIConsoleEventHandler::sigAdditionsChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigNetworkAdapterChange, + this, &UIConsoleEventHandler::sigNetworkAdapterChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigStorageDeviceChange, + this, &UIConsoleEventHandler::sigStorageDeviceChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigMediumChange, + this, &UIConsoleEventHandler::sigMediumChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigVRDEChange, + this, &UIConsoleEventHandler::sigVRDEChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigRecordingChange, + this, &UIConsoleEventHandler::sigRecordingChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigUSBControllerChange, + this, &UIConsoleEventHandler::sigUSBControllerChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigUSBDeviceStateChange, + this, &UIConsoleEventHandler::sigUSBDeviceStateChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigSharedFolderChange, + this, &UIConsoleEventHandler::sigSharedFolderChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigCPUExecutionCapChange, + this, &UIConsoleEventHandler::sigCPUExecutionCapChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigGuestMonitorChange, + this, &UIConsoleEventHandler::sigGuestMonitorChange, + Qt::QueuedConnection); + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigRuntimeError, + this, &UIConsoleEventHandler::sigRuntimeError, Qt::QueuedConnection); #ifdef RT_OS_DARWIN - connect(m_pProxy, SIGNAL(sigShowWindow(qint64 &)), - this, SIGNAL(sigShowWindow(qint64 &)), + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigShowWindow, + this, &UIConsoleEventHandler::sigShowWindow, Qt::QueuedConnection); #endif /* RT_OS_DARWIN */ - connect(m_pProxy, SIGNAL(sigAudioAdapterChange()), - this, SIGNAL(sigAudioAdapterChange()), + connect(m_pProxy, &UIConsoleEventHandlerProxy::sigAudioAdapterChange, + this, &UIConsoleEventHandler::sigAudioAdapterChange, Qt::QueuedConnection); connect(m_pProxy, &UIConsoleEventHandlerProxy::sigClipboardModeChange, Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 80575) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 80576) @@ -1103,6 +1103,6 @@ { /* Configure Mac OS X menu-bar: */ - connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QUuid &)), - this, SLOT(sltHandleMenuBarConfigurationChange(const QUuid &))); + connect(gEDataManager, &UIExtraDataManager::sigMenuBarConfigurationChange, + this, &UISession::sltHandleMenuBarConfigurationChange); /* Update Mac OS X menu-bar: */ updateMenu(); @@ -1114,5 +1114,5 @@ void UISession::prepareConnections() { - connect(this, SIGNAL(sigInitialized()), this, SLOT(sltMarkInitialized())); + connect(this, &UISession::sigInitialized, this, &UISession::sltMarkInitialized); #ifdef VBOX_WS_MAC @@ -1121,14 +1121,14 @@ #else /* !VBOX_WS_MAC */ /* Install Qt display reconfiguration callbacks: */ - connect(gpDesktop, SIGNAL(sigHostScreenCountChanged(int)), - this, SLOT(sltHandleHostScreenCountChange())); - connect(gpDesktop, SIGNAL(sigHostScreenResized(int)), - this, SLOT(sltHandleHostScreenGeometryChange())); + connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenCountChanged, + this, &UISession::sltHandleHostScreenCountChange); + connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized, + this, &UISession::sltHandleHostScreenGeometryChange); # ifdef VBOX_WS_X11 - connect(gpDesktop, SIGNAL(sigHostScreenWorkAreaRecalculated(int)), - this, SLOT(sltHandleHostScreenAvailableAreaChange())); + connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaRecalculated, + this, &UISession::sltHandleHostScreenAvailableAreaChange); # else /* !VBOX_WS_X11 */ - connect(gpDesktop, SIGNAL(sigHostScreenWorkAreaResized(int)), - this, SLOT(sltHandleHostScreenAvailableAreaChange())); + connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaResized, + this, &UISession::sltHandleHostScreenAvailableAreaChange); # endif /* !VBOX_WS_X11 */ #endif /* !VBOX_WS_MAC */ @@ -1141,68 +1141,68 @@ /* Add console event connections: */ - connect(gConsoleEvents, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector)), - this, SLOT(sltMousePointerShapeChange(bool, bool, QPoint, QSize, QVector))); - - connect(gConsoleEvents, SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)), - this, SLOT(sltMouseCapabilityChange(bool, bool, bool, bool))); + connect(gConsoleEvents, &UIConsoleEventHandler::sigMousePointerShapeChange, + this, &UISession::sltMousePointerShapeChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigMouseCapabilityChange, + this, &UISession::sltMouseCapabilityChange); connect(gConsoleEvents, &UIConsoleEventHandler::sigCursorPositionChange, this, &UISession::sltCursorPositionChange); - connect(gConsoleEvents, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)), - this, SLOT(sltKeyboardLedsChangeEvent(bool, bool, bool))); - - connect(gConsoleEvents, SIGNAL(sigStateChange(KMachineState)), - this, SLOT(sltStateChange(KMachineState))); - - connect(gConsoleEvents, SIGNAL(sigAdditionsChange()), - this, SLOT(sltAdditionsChange())); - - connect(gConsoleEvents, SIGNAL(sigVRDEChange()), - this, SLOT(sltVRDEChange())); - - connect(gConsoleEvents, SIGNAL(sigRecordingChange()), - this, SLOT(sltRecordingChange())); - - connect(gConsoleEvents, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)), - this, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter))); - - connect(gConsoleEvents, SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)), - this, SLOT(sltHandleStorageDeviceChange(CMediumAttachment, bool, bool))); - - connect(gConsoleEvents, SIGNAL(sigMediumChange(CMediumAttachment)), - this, SIGNAL(sigMediumChange(CMediumAttachment))); - - connect(gConsoleEvents, SIGNAL(sigUSBControllerChange()), - this, SIGNAL(sigUSBControllerChange())); - - connect(gConsoleEvents, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)), - this, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo))); - - connect(gConsoleEvents, SIGNAL(sigSharedFolderChange()), - this, SIGNAL(sigSharedFolderChange())); - - connect(gConsoleEvents, SIGNAL(sigRuntimeError(bool, QString, QString)), - this, SIGNAL(sigRuntimeError(bool, QString, QString))); + connect(gConsoleEvents, &UIConsoleEventHandler::sigKeyboardLedsChangeEvent, + this, &UISession::sltKeyboardLedsChangeEvent); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigStateChange, + this, &UISession::sltStateChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigAdditionsChange, + this, &UISession::sltAdditionsChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigVRDEChange, + this, &UISession::sltVRDEChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigRecordingChange, + this, &UISession::sltRecordingChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigNetworkAdapterChange, + this, &UISession::sigNetworkAdapterChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigStorageDeviceChange, + this, &UISession::sltHandleStorageDeviceChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigMediumChange, + this, &UISession::sigMediumChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigUSBControllerChange, + this, &UISession::sigUSBControllerChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigUSBDeviceStateChange, + this, &UISession::sigUSBDeviceStateChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigSharedFolderChange, + this, &UISession::sigSharedFolderChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigRuntimeError, + this, &UISession::sigRuntimeError); #ifdef VBOX_WS_MAC - connect(gConsoleEvents, SIGNAL(sigShowWindow()), - this, SIGNAL(sigShowWindows()), Qt::QueuedConnection); + connect(gConsoleEvents, &UIConsoleEventHandler::sigShowWindow, + this, &UISession::sigShowWindows, Qt::QueuedConnection); #endif /* VBOX_WS_MAC */ - connect(gConsoleEvents, SIGNAL(sigCPUExecutionCapChange()), - this, SIGNAL(sigCPUExecutionCapChange())); - - connect(gConsoleEvents, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)), - this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect))); - - connect(gConsoleEvents, SIGNAL(sigAudioAdapterChange()), - this, SLOT(sltAudioAdapterChange())); - - connect(gConsoleEvents, SIGNAL(sigClipboardModeChange(KClipboardMode)), - this, SLOT(sltClipboardModeChange(KClipboardMode))); - - connect(gConsoleEvents, SIGNAL(sigDnDModeChange(KDnDMode)), - this, SLOT(sltDnDModeChange(KDnDMode))); + connect(gConsoleEvents, &UIConsoleEventHandler::sigCPUExecutionCapChange, + this, &UISession::sigCPUExecutionCapChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigGuestMonitorChange, + this, &UISession::sltGuestMonitorChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigAudioAdapterChange, + this, &UISession::sltAudioAdapterChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigClipboardModeChange, + this, &UISession::sltClipboardModeChange); + + connect(gConsoleEvents, &UIConsoleEventHandler::sigDnDModeChange, + this, &UISession::sltDnDModeChange); } @@ -1218,6 +1218,6 @@ m_pWatchdogDisplayChange->setInterval(500); m_pWatchdogDisplayChange->setSingleShot(true); - connect(m_pWatchdogDisplayChange, SIGNAL(timeout()), - this, SLOT(sltCheckIfHostDisplayChanged())); + connect(m_pWatchdogDisplayChange, &QTimer::timeout, + this, &UISession::sltCheckIfHostDisplayChanged); } #endif /* VBOX_WS_MAC */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 80575) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 80576) @@ -237,20 +237,20 @@ /* We should watch for console events: */ - connect(machineLogic()->uisession(), SIGNAL(sigMediumChange(const CMediumAttachment &)), - this, SLOT(sltMediumChange(const CMediumAttachment &))); - connect(machineLogic()->uisession(), SIGNAL(sigUSBControllerChange()), - this, SLOT(sltUSBControllerChange())); - connect(machineLogic()->uisession(), SIGNAL(sigUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)), - this, SLOT(sltUSBDeviceStateChange())); + connect(machineLogic()->uisession(), &UISession::sigMediumChange, + this, &UIMachineWindowNormal::sltMediumChange); + connect(machineLogic()->uisession(), &UISession::sigUSBControllerChange, + this, &UIMachineWindowNormal::sltUSBControllerChange); + connect(machineLogic()->uisession(), &UISession::sigUSBDeviceStateChange, + this, &UIMachineWindowNormal::sltUSBDeviceStateChange); connect(machineLogic()->uisession(), &UISession::sigAudioAdapterChange, this, &UIMachineWindowNormal::sltAudioAdapterChange); - connect(machineLogic()->uisession(), SIGNAL(sigNetworkAdapterChange(const CNetworkAdapter &)), - this, SLOT(sltNetworkAdapterChange())); - connect(machineLogic()->uisession(), SIGNAL(sigSharedFolderChange()), - this, SLOT(sltSharedFolderChange())); + connect(machineLogic()->uisession(), &UISession::sigNetworkAdapterChange, + this, &UIMachineWindowNormal::sltNetworkAdapterChange); + connect(machineLogic()->uisession(), &UISession::sigSharedFolderChange, + this, &UIMachineWindowNormal::sltSharedFolderChange); connect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()), this, SLOT(sltRecordingChange())); - connect(machineLogic()->uisession(), SIGNAL(sigCPUExecutionCapChange()), - this, SLOT(sltCPUExecutionCapChange())); + connect(machineLogic()->uisession(), &UISession::sigCPUExecutionCapChange, + this, &UIMachineWindowNormal::sltCPUExecutionCapChange); connect(machineLogic()->uisession(), SIGNAL(sigInitialized()), this, SLOT(sltHandleSessionInitialized())); @@ -446,20 +446,20 @@ { /* We should stop watching for console events: */ - disconnect(machineLogic()->uisession(), SIGNAL(sigMediumChange(const CMediumAttachment &)), - this, SLOT(sltMediumChange(const CMediumAttachment &))); - disconnect(machineLogic()->uisession(), SIGNAL(sigUSBControllerChange()), - this, SLOT(sltUSBControllerChange())); - disconnect(machineLogic()->uisession(), SIGNAL(sigUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)), - this, SLOT(sltUSBDeviceStateChange())); - disconnect(machineLogic()->uisession(), SIGNAL(sigNetworkAdapterChange(const CNetworkAdapter &)), - this, SLOT(sltNetworkAdapterChange())); + disconnect(machineLogic()->uisession(), &UISession::sigMediumChange, + this, &UIMachineWindowNormal::sltMediumChange); + disconnect(machineLogic()->uisession(), &UISession::sigUSBControllerChange, + this, &UIMachineWindowNormal::sltUSBControllerChange); + disconnect(machineLogic()->uisession(), &UISession::sigUSBDeviceStateChange, + this, &UIMachineWindowNormal::sltUSBDeviceStateChange); + disconnect(machineLogic()->uisession(), &UISession::sigNetworkAdapterChange, + this, &UIMachineWindowNormal::sltNetworkAdapterChange); disconnect(machineLogic()->uisession(), &UISession::sigAudioAdapterChange, this, &UIMachineWindowNormal::sltAudioAdapterChange); - disconnect(machineLogic()->uisession(), SIGNAL(sigSharedFolderChange()), - this, SLOT(sltSharedFolderChange())); + disconnect(machineLogic()->uisession(), &UISession::sigSharedFolderChange, + this, &UIMachineWindowNormal::sltSharedFolderChange); disconnect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()), this, SLOT(sltRecordingChange())); - disconnect(machineLogic()->uisession(), SIGNAL(sigCPUExecutionCapChange()), - this, SLOT(sltCPUExecutionCapChange())); + disconnect(machineLogic()->uisession(), &UISession::sigCPUExecutionCapChange, + this, &UIMachineWindowNormal::sltCPUExecutionCapChange); /* Call to base-class: */ @@ -659,3 +659,2 @@ #endif /* !VBOX_WS_MAC */ } -