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

CMake: Improve method names

Browse Source 
I just mixed those methods up, so I'd better improve their names:-)

Change-Id: I38a37df4adb0d0402e2c3d9304c79aa414609976
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-03-10 17:31:30 +01:00
parent e60cffd2e4
commit de9eeb233f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -139,7 +139,7 @@ const Utils::FileName BuildDirManager::sourceDirectory() const
return m_buildConfiguration->target()->project()->projectDirectory(); return m_buildConfiguration->target()->project()->projectDirectory();
} }
const CMakeConfig BuildDirManager::cmakeConfiguration() const const CMakeConfig BuildDirManager::intendedConfiguration() const
{ {
return m_buildConfiguration->cmakeConfiguration(); return m_buildConfiguration->cmakeConfiguration();
} }
@@ -161,7 +161,7 @@ void BuildDirManager::forceReparse()
QTC_ASSERT(tool, return); QTC_ASSERT(tool, return);
QTC_ASSERT(!generator.isEmpty(), return); QTC_ASSERT(!generator.isEmpty(), return);
startCMake(tool, generator, cmakeConfiguration()); startCMake(tool, generator, intendedConfiguration());
} }
void BuildDirManager::resetData() void BuildDirManager::resetData()
@@ -208,7 +208,7 @@ void BuildDirManager::parse()
if (!cbpFileFi.exists()) { if (!cbpFileFi.exists()) {
// Initial create: // Initial create:
startCMake(tool, generator, cmakeConfiguration()); startCMake(tool, generator, intendedConfiguration());
return; return;
} }
@@ -265,7 +265,7 @@ void BuildDirManager::clearFiles()
m_files.clear(); m_files.clear();
} }
CMakeConfig BuildDirManager::configuration() const CMakeConfig BuildDirManager::parsedConfiguration() const
{ {
if (!m_hasData) if (!m_hasData)
return CMakeConfig(); return CMakeConfig();

4
src/plugins/cmakeprojectmanager/builddirmanager.h
View File

@@ -71,7 +71,7 @@ public:
const Utils::FileName buildDirectory() const; const Utils::FileName buildDirectory() const;
const Utils::FileName workDirectory() const; const Utils::FileName workDirectory() const;
const Utils::FileName sourceDirectory() const; const Utils::FileName sourceDirectory() const;
const CMakeConfig cmakeConfiguration() const; const CMakeConfig intendedConfiguration() const;
bool isParsing() const; bool isParsing() const;
void parse(); void parse();
@@ -85,7 +85,7 @@ public:
QList<CMakeBuildTarget> buildTargets() const; QList<CMakeBuildTarget> buildTargets() const;
QList<ProjectExplorer::FileNode *> files(); QList<ProjectExplorer::FileNode *> files();
void clearFiles(); void clearFiles();
CMakeConfig configuration() const; CMakeConfig parsedConfiguration() const;
static CMakeConfig parseConfiguration(const Utils::FileName &cacheFile, static CMakeConfig parseConfiguration(const Utils::FileName &cacheFile,
const Utils::FileName &sourceDir, const Utils::FileName &sourceDir,

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

@@ -195,7 +195,7 @@ QList<ConfigModel::DataItem> CMakeBuildConfiguration::completeCMakeConfiguration
return QList<ConfigModel::DataItem>(); return QList<ConfigModel::DataItem>();
if (m_completeConfigurationCache.isEmpty()) if (m_completeConfigurationCache.isEmpty())
m_completeConfigurationCache = m_buildDirManager->configuration(); m_completeConfigurationCache = m_buildDirManager->parsedConfiguration();
return Utils::transform(m_completeConfigurationCache, [](const CMakeConfigItem &i) { return Utils::transform(m_completeConfigurationCache, [](const CMakeConfigItem &i) {
ConfigModel::DataItem j; ConfigModel::DataItem j;