CMake: Improve method names

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>

src/plugins/cmakeprojectmanager/builddirmanager.cpp

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

src/plugins/cmakeprojectmanager/builddirmanager.h

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

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

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