feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Use Qt5-style connects

Browse Source 
Change-Id: I5ec451b55237fcceca86f0134ae081b435dab5c5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-08 14:29:36 +01:00
parent 1d6c960f05
commit 8146402e05
4 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -50,6 +50,7 @@
#include <QAction>
#include <QDateTime>
using namespace ProjectExplorer;
using namespace CMakeProjectManager::Internal;
CMakeManager::CMakeManager() :
@@ -71,7 +72,7 @@ CMakeManager::CMakeManager() :
command->setAttribute(Core::Command::CA_Hide);
mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_DEPLOY);
connect(m_runCMakeAction, &QAction::triggered, [this]() {
runCMake(ProjectExplorer::SessionManager::startupProject());
runCMake(SessionManager::startupProject());
});
command = Core::ActionManager::registerAction(m_runCMakeActionContextMenu,
@@ -80,23 +81,23 @@ CMakeManager::CMakeManager() :
mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
connect(m_runCMakeActionContextMenu, &QAction::triggered, [this]() {
runCMake(ProjectExplorer::ProjectTree::currentProject());
runCMake(ProjectTree::currentProject());
});
connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::startupProjectChanged,
connect(SessionManager::instance(), &SessionManager::startupProjectChanged,
this, &CMakeManager::updateRunCmakeAction);
connect(ProjectExplorer::BuildManager::instance(), &ProjectExplorer::BuildManager::buildStateChanged,
connect(BuildManager::instance(), &BuildManager::buildStateChanged,
this, &CMakeManager::updateRunCmakeAction);
}
void CMakeManager::updateRunCmakeAction()
{
auto project = qobject_cast<CMakeProject *>(ProjectExplorer::SessionManager::startupProject());
m_runCMakeAction->setVisible(project && !ProjectExplorer::BuildManager::isBuilding(project));
auto project = qobject_cast<CMakeProject *>(SessionManager::startupProject());
m_runCMakeAction->setVisible(project && !BuildManager::isBuilding(project));
}
void CMakeManager::runCMake(ProjectExplorer::Project *project)
void CMakeManager::runCMake(Project *project)
{
if (!project)
return;
@@ -104,7 +105,7 @@ void CMakeManager::runCMake(ProjectExplorer::Project *project)
if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration())
return;
if (!ProjectExplorer::ProjectExplorerPlugin::saveModifiedFiles())
if (!ProjectExplorerPlugin::saveModifiedFiles())
return;
CMakeBuildConfiguration *bc
@@ -117,7 +118,7 @@ void CMakeManager::runCMake(ProjectExplorer::Project *project)
cmakeProject->parseCMakeLists();
}
ProjectExplorer::Project *CMakeManager::openProject(const QString &fileName, QString *errorString)
Project *CMakeManager::openProject(const QString &fileName, QString *errorString)
{
Utils::FileName file = Utils::FileName::fromString(fileName);
if (!file.toFileInfo().isFile()) {