From ad6c5db3eb5aed315c64cf266b1f72b65656265d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 6 Jan 2016 16:15:33 +0100 Subject: [PATCH] CMake: Simplify code a bit Change-Id: If16aed7a361a00a308570bdafc19ab5c6bb59e36 Reviewed-by: Cristian Adam Reviewed-by: Niels Weber --- .../cmakebuildsettingswidget.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp index e629ee06b00..e44da23619d 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp @@ -91,14 +91,14 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) void CMakeBuildSettingsWidget::openChangeBuildDirectoryDialog() { - CMakeProject *project = static_cast(m_buildConfiguration->target()->project()); - CMakeManager *manager = static_cast(project->projectManager()); + auto project = static_cast(m_buildConfiguration->target()->project()); + auto manager = static_cast(project->projectManager()); CMakeBuildInfo info(m_buildConfiguration); CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), manager, CMakeOpenProjectWizard::ChangeDirectory, &info, - project->activeTarget()->displayName(), - project->activeTarget()->activeBuildConfiguration()->displayName()); + m_buildConfiguration->target()->displayName(), + m_buildConfiguration->displayName()); if (copw.exec() == QDialog::Accepted) { project->changeBuildDirectory(m_buildConfiguration, copw.buildDirectory()); m_pathLineEdit->setText(m_buildConfiguration->rawBuildDirectory().toString()); @@ -109,13 +109,13 @@ void CMakeBuildSettingsWidget::runCMake() { if (!ProjectExplorer::ProjectExplorerPlugin::saveModifiedFiles()) return; - CMakeProject *project = static_cast(m_buildConfiguration->target()->project()); - CMakeManager *manager = static_cast(project->projectManager()); + auto project = static_cast(m_buildConfiguration->target()->project()); + auto manager = static_cast(project->projectManager()); CMakeBuildInfo info(m_buildConfiguration); CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), manager, CMakeOpenProjectWizard::WantToUpdate, &info, - project->activeTarget()->displayName(), - project->activeTarget()->activeBuildConfiguration()->displayName()); + m_buildConfiguration->target()->displayName(), + m_buildConfiguration->displayName()); if (copw.exec() == QDialog::Accepted) project->parseCMakeLists(); }