Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp (revision 80652) @@ -380,10 +380,10 @@ /* Inform the MIME data object of any changes in the current action. */ - connect(pDrag, SIGNAL(actionChanged(Qt::DropAction)), - m_pMIMEData, SLOT(sltDropActionChanged(Qt::DropAction))); + connect(pDrag, &QDrag::actionChanged, + m_pMIMEData, &UIDnDMIMEData::sltDropActionChanged); /* Invoke this handler as data needs to be retrieved by our derived QMimeData class. */ - connect(m_pMIMEData, SIGNAL(sigGetData(Qt::DropAction, const QString&, QVariant::Type, QVariant&)), - this, SLOT(sltGetData(Qt::DropAction, const QString&, QVariant::Type, QVariant&))); + connect(m_pMIMEData, &UIDnDMIMEData::sigGetData, + this, &UIDnDHandler::sltGetData); /* @@ -807,3 +807,2 @@ return dropActs; } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 80652) @@ -469,6 +469,6 @@ setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/nw_disabled_16px.png")); /* Configure machine state-change listener: */ - connect(m_pSession, SIGNAL(sigMachineStateChange()), - this, SLOT(sltHandleMachineStateChange())); + connect(m_pSession, &UISession::sigMachineStateChange, + this, &UIIndicatorNetwork::sltHandleMachineStateChange); /* Fetch maximum network adapters count: */ const CVirtualBox vbox = uiCommon().virtualBox(); @@ -480,5 +480,5 @@ { /* Configure auto-update timer: */ - connect(m_pTimerAutoUpdate, SIGNAL(timeout()), SLOT(sltUpdateNetworkIPs())); + connect(m_pTimerAutoUpdate, &QTimer::timeout, this, &UIIndicatorNetwork::sltUpdateNetworkIPs); /* Start timer immediately if machine is running: */ sltHandleMachineStateChange(); @@ -989,6 +989,6 @@ /* Configure machine state-change listener: */ - connect(m_pSession, SIGNAL(sigMachineStateChange()), - this, SLOT(sltHandleMachineStateChange())); + connect(m_pSession, &UISession::sigMachineStateChange, + this, &UIIndicatorFeatures::sltHandleMachineStateChange); m_pTimerAutoUpdate = new QTimer(this); if (m_pTimerAutoUpdate) @@ -1147,5 +1147,6 @@ setStateIcon(4, UIIconPool::iconSet(":/mouse_can_seamless_uncaptured_16px.png")); /* Configure connection: */ - connect(pSession, SIGNAL(sigMouseStateChange(int)), this, SLOT(setState(int))); + connect(pSession, &UISession::sigMouseStateChange, + this, static_cast(&UIIndicatorMouse::setState)); setState(pSession->mouseState()); /* Translate finally: */ @@ -1225,5 +1226,6 @@ setStateIcon(7, UIIconPool::iconSet(":/hostkey_captured_pressed_checked_16px.png")); /* Configure connection: */ - connect(pSession, SIGNAL(sigKeyboardStateChange(int)), this, SLOT(setState(int))); + connect(pSession, &UISession::sigKeyboardStateChange, + this, static_cast(&UIIndicatorKeyboard::setState)); setState(pSession->keyboardState()); /* Translate finally: */ @@ -1264,6 +1266,6 @@ { /* Make sure host-combination label will be updated: */ - connect(gEDataManager, SIGNAL(sigRuntimeUIHostKeyCombinationChange()), - this, SLOT(sltUpdateAppearance())); + connect(gEDataManager, &UIExtraDataManager::sigRuntimeUIHostKeyCombinationChange, + this, &UIIndicatorKeyboardExtension::sltUpdateAppearance); /* Translate finally: */ retranslateUi(); @@ -1427,6 +1429,6 @@ { /* Listen for the status-bar configuration changes: */ - connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange(const QUuid &)), - this, SLOT(sltHandleConfigurationChange(const QUuid &))); + connect(gEDataManager, &UIExtraDataManager::sigStatusBarConfigurationChange, + this, &UIIndicatorsPool::sltHandleConfigurationChange); } @@ -1456,6 +1458,6 @@ { /* Configure auto-update timer: */ - connect(m_pTimerAutoUpdate, SIGNAL(timeout()), - this, SLOT(sltAutoUpdateIndicatorStates())); + connect(m_pTimerAutoUpdate, &QTimer::timeout, + this, &UIIndicatorsPool::sltAutoUpdateIndicatorStates); setAutoUpdateIndicatorStates(true); } @@ -1551,6 +1553,6 @@ } /* Configure indicator: */ - connect(m_pool.value(indicatorType), SIGNAL(sigContextMenuRequest(QIStatusBarIndicator*, QContextMenuEvent*)), - this, SLOT(sltContextMenuRequest(QIStatusBarIndicator*, QContextMenuEvent*))); + connect(m_pool.value(indicatorType), &QIStatusBarIndicator::sigContextMenuRequest, + this, &UIIndicatorsPool::sltContextMenuRequest); /* Insert indicator into main-layout at proper position: */ m_pMainLayout->insertWidget(indicatorPosition(indicatorType), m_pool.value(indicatorType)); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 80652) @@ -1009,5 +1009,5 @@ /* Machine state-change updater: */ - connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged())); + connect(uisession(), &UISession::sigMachineStateChange, this, &UIKeyboardHandler::sltMachineStateChanged); /* Pressed keys: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp (revision 80652) @@ -237,6 +237,6 @@ /* Prepare async visual state type change handler: */ qRegisterMetaType(); - connect(this, SIGNAL(sigRequestAsyncVisualStateChange(UIVisualStateType)), - this, SLOT(sltChangeVisualState(UIVisualStateType)), + connect(this, &UIMachine::sigRequestAsyncVisualStateChange, + this, &UIMachine::sltChangeVisualState, Qt::QueuedConnection); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 80652) @@ -821,12 +821,12 @@ { /* Desktop resolution change (e.g. monitor hotplug): */ - connect(gpDesktop, SIGNAL(sigHostScreenResized(int)), this, - SLOT(sltDesktopResized())); + connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized, + this, &UIMachineView::sltDesktopResized); /* Scale-factor change: */ - connect(gEDataManager, SIGNAL(sigScaleFactorChange(const QUuid &)), - this, SLOT(sltHandleScaleFactorChange(const QUuid &))); + connect(gEDataManager, &UIExtraDataManager::sigScaleFactorChange, + this, &UIMachineView::sltHandleScaleFactorChange); /* Scaling-optimization change: */ - connect(gEDataManager, SIGNAL(sigScalingOptimizationTypeChange(const QUuid &)), - this, SLOT(sltHandleScalingOptimizationChange(const QUuid &))); + connect(gEDataManager, &UIExtraDataManager::sigScalingOptimizationTypeChange, + this, &UIMachineView::sltHandleScalingOptimizationChange); } @@ -834,5 +834,5 @@ { /* Machine state-change updater: */ - connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged())); + connect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineView::sltMachineStateChanged); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (revision 80652) @@ -493,10 +493,10 @@ /* Prepare 'View' actions connections: */ - connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToNormal())); - 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_T_Fullscreen), &UIAction::triggered, + this, &UIMachineLogicFullscreen::sltChangeVisualStateToNormal); + connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &UIAction::triggered, + this, &UIMachineLogicFullscreen::sltChangeVisualStateToSeamless); + connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &UIAction::triggered, + this, &UIMachineLogicFullscreen::sltChangeVisualStateToScale); } @@ -532,11 +532,11 @@ /* Listen for frame-buffer resize: */ foreach (UIMachineWindow *pMachineWindow, machineWindows()) - connect(pMachineWindow, SIGNAL(sigFrameBufferResize()), - this, SIGNAL(sigFrameBufferResize())); + connect(pMachineWindow, &UIMachineWindow::sigFrameBufferResize, + this, &UIMachineLogicFullscreen::sigFrameBufferResize); emit sigFrameBufferResize(); /* Connect multi-screen layout change handler: */ - connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChange()), - this, SLOT(sltScreenLayoutChanged())); + connect(m_pScreenLayout, &UIMultiScreenLayout::sigScreenLayoutChange, + this, &UIMachineLogicFullscreen::sltScreenLayoutChanged); #ifdef VBOX_WS_MAC @@ -548,23 +548,23 @@ { /* Logic => window signals: */ - connect(this, SIGNAL(sigNotifyAboutNativeFullscreenShouldBeEntered(UIMachineWindow*)), - pMachineWindow, SLOT(sltEnterNativeFullscreen(UIMachineWindow*))); - connect(this, SIGNAL(sigNotifyAboutNativeFullscreenShouldBeExited(UIMachineWindow*)), - pMachineWindow, SLOT(sltExitNativeFullscreen(UIMachineWindow*))); + connect(this, &UIMachineLogicFullscreen::sigNotifyAboutNativeFullscreenShouldBeEntered, + pMachineWindow, &UIMachineWindow::sltEnterNativeFullscreen); + connect(this, &UIMachineLogicFullscreen::sigNotifyAboutNativeFullscreenShouldBeExited, + pMachineWindow, &UIMachineWindow::sltExitNativeFullscreen); /* Window => logic signals: */ - connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenWillEnter()), - this, SLOT(sltHandleNativeFullscreenWillEnter()), + connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenWillEnter, + this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenWillEnter, Qt::QueuedConnection); - connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidEnter()), - this, SLOT(sltHandleNativeFullscreenDidEnter()), + connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenDidEnter, + this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenDidEnter, Qt::QueuedConnection); - connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenWillExit()), - this, SLOT(sltHandleNativeFullscreenWillExit()), + connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenWillExit, + this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenWillExit, Qt::QueuedConnection); - connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidExit()), - this, SLOT(sltHandleNativeFullscreenDidExit()), + connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenDidExit, + this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit, Qt::QueuedConnection); - connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenFailToEnter()), - this, SLOT(sltHandleNativeFullscreenFailToEnter()), + connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenFailToEnter, + this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenFailToEnter, Qt::QueuedConnection); } @@ -642,10 +642,10 @@ { /* "View" actions disconnections: */ - disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToNormal())); - 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_T_Fullscreen), &QAction::triggered, + this, &UIMachineLogicFullscreen::sltChangeVisualStateToNormal); + disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered, + this, &UIMachineLogicFullscreen::sltChangeVisualStateToSeamless); + disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &QAction::triggered, + this, &UIMachineLogicFullscreen::sltChangeVisualStateToScale); /* Call to base-class: */ @@ -876,3 +876,2 @@ } #endif /* VBOX_WS_MAC */ - Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp (revision 80652) @@ -118,5 +118,5 @@ /* Guest additions state-change updater: */ - connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged())); + connect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineViewFullscreen::sltAdditionsStateChanged); } @@ -215,3 +215,2 @@ return workingArea().size(); } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (revision 80652) @@ -274,12 +274,12 @@ /* Configure mini-toolbar: */ m_pMiniToolBar->addMenus(actionPool()->menus()); - connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), - this, SLOT(sltShowMinimized()), Qt::QueuedConnection); - connect(m_pMiniToolBar, SIGNAL(sigExitAction()), - actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger())); - connect(m_pMiniToolBar, SIGNAL(sigCloseAction()), - actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger())); - connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutWindowActivationStolen()), - this, SLOT(sltRevokeWindowActivation()), Qt::QueuedConnection); + connect(m_pMiniToolBar, &UIMiniToolBar::sigMinimizeAction, + this, &UIMachineWindowFullscreen::sltShowMinimized, Qt::QueuedConnection); + connect(m_pMiniToolBar, &UIMiniToolBar::sigExitAction, + actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &UIAction::trigger); + connect(m_pMiniToolBar, &UIMiniToolBar::sigCloseAction, + actionPool()->action(UIActionIndex_M_Application_S_Close), &UIAction::trigger); + connect(m_pMiniToolBar, &UIMiniToolBar::sigNotifyAboutWindowActivationStolen, + this, &UIMachineWindowFullscreen::sltRevokeWindowActivation, Qt::QueuedConnection); } } @@ -609,3 +609,2 @@ } #endif /* VBOX_WS_WIN */ - Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 80652) @@ -249,10 +249,10 @@ connect(machineLogic()->uisession(), &UISession::sigSharedFolderChange, this, &UIMachineWindowNormal::sltSharedFolderChange); - connect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()), - this, SLOT(sltRecordingChange())); + connect(machineLogic()->uisession(), &UISession::sigRecordingChange, + this, &UIMachineWindowNormal::sltRecordingChange); connect(machineLogic()->uisession(), &UISession::sigCPUExecutionCapChange, this, &UIMachineWindowNormal::sltCPUExecutionCapChange); - connect(machineLogic()->uisession(), SIGNAL(sigInitialized()), - this, SLOT(sltHandleSessionInitialized())); + connect(machineLogic()->uisession(), &UISession::sigInitialized, + this, &UIMachineWindowNormal::sltHandleSessionInitialized); } @@ -266,8 +266,8 @@ /* Configure menu-bar: */ menuBar()->setContextMenuPolicy(Qt::CustomContextMenu); - connect(menuBar(), SIGNAL(customContextMenuRequested(const QPoint&)), - this, SLOT(sltHandleMenuBarContextMenuRequest(const QPoint&))); - connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QUuid &)), - this, SLOT(sltHandleMenuBarConfigurationChange(const QUuid &))); + connect(menuBar(), &UIMenuBar::customContextMenuRequested, + this, &UIMachineWindowNormal::sltHandleMenuBarContextMenuRequest); + connect(gEDataManager, &UIExtraDataManager::sigMenuBarConfigurationChange, + this, &UIMachineWindowNormal::sltHandleMenuBarConfigurationChange); /* Update menu-bar: */ updateMenu(); @@ -287,6 +287,6 @@ /* Configure status-bar: */ statusBar()->setContextMenuPolicy(Qt::CustomContextMenu); - connect(statusBar(), SIGNAL(customContextMenuRequested(const QPoint&)), - this, SLOT(sltHandleStatusBarContextMenuRequest(const QPoint&))); + connect(statusBar(), &QIStatusBar::customContextMenuRequested, + this, &UIMachineWindowNormal::sltHandleStatusBarContextMenuRequest); /* Create indicator-pool: */ m_pIndicatorsPool = new UIIndicatorsPool(machineLogic()->uisession()); @@ -294,16 +294,16 @@ { /* Configure indicator-pool: */ - connect(m_pIndicatorsPool, SIGNAL(sigContextMenuRequest(IndicatorType, const QPoint&)), - this, SLOT(sltHandleIndicatorContextMenuRequest(IndicatorType, const QPoint&))); + connect(m_pIndicatorsPool, &UIIndicatorsPool::sigContextMenuRequest, + this, &UIMachineWindowNormal::sltHandleIndicatorContextMenuRequest); /* Add indicator-pool into status-bar: */ statusBar()->addPermanentWidget(m_pIndicatorsPool, 0); } /* Post-configure status-bar: */ - connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange(const QUuid &)), - this, SLOT(sltHandleStatusBarConfigurationChange(const QUuid &))); + connect(gEDataManager, &UIExtraDataManager::sigStatusBarConfigurationChange, + this, &UIMachineWindowNormal::sltHandleStatusBarConfigurationChange); #ifdef VBOX_WS_MAC /* Make sure the status-bar is aware of action hovering: */ - connect(actionPool(), SIGNAL(sigActionHovered(UIAction *)), - this, SLOT(sltActionHovered(UIAction *))); + connect(actionPool(), &UIActionPool::sigActionHovered, + this, &UIMachineWindowNormal::sltActionHovered); #endif /* VBOX_WS_MAC */ } @@ -458,6 +458,6 @@ disconnect(machineLogic()->uisession(), &UISession::sigSharedFolderChange, this, &UIMachineWindowNormal::sltSharedFolderChange); - disconnect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()), - this, SLOT(sltRecordingChange())); + disconnect(machineLogic()->uisession(), &UISession::sigRecordingChange, + this, &UIMachineWindowNormal::sltRecordingChange); disconnect(machineLogic()->uisession(), &UISession::sigCPUExecutionCapChange, this, &UIMachineWindowNormal::sltCPUExecutionCapChange); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp (revision 80652) @@ -117,10 +117,10 @@ /* Prepare 'View' actions connections: */ - connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToNormal())); - 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), &QAction::triggered, + this, &UIMachineLogicScale::sltChangeVisualStateToNormal); + connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered, + this, &UIMachineLogicScale::sltChangeVisualStateToFullscreen); + connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered, + this, &UIMachineLogicScale::sltChangeVisualStateToSeamless); } @@ -148,6 +148,6 @@ /* Listen for frame-buffer resize: */ foreach (UIMachineWindow *pMachineWindow, machineWindows()) - connect(pMachineWindow, SIGNAL(sigFrameBufferResize()), - this, SIGNAL(sigFrameBufferResize())); + connect(pMachineWindow, &UIMachineWindow::sigFrameBufferResize, + this, &UIMachineLogicScale::sigFrameBufferResize); emit sigFrameBufferResize(); @@ -196,10 +196,10 @@ { /* "View" actions disconnections: */ - disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToNormal())); - 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), &QAction::triggered, + this, &UIMachineLogicScale::sltChangeVisualStateToNormal); + disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered, + this, &UIMachineLogicScale::sltChangeVisualStateToFullscreen); + disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered, + this, &UIMachineLogicScale::sltChangeVisualStateToSeamless); /* Call to base-class: */ @@ -226,3 +226,2 @@ UIMachineLogic::cleanupActionGroups(); } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp (revision 80652) @@ -244,10 +244,10 @@ /* Prepare 'View' actions connections: */ - connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToNormal())); - connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToFullscreen())); - connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToScale())); + connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered, + this, &UIMachineLogicSeamless::sltChangeVisualStateToNormal); + connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered, + this, &UIMachineLogicSeamless::sltChangeVisualStateToFullscreen); + connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &QAction::triggered, + this, &UIMachineLogicSeamless::sltChangeVisualStateToScale); } @@ -273,11 +273,11 @@ /* Listen for frame-buffer resize: */ foreach (UIMachineWindow *pMachineWindow, machineWindows()) - connect(pMachineWindow, SIGNAL(sigFrameBufferResize()), - this, SIGNAL(sigFrameBufferResize())); + connect(pMachineWindow, &UIMachineWindow::sigFrameBufferResize, + this, &UIMachineLogicSeamless::sigFrameBufferResize); emit sigFrameBufferResize(); /* Connect multi-screen layout change handler: */ - connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChange()), - this, SLOT(sltScreenLayoutChanged())); + connect(m_pScreenLayout, &UIMultiScreenLayout::sigScreenLayoutChange, + this, &UIMachineLogicSeamless::sltScreenLayoutChanged); /* Mark machine-window(s) created: */ @@ -343,10 +343,10 @@ { /* "View" actions disconnections: */ - disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToNormal())); - disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToFullscreen())); - disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)), - this, SLOT(sltChangeVisualStateToScale())); + disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered, + this, &UIMachineLogicSeamless::sltChangeVisualStateToNormal); + disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered, + this, &UIMachineLogicSeamless::sltChangeVisualStateToFullscreen); + disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &QAction::triggered, + this, &UIMachineLogicSeamless::sltChangeVisualStateToScale); /* Call to base-class: */ @@ -377,3 +377,2 @@ UIMachineLogic::cleanupActionGroups(); } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp (revision 80652) @@ -129,5 +129,5 @@ /* Guest additions state-change updater: */ - connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged())); + connect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineViewSeamless::sltAdditionsStateChanged); } @@ -219,3 +219,2 @@ return workingArea().size(); } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (revision 80651) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (revision 80652) @@ -139,12 +139,12 @@ /* Configure mini-toolbar: */ m_pMiniToolBar->addMenus(actionPool()->menus()); - connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), - this, SLOT(sltShowMinimized()), Qt::QueuedConnection); - connect(m_pMiniToolBar, SIGNAL(sigExitAction()), - actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SLOT(trigger())); - connect(m_pMiniToolBar, SIGNAL(sigCloseAction()), - actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger())); - connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutWindowActivationStolen()), - this, SLOT(sltRevokeWindowActivation()), Qt::QueuedConnection); + connect(m_pMiniToolBar, &UIMiniToolBar::sigMinimizeAction, + this, &UIMachineWindowSeamless::sltShowMinimized, Qt::QueuedConnection); + connect(m_pMiniToolBar, &UIMiniToolBar::sigExitAction, + actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &UIAction::trigger); + connect(m_pMiniToolBar, &UIMiniToolBar::sigCloseAction, + actionPool()->action(UIActionIndex_M_Application_S_Close), &UIAction::trigger); + connect(m_pMiniToolBar, &UIMiniToolBar::sigNotifyAboutWindowActivationStolen, + this, &UIMachineWindowSeamless::sltRevokeWindowActivation, Qt::QueuedConnection); } } @@ -402,3 +402,2 @@ } #endif /* VBOX_WITH_MASKED_SEAMLESS */ -