Skip to content
Snippets Groups Projects
Commit 41027293 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

SettingsAccessor: Make readFile/upgradeSettigns protected


Change-Id: I58b6e9e9b100ba466f9cc2f20416b208e1636829
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 51df3d05
No related branches found
No related tags found
No related merge requests found
...@@ -61,6 +61,11 @@ public: ...@@ -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: ...@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment