diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 112726e11dd..a693a9d5417 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -48,8 +48,8 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage) : m_settingsPage(cmakeSettingsPage) { ProjectExplorer::ProjectExplorerPlugin *projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance(); - connect(projectExplorer, SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*)), - this, SLOT(updateContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*))); + connect(projectExplorer, &ProjectExplorer::ProjectExplorerPlugin::aboutToShowContextMenu, + this, &CMakeManager::updateContextMenu); Core::ActionContainer *mbuild = Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT); @@ -65,7 +65,9 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage) Constants::RUNCMAKE, projectContext); command->setAttribute(Core::Command::CA_Hide); mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_DEPLOY); - connect(m_runCMakeAction, SIGNAL(triggered()), this, SLOT(runCMake())); + connect(m_runCMakeAction, &QAction::triggered, [this]() { + runCMake(ProjectExplorer::ProjectExplorerPlugin::currentProject()); + }); m_runCMakeActionContextMenu = new QAction(QIcon(), tr("Run CMake"), this); command = Core::ActionManager::registerAction(m_runCMakeActionContextMenu, @@ -73,26 +75,17 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage) command->setAttribute(Core::Command::CA_Hide); mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD); msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD); - connect(m_runCMakeActionContextMenu, SIGNAL(triggered()), this, SLOT(runCMakeContextMenu())); + connect(m_runCMakeActionContextMenu, &QAction::triggered, [this]() { + runCMake(m_contextProject); + }); } -void CMakeManager::updateContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *node) +void CMakeManager::updateContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *) { - Q_UNUSED(node); m_contextProject = project; } -void CMakeManager::runCMake() -{ - runCMake(ProjectExplorer::ProjectExplorerPlugin::currentProject()); -} - -void CMakeManager::runCMakeContextMenu() -{ - runCMake(m_contextProject); -} - void CMakeManager::runCMake(ProjectExplorer::Project *project) { if (!project) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index cd2cba0a423..b91dfb26ac6 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -73,12 +73,11 @@ public: bool preferNinja() const; static QString findCbpFile(const QDir &); -private slots: - void updateContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *node); - void runCMake(); - void runCMakeContextMenu(); private: + void updateContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *node); void runCMake(ProjectExplorer::Project *project); + +private: CMakeSettingsPage *m_settingsPage; QAction *m_runCMakeAction; QAction *m_runCMakeActionContextMenu;