feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SettingsAccessor: Remove some code that is no longer needed.

Browse Source 
Change-Id: Ib250ed590736b57b7898547303ae6e481e688322
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-04-04 16:22:11 +02:00
parent acda3403a5
commit 25319ddf19
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -452,13 +452,11 @@ static QVariantMap processHandlerNodes(const HandlerNode &node, const QVariantMa
SettingsAccessor::SettingsAccessor(Project *project) : SettingsAccessor::SettingsAccessor(Project *project) :
m_firstVersion(-1), m_firstVersion(-1),
m_lastVersion(-1), m_lastVersion(-1),
m_userFileAcessor(QByteArray("qtcUserFileName"), m_userFileAcessor(QLatin1String(".user"),
QLatin1String(".user"),
QString::fromLocal8Bit(qgetenv("QTC_EXTENSION")), QString::fromLocal8Bit(qgetenv("QTC_EXTENSION")),
true, true,
this), this),
m_sharedFileAcessor(QByteArray("qtcSharedFileName"), m_sharedFileAcessor(QLatin1String(".shared"),
QLatin1String(".shared"),
QString::fromLocal8Bit(qgetenv("QTC_SHARED_EXTENSION")), QString::fromLocal8Bit(qgetenv("QTC_SHARED_EXTENSION")),
false, false,
this), this),
@@ -909,13 +907,11 @@ bool SettingsAccessor::SettingsData::isValid() const
static const char VERSION_KEY[] = "ProjectExplorer.Project.Updater.FileVersion"; static const char VERSION_KEY[] = "ProjectExplorer.Project.Updater.FileVersion";
static const char ENVIRONMENT_ID_KEY[] = "ProjectExplorer.Project.Updater.EnvironmentId"; static const char ENVIRONMENT_ID_KEY[] = "ProjectExplorer.Project.Updater.EnvironmentId";
SettingsAccessor::FileAccessor::FileAccessor(const QByteArray &id, SettingsAccessor::FileAccessor::FileAccessor(const QString &defaultSuffix,
const QString &defaultSuffix,
const QString &environmentSuffix, const QString &environmentSuffix,
bool envSpecific, bool envSpecific,
SettingsAccessor *accessor) SettingsAccessor *accessor)
: m_id(id) : m_environmentSpecific(envSpecific)
, m_environmentSpecific(envSpecific)
, m_accessor(accessor) , m_accessor(accessor)
, m_writer(0) , m_writer(0)
{ {

5
src/plugins/projectexplorer/settingsaccessor.h
View File

@@ -96,8 +96,7 @@ private:
class FileAccessor class FileAccessor
{ {
public: public:
FileAccessor(const QByteArray &id, FileAccessor(const QString &defaultSuffix,
const QString &defaultSuffix,
const QString &environmentSuffix, const QString &environmentSuffix,
bool envSpecific, bool envSpecific,
SettingsAccessor *accessor); SettingsAccessor *accessor);
@@ -107,12 +106,10 @@ private:
bool writeFile(const SettingsData *settings) const; bool writeFile(const SettingsData *settings) const;
QString suffix() const { return m_suffix; } QString suffix() const { return m_suffix; }
QByteArray id() const { return m_id; }
private: private:
void assignSuffix(const QString &defaultSuffix, const QString &environmentSuffix); void assignSuffix(const QString &defaultSuffix, const QString &environmentSuffix);
QByteArray m_id;
QString m_suffix; QString m_suffix;
bool m_environmentSpecific; bool m_environmentSpecific;
SettingsAccessor *m_accessor; SettingsAccessor *m_accessor;