1 files changed, 41 insertions, 45 deletions

diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 8f433d05fd..b2610ebf43 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -89,16 +89,16 @@ public:
     bool isQmlActive() const;
     void setSimpleDockWidgetArrangement();
     // Debuggable languages are registered with this function.
-    void addLanguage(DebuggerLanguage language, const Core::Context &context);
+    void addLanguage(DebuggerLanguage language, const Context &context);
 
     QDockWidget *dockWidget(const QString &objectName) const
         { return q->findChild<QDockWidget *>(objectName); }
 
 public slots:
     void resetDebuggerLayout();
-    void updateUiForProject(ProjectExplorer::Project *project);
-    void updateUiForTarget(ProjectExplorer::Target *target);
-    void updateUiForRunConfiguration(ProjectExplorer::RunConfiguration *rc);
+    void updateUiForProject(Project *project);
+    void updateUiForTarget(Target *target);
+    void updateUiForRunConfiguration(RunConfiguration *rc);
     void updateUiForCurrentRunConfiguration();
     void updateActiveLanguages();
     void updateDockWidgetSettings();
@@ -162,26 +162,24 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *mw)
 void DebuggerMainWindowPrivate::updateUiForProject(Project *project)
 {
     if (m_previousProject) {
-        disconnect(m_previousProject,
-            SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
-            this, SLOT(updateUiForTarget(ProjectExplorer::Target*)));
+        disconnect(m_previousProject, &Project::activeTargetChanged,
+            this, &DebuggerMainWindowPrivate::updateUiForTarget);
     }
     m_previousProject = project;
     if (!project) {
         updateUiForTarget(0);
         return;
     }
-    connect(project, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
-        SLOT(updateUiForTarget(ProjectExplorer::Target*)));
+    connect(project, &Project::activeTargetChanged,
+            this, &DebuggerMainWindowPrivate::updateUiForTarget);
     updateUiForTarget(project->activeTarget());
 }
 
 void DebuggerMainWindowPrivate::updateUiForTarget(Target *target)
 {
     if (m_previousTarget) {
-         disconnect(m_previousTarget,
-            SIGNAL(activeRunConfigurationChanged(ProjectExplorer::RunConfiguration*)),
-            this, SLOT(updateUiForRunConfiguration(ProjectExplorer::RunConfiguration*)));
+         disconnect(m_previousTarget, &Target::activeRunConfigurationChanged,
+                    this, &DebuggerMainWindowPrivate::updateUiForRunConfiguration);
     }
 
     m_previousTarget = target;
@@ -191,9 +189,8 @@ void DebuggerMainWindowPrivate::updateUiForTarget(Target *target)
         return;
     }
 
-    connect(target,
-        SIGNAL(activeRunConfigurationChanged(ProjectExplorer::RunConfiguration*)),
-        SLOT(updateUiForRunConfiguration(ProjectExplorer::RunConfiguration*)));
+    connect(target, &Target::activeRunConfigurationChanged,
+            this, &DebuggerMainWindowPrivate::updateUiForRunConfiguration);
     updateUiForRunConfiguration(target->activeRunConfiguration());
 }
 
@@ -201,16 +198,15 @@ void DebuggerMainWindowPrivate::updateUiForTarget(Target *target)
 void DebuggerMainWindowPrivate::updateUiForRunConfiguration(RunConfiguration *rc)
 {
     if (m_previousRunConfiguration)
-        disconnect(m_previousRunConfiguration->extraAspect<Debugger::DebuggerRunConfigurationAspect>(),
-                   SIGNAL(requestRunActionsUpdate()),
-                   this, SLOT(updateUiForCurrentRunConfiguration()));
+        disconnect(m_previousRunConfiguration, &RunConfiguration::requestRunActionsUpdate,
+                   this, &DebuggerMainWindowPrivate::updateUiForCurrentRunConfiguration);
     m_previousRunConfiguration = rc;
     updateUiForCurrentRunConfiguration();
     if (!rc)
         return;
-    connect(m_previousRunConfiguration->extraAspect<Debugger::DebuggerRunConfigurationAspect>(),
-            SIGNAL(requestRunActionsUpdate()),
-            SLOT(updateUiForCurrentRunConfiguration()));
+
+    connect(m_previousRunConfiguration, &RunConfiguration::requestRunActionsUpdate,
+            this, &DebuggerMainWindowPrivate::updateUiForCurrentRunConfiguration);
 }
 
 void DebuggerMainWindowPrivate::updateUiForCurrentRunConfiguration()
@@ -298,30 +294,30 @@ void DebuggerMainWindow::onModeChanged(IMode *mode)
 void DebuggerMainWindowPrivate::createViewsMenuItems()
 {
     Context debugcontext(Constants::C_DEBUGMODE);
-    m_viewsMenu = Core::ActionManager::actionContainer(Id(Core::Constants::M_WINDOW_VIEWS));
+    m_viewsMenu = ActionManager::actionContainer(Id(Core::Constants::M_WINDOW_VIEWS));
     QTC_ASSERT(m_viewsMenu, return);
 
     QAction *openMemoryEditorAction = new QAction(this);
     openMemoryEditorAction->setText(tr("Memory..."));
-    connect(openMemoryEditorAction, SIGNAL(triggered()),
-       SLOT(openMemoryEditor()));
+    connect(openMemoryEditorAction, &QAction::triggered,
+            this, &DebuggerMainWindowPrivate::openMemoryEditor);
 
     // Add menu items
     Command *cmd = 0;
-    cmd = Core::ActionManager::registerAction(openMemoryEditorAction,
+    cmd = ActionManager::registerAction(openMemoryEditorAction,
         "Debugger.Views.OpenMemoryEditor", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
 
-    cmd = Core::ActionManager::registerAction(q->menuSeparator1(),
+    cmd = ActionManager::registerAction(q->menuSeparator1(),
         "Debugger.Views.Separator1", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
-    cmd = Core::ActionManager::registerAction(q->autoHideTitleBarsAction(),
+    cmd = ActionManager::registerAction(q->autoHideTitleBarsAction(),
         "Debugger.Views.AutoHideTitleBars", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
-    cmd = Core::ActionManager::registerAction(q->menuSeparator2(),
+    cmd = ActionManager::registerAction(q->menuSeparator2(),
         "Debugger.Views.Separator2", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
@@ -407,8 +403,8 @@ QDockWidget *DebuggerMainWindow::createDockWidget(const DebuggerLanguage &langua
     Context globalContext(Core::Constants::C_GLOBAL);
 
     QAction *toggleViewAction = dockWidget->toggleViewAction();
-    Command *cmd = Core::ActionManager::registerAction(toggleViewAction,
-             Core::Id("Debugger.").withSuffix(widget->objectName()), globalContext);
+    Command *cmd = ActionManager::registerAction(toggleViewAction,
+             Id("Debugger.").withSuffix(widget->objectName()), globalContext);
     cmd->setAttribute(Command::CA_Hide);
 
     dockWidget->installEventFilter(&d->m_resizeEventFilter);
@@ -430,10 +426,10 @@ void DebuggerMainWindow::addStagedMenuEntries()
 
 QWidget *DebuggerMainWindow::createContents(IMode *mode)
 {
-    connect(SessionManager::instance(), SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
-        d, SLOT(updateUiForProject(ProjectExplorer::Project*)));
+    connect(SessionManager::instance(), &SessionManager::startupProjectChanged,
+        d, &DebuggerMainWindowPrivate::updateUiForProject);
 
-    d->m_viewsMenu = Core::ActionManager::actionContainer(Core::Id(Core::Constants::M_WINDOW_VIEWS));
+    d->m_viewsMenu = ActionManager::actionContainer(Id(Core::Constants::M_WINDOW_VIEWS));
     QTC_ASSERT(d->m_viewsMenu, return 0);
 
     //d->m_mainWindow = new Internal::DebuggerMainWindow(this);
@@ -444,17 +440,17 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
     connect(autoHideTitleBarsAction(), SIGNAL(triggered()),
         d, SLOT(updateDockWidgetSettings()));
 
-    QBoxLayout *editorHolderLayout = new QVBoxLayout;
+    auto editorHolderLayout = new QVBoxLayout;
     editorHolderLayout->setMargin(0);
     editorHolderLayout->setSpacing(0);
 
-    QWidget *editorAndFindWidget = new QWidget;
+    auto editorAndFindWidget = new QWidget;
     editorAndFindWidget->setLayout(editorHolderLayout);
     auto editorManagerPlaceHolder = new EditorManagerPlaceHolder(mode);
     editorHolderLayout->addWidget(editorManagerPlaceHolder);
     editorHolderLayout->addWidget(new FindToolBarPlaceHolder(editorAndFindWidget));
 
-    MiniSplitter *documentAndRightPane = new MiniSplitter;
+    auto documentAndRightPane = new MiniSplitter;
     documentAndRightPane->addWidget(editorAndFindWidget);
     documentAndRightPane->addWidget(new RightPanePlaceHolder(mode));
     documentAndRightPane->setStretchFactor(0, 1);
@@ -466,18 +462,18 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
     hackyName.replace(QLatin1Char('&'), QString());
     d->m_viewButton->setText(hackyName);
 
-    Utils::StyledBar *debugToolBar = new Utils::StyledBar;
+    auto debugToolBar = new Utils::StyledBar;
     debugToolBar->setProperty("topBorder", true);
-    QHBoxLayout *debugToolBarLayout = new QHBoxLayout(debugToolBar);
+    auto debugToolBarLayout = new QHBoxLayout(debugToolBar);
     debugToolBarLayout->setMargin(0);
     debugToolBarLayout->setSpacing(0);
     debugToolBarLayout->addWidget(d->m_debugToolBar);
     debugToolBarLayout->addWidget(new Utils::StyledSeparator);
     debugToolBarLayout->addWidget(d->m_viewButton);
 
-    connect(d->m_viewButton, SIGNAL(clicked()), this, SLOT(showViewsMenu()));
+    connect(d->m_viewButton, &QAbstractButton::clicked, this, &DebuggerMainWindow::showViewsMenu);
 
-    QDockWidget *dock = new QDockWidget(DebuggerMainWindowPrivate::tr("Debugger Toolbar"));
+    auto dock = new QDockWidget(DebuggerMainWindowPrivate::tr("Debugger Toolbar"));
     dock->setObjectName(QLatin1String("Debugger Toolbar"));
     dock->setWidget(debugToolBar);
     dock->setFeatures(QDockWidget::NoDockWidgetFeatures);
@@ -487,10 +483,10 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
     addDockWidget(Qt::BottomDockWidgetArea, dock);
     setToolBarDockWidget(dock);
 
-    QWidget *centralWidget = new QWidget;
+    auto centralWidget = new QWidget;
     setCentralWidget(centralWidget);
 
-    QVBoxLayout *centralLayout = new QVBoxLayout(centralWidget);
+    auto centralLayout = new QVBoxLayout(centralWidget);
     centralWidget->setLayout(centralLayout);
     centralLayout->setMargin(0);
     centralLayout->setSpacing(0);
@@ -499,9 +495,9 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
     centralLayout->setStretch(1, 0);
 
     // Right-side window with editor, output etc.
-    MiniSplitter *mainWindowSplitter = new MiniSplitter;
+    auto mainWindowSplitter = new MiniSplitter;
     mainWindowSplitter->addWidget(this);
-    QWidget *outputPane = new OutputPanePlaceHolder(mode, mainWindowSplitter);
+    auto outputPane = new OutputPanePlaceHolder(mode, mainWindowSplitter);
     outputPane->setObjectName(QLatin1String("DebuggerOutputPanePlaceHolder"));
     mainWindowSplitter->addWidget(outputPane);
     mainWindowSplitter->setStretchFactor(0, 10);
@@ -509,7 +505,7 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
     mainWindowSplitter->setOrientation(Qt::Vertical);
 
     // Navigation and right-side window.
-    MiniSplitter *splitter = new MiniSplitter;
+    auto splitter = new MiniSplitter;
     splitter->setFocusProxy(editorManagerPlaceHolder);
     splitter->addWidget(new NavigationWidgetPlaceHolder(mode));
     splitter->addWidget(mainWindowSplitter);