diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index ef64b041fe8..439dfbb380c 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -452,13 +452,11 @@ static QVariantMap processHandlerNodes(const HandlerNode &node, const QVariantMa SettingsAccessor::SettingsAccessor(Project *project) : m_firstVersion(-1), m_lastVersion(-1), - m_userFileAcessor(QByteArray("qtcUserFileName"), - QLatin1String(".user"), + m_userFileAcessor(QLatin1String(".user"), QString::fromLocal8Bit(qgetenv("QTC_EXTENSION")), true, this), - m_sharedFileAcessor(QByteArray("qtcSharedFileName"), - QLatin1String(".shared"), + m_sharedFileAcessor(QLatin1String(".shared"), QString::fromLocal8Bit(qgetenv("QTC_SHARED_EXTENSION")), false, this), @@ -909,13 +907,11 @@ bool SettingsAccessor::SettingsData::isValid() const static const char VERSION_KEY[] = "ProjectExplorer.Project.Updater.FileVersion"; static const char ENVIRONMENT_ID_KEY[] = "ProjectExplorer.Project.Updater.EnvironmentId"; -SettingsAccessor::FileAccessor::FileAccessor(const QByteArray &id, - const QString &defaultSuffix, +SettingsAccessor::FileAccessor::FileAccessor(const QString &defaultSuffix, const QString &environmentSuffix, bool envSpecific, SettingsAccessor *accessor) - : m_id(id) - , m_environmentSpecific(envSpecific) + : m_environmentSpecific(envSpecific) , m_accessor(accessor) , m_writer(0) { diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h index b11f7237669..74b17b7aa69 100644 --- a/src/plugins/projectexplorer/settingsaccessor.h +++ b/src/plugins/projectexplorer/settingsaccessor.h @@ -96,8 +96,7 @@ private: class FileAccessor { public: - FileAccessor(const QByteArray &id, - const QString &defaultSuffix, + FileAccessor(const QString &defaultSuffix, const QString &environmentSuffix, bool envSpecific, SettingsAccessor *accessor); @@ -107,12 +106,10 @@ private: bool writeFile(const SettingsData *settings) const; QString suffix() const { return m_suffix; } - QByteArray id() const { return m_id; } private: void assignSuffix(const QString &defaultSuffix, const QString &environmentSuffix); - QByteArray m_id; QString m_suffix; bool m_environmentSpecific; SettingsAccessor *m_accessor;