From 51fb280b9e251ae22401d3de1aad71ab584ca4cc Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 19 Jan 2010 16:57:29 +0100
Subject: [PATCH] Remove prefix code from Persistentsettings.
Reviewed-by: dt
---
.../projectexplorer/persistentsettings.cpp | 27 +++----------------
.../projectexplorer/persistentsettings.h | 8 ++----
2 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/src/plugins/projectexplorer/persistentsettings.cpp b/src/plugins/projectexplorer/persistentsettings.cpp
index 191cc9e41af..9b940959350 100644
--- a/src/plugins/projectexplorer/persistentsettings.cpp
+++ b/src/plugins/projectexplorer/persistentsettings.cpp
@@ -46,9 +46,8 @@ PersistentSettingsReader::PersistentSettingsReader()
QVariant PersistentSettingsReader::restoreValue(const QString & variable) const
{
- const QString &name = m_prefix + variable;
- if (m_valueMap.contains(name))
- return m_valueMap.value(name);
+ if (m_valueMap.contains(variable))
+ return m_valueMap.value(variable);
return QVariant();
}
@@ -83,16 +82,6 @@ bool PersistentSettingsReader::load(const QString & fileName)
return true;
}
-void PersistentSettingsReader::setPrefix(const QString &prefix)
-{
- m_prefix = prefix;
-}
-
-QString PersistentSettingsReader::prefix() const
-{
- return m_prefix;
-}
-
QVariant PersistentSettingsReader::readValue(const QDomElement &valElement) const
{
QString name = valElement.nodeName();
@@ -184,7 +173,7 @@ void PersistentSettingsWriter::writeValue(QDomElement &ps, const QVariant &varia
void PersistentSettingsWriter::saveValue(const QString & variable, const QVariant &value)
{
- m_valueMap[m_prefix + variable] = value;
+ m_valueMap[variable] = value;
}
bool PersistentSettingsWriter::save(const QString & fileName, const QString & docType)
@@ -216,13 +205,3 @@ bool PersistentSettingsWriter::save(const QString & fileName, const QString & do
file.close();
return true;
}
-
-void PersistentSettingsWriter::setPrefix(const QString &prefix)
-{
- m_prefix = prefix;
-}
-
-QString PersistentSettingsWriter::prefix() const
-{
- return m_prefix;
-}
diff --git a/src/plugins/projectexplorer/persistentsettings.h b/src/plugins/projectexplorer/persistentsettings.h
index 8d993f365ce..460da4316b0 100644
--- a/src/plugins/projectexplorer/persistentsettings.h
+++ b/src/plugins/projectexplorer/persistentsettings.h
@@ -48,10 +48,8 @@ public:
QVariant restoreValue(const QString & variable) const;
QVariantMap restoreValues() const;
bool load(const QString & fileName);
- void setPrefix(const QString &prefix);
- QString prefix() const;
+
private:
- QString m_prefix;
QVariant readValue(const QDomElement &valElement) const;
void readValues(const QDomElement &data);
QMap<QString, QVariant> m_valueMap;
@@ -63,10 +61,8 @@ public:
PersistentSettingsWriter();
void saveValue(const QString & variable, const QVariant &value);
bool save(const QString & fileName, const QString & docType);
- void setPrefix(const QString &prefix);
- QString prefix() const;
+
private:
- QString m_prefix;
void writeValue(QDomElement &ps, const QVariant &value);
QMap<QString, QVariant> m_valueMap;
};
--
GitLab