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

SettingsAccessor: Make readFile/upgradeSettigns protected

Browse Source 
Change-Id: I58b6e9e9b100ba466f9cc2f20416b208e1636829
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-02-28 16:13:34 +01:00
parent 51df3d0588
commit 410272931e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,11 @@ public:
static QVariantMap setOriginalVersionInMap(const QVariantMap &data, int version); static QVariantMap setOriginalVersionInMap(const QVariantMap &data, int version);
void addVersionUpgrader(Internal::VersionUpgrader *handler); // Takes ownership of the handler! void addVersionUpgrader(Internal::VersionUpgrader *handler); // Takes ownership of the handler!
protected:
QVariantMap readFile(const Utils::FileName &path) const;
QVariantMap upgradeSettings(const QVariantMap &data, int toVersion) const;
private: private:
QStringList findSettingsFiles(const QString &suffix) const; QStringList findSettingsFiles(const QString &suffix) const;
static QByteArray creatorId(); static QByteArray creatorId();
@@ -68,14 +73,10 @@ private:
int currentVersion() const; int currentVersion() const;
void backupUserFile() const; void backupUserFile() const;
QVariantMap upgradeSettings(const QVariantMap &data, int toVersion) const;
QVariantMap readUserSettings(QWidget *parent) const; QVariantMap readUserSettings(QWidget *parent) const;
QVariantMap readSharedSettings(QWidget *parent) const; QVariantMap readSharedSettings(QWidget *parent) const;
QVariantMap mergeSettings(const QVariantMap &userMap, const QVariantMap &sharedMap) const; QVariantMap mergeSettings(const QVariantMap &userMap, const QVariantMap &sharedMap) const;
QVariantMap readFile(const Utils::FileName &path) const;
static QByteArray environmentIdFromMap(const QVariantMap &data); static QByteArray environmentIdFromMap(const QVariantMap &data);
int m_firstVersion; int m_firstVersion;