Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 68190) @@ -111,6 +111,7 @@ #ifdef VBOX_WS_MAC /* Make sure each action notifies it's parent about hovering: */ - connect(this, SIGNAL(hovered()), parent(), SLOT(sltActionHovered())); -#endif /* VBOX_WS_MAC */ + connect(this, &UIAction::hovered, + static_cast(parent()), &UIActionPool::sltActionHovered); +#endif } @@ -230,6 +231,6 @@ { /* Prepare menu: */ - connect(menu(), SIGNAL(aboutToShow()), - parent(), SLOT(sltHandleMenuPrepare())); + connect(menu(), &UIMenu::aboutToShow, + actionPool(), &UIActionPool::sltHandleMenuPrepare); } } @@ -395,6 +396,6 @@ { /* Prepare menu: */ - connect(m_pMenu, SIGNAL(aboutToShow()), - parent(), SLOT(sltHandleMenuPrepare())); + connect(m_pMenu, &UIMenu::aboutToShow, + actionPool(), &UIActionPool::sltHandleMenuPrepare); /* Show menu: */ showMenu(); @@ -1156,30 +1157,30 @@ /* 'Application' menu connections: */ #ifdef RT_OS_DARWIN - connect(action(UIActionIndex_M_Application_S_About), SIGNAL(triggered()), - &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection); + connect(action(UIActionIndex_M_Application_S_About), &UIAction::triggered, + &msgCenter(), &UIMessageCenter::sltShowHelpAboutDialog, Qt::UniqueConnection); #endif /* RT_OS_DARWIN */ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER - connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()), - gNetworkManager, SLOT(show()), Qt::UniqueConnection); - connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()), - gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection); + connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered, + gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection); + connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered, + gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection); #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ - connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()), - &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection); + connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered, + &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection); /* 'Help' menu connections: */ - connect(action(UIActionIndex_Simple_Contents), SIGNAL(triggered()), - &msgCenter(), SLOT(sltShowHelpHelpDialog()), Qt::UniqueConnection); - connect(action(UIActionIndex_Simple_WebSite), SIGNAL(triggered()), - &msgCenter(), SLOT(sltShowHelpWebDialog()), Qt::UniqueConnection); - connect(action(UIActionIndex_Simple_BugTracker), SIGNAL(triggered()), - &msgCenter(), SLOT(sltShowBugTracker()), Qt::UniqueConnection); - connect(action(UIActionIndex_Simple_Forums), SIGNAL(triggered()), - &msgCenter(), SLOT(sltShowForums()), Qt::UniqueConnection); - connect(action(UIActionIndex_Simple_Oracle), SIGNAL(triggered()), - &msgCenter(), SLOT(sltShowOracle()), Qt::UniqueConnection); + connect(action(UIActionIndex_Simple_Contents), &UIAction::triggered, + &msgCenter(), &UIMessageCenter::sltShowHelpHelpDialog, Qt::UniqueConnection); + connect(action(UIActionIndex_Simple_WebSite), &UIAction::triggered, + &msgCenter(), &UIMessageCenter::sltShowHelpWebDialog, Qt::UniqueConnection); + connect(action(UIActionIndex_Simple_BugTracker), &UIAction::triggered, + &msgCenter(), &UIMessageCenter::sltShowBugTracker, Qt::UniqueConnection); + connect(action(UIActionIndex_Simple_Forums), &UIAction::triggered, + &msgCenter(), &UIMessageCenter::sltShowForums, Qt::UniqueConnection); + connect(action(UIActionIndex_Simple_Oracle), &UIAction::triggered, + &msgCenter(), &UIMessageCenter::sltShowOracle, Qt::UniqueConnection); #ifndef RT_OS_DARWIN - connect(action(UIActionIndex_Simple_About), SIGNAL(triggered()), - &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection); + connect(action(UIActionIndex_Simple_About), &UIAction::triggered, + &msgCenter(), &UIMessageCenter::sltShowHelpAboutDialog, Qt::UniqueConnection); #endif /* !RT_OS_DARWIN */ } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 68190) @@ -460,16 +460,18 @@ virtual QList menus() const = 0; -protected slots: +public slots: /** Handles menu prepare. */ void sltHandleMenuPrepare(); - - /** Loads keyboard shortcuts of action-pool into shortcuts-pool. */ - void sltApplyShortcuts() { updateShortcuts(); } #ifdef VBOX_WS_MAC /** Handles action hovered signal. */ void sltActionHovered(); -#endif /* VBOX_WS_MAC */ +#endif + +protected slots: + + /** Loads keyboard shortcuts of action-pool into shortcuts-pool. */ + void sltApplyShortcuts() { updateShortcuts(); } protected: Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.cpp (revision 68190) @@ -85,9 +85,9 @@ m_pStateStart = new QState(m_pAnimationMachine); m_pStateStart->assignProperty(parent(), "AnimationState", QString("Start")); - connect(m_pStateStart, SIGNAL(propertiesAssigned()), this, SIGNAL(sigStateEnteredStart())); + connect(m_pStateStart, &QState::propertiesAssigned, this, &UIAnimation::sigStateEnteredStart); /* Create 'final' state: */ m_pStateFinal = new QState(m_pAnimationMachine); m_pStateFinal->assignProperty(parent(), "AnimationState", QString("Final")); - connect(m_pStateFinal, SIGNAL(propertiesAssigned()), this, SIGNAL(sigStateEnteredFinal())); + connect(m_pStateFinal, &QState::propertiesAssigned, this, &UIAnimation::sigStateEnteredFinal); /* Prepare 'forward' animation: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp (revision 68190) @@ -405,8 +405,8 @@ /* Listen for screen signals: */ - connect(pHostScreen, SIGNAL(geometryChanged(const QRect &)), - this, SLOT(sltHandleHostScreenResized(const QRect &))); - connect(pHostScreen, SIGNAL(availableGeometryChanged(const QRect &)), - this, SLOT(sltHandleHostScreenWorkAreaResized(const QRect &))); + connect(pHostScreen, &QScreen::geometryChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenResized); + connect(pHostScreen, &QScreen::availableGeometryChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenWorkAreaResized); # ifdef VBOX_WS_X11 @@ -424,8 +424,8 @@ /* Forget about screen signals: */ - disconnect(pHostScreen, SIGNAL(geometryChanged(const QRect &)), - this, SLOT(sltHandleHostScreenResized(const QRect &))); - disconnect(pHostScreen, SIGNAL(availableGeometryChanged(const QRect &)), - this, SLOT(sltHandleHostScreenWorkAreaResized(const QRect &))); + disconnect(pHostScreen, &QScreen::geometryChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenResized); + disconnect(pHostScreen, &QScreen::availableGeometryChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenWorkAreaResized); # ifdef VBOX_WS_X11 @@ -513,16 +513,21 @@ /* Prepare connections: */ #if QT_VERSION < 0x050000 - connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int))); - connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int))); - connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(sltHandleHostScreenWorkAreaResized(int))); + connect(QApplication::desktop(), &QDesktopWidget::screenCountChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged); + connect(QApplication::desktop(), &QDesktopWidget::resized, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenResized); + connect(QApplication::desktop(), &QDesktopWidget::workAreaResized, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenWorkAreaResized); #else /* QT_VERSION >= 0x050000 */ - connect(qApp, SIGNAL(screenAdded(QScreen *)), this, SLOT(sltHostScreenAdded(QScreen *))); - connect(qApp, SIGNAL(screenRemoved(QScreen *)), this, SLOT(sltHostScreenRemoved(QScreen *))); + connect(qApp, &QGuiApplication::screenAdded, + this, &UIDesktopWidgetWatchdog::sltHostScreenAdded); + connect(qApp, &QGuiApplication::screenRemoved, + this, &UIDesktopWidgetWatchdog::sltHostScreenRemoved); foreach (QScreen *pHostScreen, qApp->screens()) { - connect(pHostScreen, SIGNAL(geometryChanged(const QRect &)), - this, SLOT(sltHandleHostScreenResized(const QRect &))); - connect(pHostScreen, SIGNAL(availableGeometryChanged(const QRect &)), - this, SLOT(sltHandleHostScreenWorkAreaResized(const QRect &))); + connect(pHostScreen, &QScreen::geometryChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenResized); + connect(pHostScreen, &QScreen::availableGeometryChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenWorkAreaResized); } #endif /* QT_VERSION >= 0x050000 */ @@ -538,16 +543,21 @@ /* Cleanup connections: */ #if QT_VERSION < 0x050000 - disconnect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int))); - disconnect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int))); - disconnect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(sltHandleHostScreenWorkAreaResized(int))); + disconnect(QApplication::desktop(), &QDesktopWidget::screenCountChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged); + disconnect(QApplication::desktop(), &QDesktopWidget::resized, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenResized); + disconnect(QApplication::desktop(), &QDesktopWidget::workAreaResized, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenWorkAreaResized); #else /* QT_VERSION >= 0x050000 */ - disconnect(qApp, SIGNAL(screenAdded(QScreen *)), this, SLOT(sltHostScreenAdded(QScreen *))); - disconnect(qApp, SIGNAL(screenRemoved(QScreen *)), this, SLOT(sltHostScreenRemoved(QScreen *))); + disconnect(qApp, &QGuiApplication::screenAdded, + this, &UIDesktopWidgetWatchdog::sltHostScreenAdded); + disconnect(qApp, &QGuiApplication::screenRemoved, + this, &UIDesktopWidgetWatchdog::sltHostScreenRemoved); foreach (QScreen *pHostScreen, qApp->screens()) { - disconnect(pHostScreen, SIGNAL(geometryChanged(const QRect &)), - this, SLOT(sltHandleHostScreenResized(const QRect &))); - disconnect(pHostScreen, SIGNAL(availableGeometryChanged(const QRect &)), - this, SLOT(sltHandleHostScreenWorkAreaResized(const QRect &))); + disconnect(pHostScreen, &QScreen::geometryChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenResized); + disconnect(pHostScreen, &QScreen::availableGeometryChanged, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenWorkAreaResized); } #endif /* QT_VERSION >= 0x050000 */ @@ -598,6 +608,6 @@ /* Connect worker listener: */ - connect(pWorker, SIGNAL(sigHostScreenAvailableGeometryCalculated(int, QRect)), - this, SLOT(sltHandleHostScreenAvailableGeometryCalculated(int, QRect))); + connect(pWorker, &UIInvisibleWindow::sigHostScreenAvailableGeometryCalculated, + this, &UIDesktopWidgetWatchdog::sltHandleHostScreenAvailableGeometryCalculated); /* Place worker to corresponding host-screen: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 68190) @@ -2804,5 +2804,5 @@ UIDownloaderUserManual *pDl = UIDownloaderUserManual::create(); /* After downloading finished => show User Manual: */ - connect(pDl, SIGNAL(sigDownloadFinished(const QString&)), this, SLOT(sltShowUserManual(const QString&))); + connect(pDl, &UIDownloaderUserManual::sigDownloadFinished, this, &UIMessageCenter::sltShowUserManual); /* Start downloading: */ pDl->start(); @@ -2875,4 +2875,7 @@ /* Prepare interthread connection: */ qRegisterMetaType(); + // Won't go until we are supporting C++11 or at least variadic templates everywhere. + // connect(this, &UIMessageCenter::sigToShowMessageBox, + // this, &UIMessageCenter::sltShowMessageBox, connect(this, SIGNAL(sigToShowMessageBox(QWidget*, MessageType, const QString&, const QString&, Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp (revision 68190) @@ -211,5 +211,5 @@ /* Register passed-window as the new 'top' in iterated-window-stack: */ iteratedWindowStack << pWindow; - connect(pWindow, SIGNAL(destroyed(QObject*)), this, SLOT(sltRemoveFromStack(QObject*))); + connect(pWindow, &QWidget::destroyed, this, &UIModalWindowManager::sltRemoveFromStack); return; } @@ -226,5 +226,5 @@ QList newWindowStack(QList() << pWindow); m_windows << newWindowStack; - connect(pWindow, SIGNAL(destroyed(QObject*)), this, SLOT(sltRemoveFromStack(QObject*))); + connect(pWindow, &QWidget::destroyed, this, &UIModalWindowManager::sltRemoveFromStack); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp (revision 68190) @@ -282,6 +282,6 @@ pPopupStack = m_stacks[strPopupStackID] = new UIPopupStack(strPopupStackID, m_stackOrientations[strPopupStackID]); /* Attach popup-stack connections: */ - connect(pPopupStack, SIGNAL(sigPopupPaneDone(QString, int)), this, SLOT(sltPopupPaneDone(QString, int))); - connect(pPopupStack, SIGNAL(sigRemove(QString)), this, SLOT(sltRemovePopupStack(QString))); + connect(pPopupStack, &UIPopupStack::sigPopupPaneDone, this, &UIPopupCenter::sltPopupPaneDone); + connect(pPopupStack, &UIPopupStack::sigRemove, this, &UIPopupCenter::sltRemovePopupStack); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp (revision 68190) @@ -241,6 +241,8 @@ { /* Connect to extra-data signals: */ - connect(gEDataManager, SIGNAL(sigSelectorUIShortcutChange()), this, SLOT(sltReloadSelectorShortcuts())); - connect(gEDataManager, SIGNAL(sigRuntimeUIShortcutChange()), this, SLOT(sltReloadMachineShortcuts())); + connect(gEDataManager, &UIExtraDataManager::sigSelectorUIShortcutChange, + this, &UIShortcutPool::sltReloadSelectorShortcuts); + connect(gEDataManager, &UIExtraDataManager::sigRuntimeUIShortcutChange, + this, &UIShortcutPool::sltReloadMachineShortcuts); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp (revision 68190) @@ -166,6 +166,6 @@ /* Prepare task: */ - connect(pTask, SIGNAL(sigComplete(UITask*)), - this, SLOT(sltHandleTaskComplete(UITask*)), Qt::QueuedConnection); + connect(pTask, &UITask::sigComplete, + this, &UIThreadPool::sltHandleTaskComplete, Qt::QueuedConnection); /* Lock initially: */ @@ -190,6 +190,6 @@ /* Prepare the new worker: */ UIThreadWorker *pWorker = new UIThreadWorker(this, idxFirstUnused); - connect(pWorker, SIGNAL(sigFinished(UIThreadWorker*)), - this, SLOT(sltHandleWorkerFinished(UIThreadWorker*)), Qt::QueuedConnection); + connect(pWorker, &UIThreadWorker::sigFinished, + this, &UIThreadPool::sltHandleWorkerFinished, Qt::QueuedConnection); m_workers[idxFirstUnused] = pWorker; ++m_cWorkers; Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (revision 68190) @@ -3527,8 +3527,8 @@ { /* Make sure QApplication cleanup us on exit: */ - connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(cleanup())); + connect(qApp, &QGuiApplication::aboutToQuit, this, &VBoxGlobal::cleanup); /* Make sure we handle host OS session shutdown as well: */ - connect(qApp, SIGNAL(commitDataRequest(QSessionManager &)), - this, SLOT(sltHandleCommitDataRequest(QSessionManager &))); + connect(qApp, &QGuiApplication::commitDataRequest, + this, &VBoxGlobal::sltHandleCommitDataRequest); #ifdef VBOX_WS_MAC @@ -3608,6 +3608,6 @@ /* Watch for the VBoxSVC availability changes: */ - connect(gVBoxEvents, SIGNAL(sigVBoxSVCAvailabilityChange(bool)), - this, SLOT(sltHandleVBoxSVCAvailabilityChange(bool))); + connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigVBoxSVCAvailabilityChange, + this, &VBoxGlobal::sltHandleVBoxSVCAvailabilityChange); /* Prepare thread-pool instance: */ @@ -3621,6 +3621,6 @@ retranslateUi(); - connect(gEDataManager, SIGNAL(sigLanguageChange(QString)), - this, SLOT(sltGUILanguageChange(QString))); + connect(gEDataManager, &UIExtraDataManager::sigLanguageChange, + this, &VBoxGlobal::sltGUILanguageChange); qApp->installEventFilter (this); @@ -3930,14 +3930,14 @@ { /* Prepare medium-enumerator: */ - connect(m_pMediumEnumerator, SIGNAL(sigMediumCreated(const QString&)), - this, SIGNAL(sigMediumCreated(const QString&))); - connect(m_pMediumEnumerator, SIGNAL(sigMediumDeleted(const QString&)), - this, SIGNAL(sigMediumDeleted(const QString&))); - connect(m_pMediumEnumerator, SIGNAL(sigMediumEnumerationStarted()), - this, SIGNAL(sigMediumEnumerationStarted())); - connect(m_pMediumEnumerator, SIGNAL(sigMediumEnumerated(const QString&)), - this, SIGNAL(sigMediumEnumerated(const QString&))); - connect(m_pMediumEnumerator, SIGNAL(sigMediumEnumerationFinished()), - this, SIGNAL(sigMediumEnumerationFinished())); + connect(m_pMediumEnumerator, &UIMediumEnumerator::sigMediumCreated, + this, &VBoxGlobal::sigMediumCreated); + connect(m_pMediumEnumerator, &UIMediumEnumerator::sigMediumDeleted, + this, &VBoxGlobal::sigMediumDeleted); + connect(m_pMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationStarted, + this, &VBoxGlobal::sigMediumEnumerationStarted); + connect(m_pMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerated, + this, &VBoxGlobal::sigMediumEnumerated); + connect(m_pMediumEnumerator, &UIMediumEnumerator::sigMediumEnumerationFinished, + this, &VBoxGlobal::sigMediumEnumerationFinished); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h (revision 68189) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h (revision 68190) @@ -38,5 +38,5 @@ : QObject(pParent), m_strName(strName) {} -private slots: +public slots: /** Assigns property value. */