diff --git a/src/plugins/projectexplorer/persistentsettings.cpp b/src/plugins/projectexplorer/persistentsettings.cpp index 191cc9e41afe1cb40e457685c70abbc219db3ae5..9b94095935044961a3a4e4f9c10d90dedb6b99ef 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 8d993f365ce3b9453700d33680e406e9f7728b39..460da4316b0edc6b0ae7e51374f9603885fcbc4d 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; };