From 76738c21a092d6d5f157a9126c825698a73e99aa Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 19 Apr 2010 18:13:23 +0200
Subject: [PATCH] Add hasKey method to find out whether a envvar exists
Reviewed-by: dt
---
src/plugins/projectexplorer/environment.cpp | 5 +++++
src/plugins/projectexplorer/environment.h | 1 +
src/plugins/projectexplorer/environmenteditmodel.cpp | 6 +++---
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/plugins/projectexplorer/environment.cpp b/src/plugins/projectexplorer/environment.cpp
index be132fdad10..326200a7102 100644
--- a/src/plugins/projectexplorer/environment.cpp
+++ b/src/plugins/projectexplorer/environment.cpp
@@ -291,6 +291,11 @@ void Environment::modify(const QList<EnvironmentItem> & list)
*this = resultEnvironment;
}
+bool Environment::hasKey(const QString &key)
+{
+ return m_values.contains(key);
+}
+
bool Environment::operator!=(const Environment &other) const
{
return !(*this == other);
diff --git a/src/plugins/projectexplorer/environment.h b/src/plugins/projectexplorer/environment.h
index a25781d60e5..289320a0030 100644
--- a/src/plugins/projectexplorer/environment.h
+++ b/src/plugins/projectexplorer/environment.h
@@ -71,6 +71,7 @@ public:
void set(const QString &key, const QString &value);
void unset(const QString &key);
void modify(const QList<EnvironmentItem> & list);
+ bool hasKey(const QString &key);
void appendOrSet(const QString &key, const QString &value, const QString &sep = QString());
void prependOrSet(const QString &key, const QString &value, const QString &sep = QString());
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index 3998397f1c4..33190ec9f47 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -271,7 +271,7 @@ QModelIndex EnvironmentModel::addVariable()
QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item)
{
- bool existsInBaseEnvironment = (m_baseEnvironment.find(item.name) != m_baseEnvironment.constEnd());
+ bool existsInBaseEnvironment = m_baseEnvironment.hasKey(item.name);
int rowInResult;
if (existsInBaseEnvironment)
rowInResult = findInResult(item.name);
@@ -301,7 +301,7 @@ void EnvironmentModel::removeVariable(const QString &name)
{
int rowInResult = findInResult(name);
int rowInChanges = findInChanges(name);
- bool existsInBaseEnvironment = m_baseEnvironment.find(name) != m_baseEnvironment.constEnd();
+ bool existsInBaseEnvironment = m_baseEnvironment.hasKey(name);
if (existsInBaseEnvironment) {
m_items.removeAt(rowInChanges);
updateResultEnvironment();
@@ -347,7 +347,7 @@ bool EnvironmentModel::isUnset(const QString &name)
bool EnvironmentModel::isInBaseEnvironment(const QString &name)
{
- return m_baseEnvironment.find(name) != m_baseEnvironment.constEnd();
+ return m_baseEnvironment.hasKey(name);
}
QList<EnvironmentItem> EnvironmentModel::userChanges() const
--
GitLab