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

CMakeBuildConfiguration: Less qobject_casts more static_casts

Browse Source 
CMakeBuildConfigurations can only exist on CMakeProjects

Change-Id: I8501e39f133fea854b953f9739e001cae1f2c0ea
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2012-07-04 13:00:10 +02:00
parent ed42fb2e3c
commit b09e566375
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -56,12 +56,10 @@ const char CMAKE_BC_ID[] = "CMakeProjectManager.CMakeBuildConfiguration";
const char BUILD_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory"; const char BUILD_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory";
} // namespace } // namespace
CMakeBuildConfiguration::CMakeBuildConfiguration(ProjectExplorer::Target *parent) : CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeProject *parent) :
BuildConfiguration(parent, Core::Id(CMAKE_BC_ID)) BuildConfiguration(parent, Core::Id(CMAKE_BC_ID))
{ {
CMakeProject *project = qobject_cast<CMakeProject *>(parent->project()); m_buildDirectory = parent->defaultBuildDirectory();
if (project)
m_buildDirectory = project->defaultBuildDirectory();
} }
CMakeBuildConfiguration::CMakeBuildConfiguration(ProjectExplorer::Target *parent, CMakeBuildConfiguration::CMakeBuildConfiguration(ProjectExplorer::Target *parent,
@@ -175,9 +173,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer:
if (!canCreate(parent, id)) if (!canCreate(parent, id))
return 0; return 0;
CMakeProject *project = qobject_cast<CMakeProject *>(parent->project()); CMakeProject *project = static_cast<CMakeProject *>(parent->project());
if (!project)
return 0;
bool ok = true; bool ok = true;
QString buildConfigurationName = name; QString buildConfigurationName = name;
@@ -191,7 +187,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer:
if (!ok || buildConfigurationName.isEmpty()) if (!ok || buildConfigurationName.isEmpty())
return 0; return 0;
CMakeBuildConfiguration *bc = new CMakeBuildConfiguration(parent); CMakeBuildConfiguration *bc = new CMakeBuildConfiguration(project);
bc->setDisplayName(buildConfigurationName); bc->setDisplayName(buildConfigurationName);
ProjectExplorer::BuildStepList *buildSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); ProjectExplorer::BuildStepList *buildSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);

1
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -43,6 +43,7 @@ class ToolChain;
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Internal { namespace Internal {
class CMakeProject;
class CMakeBuildConfigurationFactory; class CMakeBuildConfigurationFactory;
class CMakeBuildConfiguration : public ProjectExplorer::BuildConfiguration class CMakeBuildConfiguration : public ProjectExplorer::BuildConfiguration