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

28
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -102,10 +102,8 @@ CMakeProject::CMakeProject(CMakeManager *manager, const FileName &fileName)
m_file = new CMakeFile(this, fileName); m_file = new CMakeFile(this, fileName);
connect(this, SIGNAL(buildTargetsChanged()), connect(this, &CMakeProject::buildTargetsChanged, this, &CMakeProject::updateRunConfigurations);
this, SLOT(updateRunConfigurations())); connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &CMakeProject::fileChanged);
connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
} }
CMakeProject::~CMakeProject() CMakeProject::~CMakeProject()
@@ -157,8 +155,8 @@ void CMakeProject::changeActiveBuildConfiguration(ProjectExplorer::BuildConfigur
void CMakeProject::activeTargetWasChanged(Target *target) void CMakeProject::activeTargetWasChanged(Target *target)
{ {
if (m_activeTarget) { if (m_activeTarget) {
disconnect(m_activeTarget, SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)), disconnect(m_activeTarget, &Target::activeBuildConfigurationChanged,
this, SLOT(changeActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*))); this, &CMakeProject::changeActiveBuildConfiguration);
} }
m_activeTarget = target; m_activeTarget = target;
@@ -166,9 +164,8 @@ void CMakeProject::activeTargetWasChanged(Target *target)
if (!m_activeTarget) if (!m_activeTarget)
return; return;
connect(m_activeTarget, SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)), connect(m_activeTarget, &Target::activeBuildConfigurationChanged,
this, SLOT(changeActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*))); this, &CMakeProject::changeActiveBuildConfiguration);
changeActiveBuildConfiguration(m_activeTarget->activeBuildConfiguration()); changeActiveBuildConfiguration(m_activeTarget->activeBuildConfiguration());
} }
@@ -577,11 +574,10 @@ Project::RestoreResult CMakeProject::fromMap(const QVariantMap &map, QString *er
m_activeTarget = activeTarget(); m_activeTarget = activeTarget();
if (m_activeTarget) if (m_activeTarget)
connect(m_activeTarget, SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)), connect(m_activeTarget, &Target::activeBuildConfigurationChanged,
this, SLOT(changeActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*))); this, &CMakeProject::changeActiveBuildConfiguration);
connect(this, &Project::activeTargetChanged,
connect(this, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), this, &CMakeProject::activeTargetWasChanged);
this, SLOT(activeTargetWasChanged(ProjectExplorer::Target*)));
return RestoreResult::Ok; return RestoreResult::Ok;
} }
@@ -636,11 +632,11 @@ QString CMakeProject::uiHeaderFile(const QString &uiFile)
void CMakeProject::updateRunConfigurations() void CMakeProject::updateRunConfigurations()
{ {
foreach (Target *t, targets()) foreach (Target *t, targets())
updateRunConfigurations(t); updateTargetRunConfigurations(t);
} }
// TODO Compare with updateDefaultRunConfigurations(); // TODO Compare with updateDefaultRunConfigurations();
void CMakeProject::updateRunConfigurations(Target *t) void CMakeProject::updateTargetRunConfigurations(Target *t)
{ {
// create new and remove obsolete RCs using the factories // create new and remove obsolete RCs using the factories
t->updateDefaultRunConfigurations(); t->updateDefaultRunConfigurations();

2
src/plugins/cmakeprojectmanager/cmakeproject.h
View File

@@ -144,7 +144,7 @@ private:
ProjectExplorer::FolderNode *findOrCreateFolder(Internal::CMakeProjectNode *rootNode, QString directory); ProjectExplorer::FolderNode *findOrCreateFolder(Internal::CMakeProjectNode *rootNode, QString directory);
void createUiCodeModelSupport(); void createUiCodeModelSupport();
QString uiHeaderFile(const QString &uiFile); QString uiHeaderFile(const QString &uiFile);
void updateRunConfigurations(ProjectExplorer::Target *t); void updateTargetRunConfigurations(ProjectExplorer::Target *t);
void updateApplicationAndDeploymentTargets(); void updateApplicationAndDeploymentTargets();
QStringList getCXXFlagsFor(const CMakeBuildTarget &buildTarget, QByteArray *cachedBuildNinja); QStringList getCXXFlagsFor(const CMakeBuildTarget &buildTarget, QByteArray *cachedBuildNinja);

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

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

3
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -78,7 +78,8 @@ CMakeTool::~CMakeTool()
void CMakeTool::cancel() void CMakeTool::cancel()
{ {
if (m_process) { if (m_process) {
disconnect(m_process, SIGNAL(finished(int))); disconnect(m_process, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
this, &CMakeTool::finished);
if (m_process->state() != QProcess::NotRunning) if (m_process->state() != QProcess::NotRunning)
m_process->kill(); m_process->kill();