From 410272931e42ee32c5bee4d20ee44f76b9c1976c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 28 Feb 2014 16:13:34 +0100 Subject: [PATCH] SettingsAccessor: Make readFile/upgradeSettigns protected Change-Id: I58b6e9e9b100ba466f9cc2f20416b208e1636829 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/settingsaccessor.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h index ae2c75b0932..618a5984621 100644 --- a/src/plugins/projectexplorer/settingsaccessor.h +++ b/src/plugins/projectexplorer/settingsaccessor.h @@ -61,6 +61,11 @@ public: static QVariantMap setOriginalVersionInMap(const QVariantMap &data, int version); 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: QStringList findSettingsFiles(const QString &suffix) const; static QByteArray creatorId(); @@ -68,14 +73,10 @@ private: int currentVersion() const; void backupUserFile() const; - QVariantMap upgradeSettings(const QVariantMap &data, int toVersion) const; - QVariantMap readUserSettings(QWidget *parent) const; QVariantMap readSharedSettings(QWidget *parent) const; QVariantMap mergeSettings(const QVariantMap &userMap, const QVariantMap &sharedMap) const; - QVariantMap readFile(const Utils::FileName &path) const; - static QByteArray environmentIdFromMap(const QVariantMap &data); int m_firstVersion;