Project: Rename Project::activeBuildEnvironment to Project::activeParseEnvironment

This is used for parsing the project only, so reflect that in the name. Not all
projects have build configurations, so the old name did not make too much sense
for what this has been used for.

Eventually this code should move into the BuildSystem.

Change-Id: Iff766150b5fe370f2912b0b3b15348b1c1fad5b5
Reviewed-by: hjk <hjk@qt.io>

7 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index 2bf22d17fb..6487d424da 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -253,5 +253,5 @@ void AutotoolsProject::updateCppCodeModel()
     rpp.setMacros(m_makefileParserThread->macros());
     rpp.setFiles(m_files);
 
-    m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), {rpp}});
+    m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), {rpp}});
 }
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 2a8de8e130..918b8ef81a 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -390,7 +390,7 @@ void CompilationDatabaseProject::buildTreeAndProjectParts()
 
     setRootProjectNode(std::move(root));
 
-    m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), rpps});
+    m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), rpps});
 }
 
 CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FilePath &projectFile)
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 3ce786124d..75973c0713 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -520,7 +520,7 @@ void GenericProject::refreshCppCodeModel()
     rpp.setFlagsForC({nullptr, m_cflags});
     rpp.setFiles(m_files);
 
-    m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), {rpp}});
+    m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), {rpp}});
 }
 
 void GenericProject::updateDeploymentData()
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index e2ac745695..3b34031eec 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -860,7 +860,7 @@ Task Project::createProjectTask(Task::TaskType type, const QString &description)
     return Task(type, description, Utils::FilePath(), -1, Core::Id());
 }
 
-Utils::Environment Project::activeBuildEnvironment() const
+Utils::Environment Project::activeParseEnvironment() const
 {
     const BuildConfiguration * const buildConfiguration = activeTarget()
             ? activeTarget()->activeBuildConfiguration() : nullptr;
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 826b52d40f..082010d6c3 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -294,7 +294,7 @@ protected:
     static ProjectExplorer::Task createProjectTask(ProjectExplorer::Task::TaskType type,
                                                    const QString &description);
 
-    Utils::Environment activeBuildEnvironment() const;
+    Utils::Environment activeParseEnvironment() const;
 
 private:
     // Helper methods to manage parsing state and signalling
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 3526f5376b..b17aaa6835 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -1023,7 +1023,7 @@ void QbsProject::updateCppCodeModel()
     }
 
     CppTools::GeneratedCodeModelSupport::update(m_extraCompilers);
-    m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), rpps});
+    m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), rpps});
 }
 
 void QbsProject::updateQmlJsCodeModel()
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 3dd877a21b..9962389469 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -288,7 +288,7 @@ void QmakeProject::updateCppCodeModel()
     }
 
     CppTools::GeneratedCodeModelSupport::update(generators);
-    m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), rpps});
+    m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), rpps});
 }
 
 void QmakeProject::updateQmlJSCodeModel()