ProjectExplorer: Split EnvironmentAspect

... at least logically a bit more into hunks responsible for
one of the possible choices of base environments.

This makes it possible to move code that modifies individual
cases closer to the only place that uses it.

Change-Id: I1c87bb869e04e44b92ff097b0bf25274f93808be
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 3 insertions, 22 deletions

diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index aaaae8e68f..36d2d03e2d 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -41,40 +41,21 @@ static bool displayAlreadySet(const QList<Utils::EnvironmentItem> &changes)
     });
 }
 
-enum BaseEnvironmentBase {
-    CleanBaseEnvironment = 0,
-    RemoteBaseEnvironment = 1
-};
-
-
 RemoteLinuxEnvironmentAspect::RemoteLinuxEnvironmentAspect(ProjectExplorer::Target *target)
 {
-    addSupportedBaseEnvironment(CleanBaseEnvironment, tr("Clean Environment"));
-    addPreferredBaseEnvironment(RemoteBaseEnvironment, tr("System Environment"));
+    addSupportedBaseEnvironment(tr("Clean Environment"), {});
+    addPreferredBaseEnvironment(tr("System Environment"), [this] { return m_remoteEnvironment; });
 
     setConfigWidgetCreator([this, target] {
         return new RemoteLinuxEnvironmentAspectWidget(this, target);
     });
-
-    setBaseEnvironmentGetter([this] {
-        Utils::Environment env;
-        if (baseEnvironmentBase() == static_cast<int>(RemoteBaseEnvironment))
-            env = m_remoteEnvironment;
-        return env;
-    });
-}
-
-Utils::Environment RemoteLinuxEnvironmentAspect::remoteEnvironment() const
-{
-    return m_remoteEnvironment;
 }
 
 void RemoteLinuxEnvironmentAspect::setRemoteEnvironment(const Utils::Environment &env)
 {
     if (env != m_remoteEnvironment) {
         m_remoteEnvironment = env;
-        if (baseEnvironmentBase() == static_cast<int>(RemoteBaseEnvironment))
-            emit environmentChanged();
+        emit environmentChanged();
     }
 }