aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/settingsaccessor.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-03-07 17:34:09 +0100
committerTobias Hunger <tobias.hunger@qt.io>2018-04-20 09:14:59 +0000
commitb9278a88d069015172f34222a36605f9a341f31a (patch)
treee0c512077ac54b7450f535fa5ded442b25c5af94 /src/libs/utils/settingsaccessor.h
parent95446fb6145ebf0e155afe47353e484a5388f59b (diff)
ToolChain: Use SettingsAccessor to access XML settings
This allows for use of the new SettingsAccessor infrastructure for upgrading, backups, etc. Task-number: QTCREATORBUG-20148 Change-Id: I5419c86c0fd576a59ec91c212097c8f987e01da2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/utils/settingsaccessor.h')
-rw-r--r--src/libs/utils/settingsaccessor.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/utils/settingsaccessor.h b/src/libs/utils/settingsaccessor.h
index be64438ec95..36b2a257ae5 100644
--- a/src/libs/utils/settingsaccessor.h
+++ b/src/libs/utils/settingsaccessor.h
@@ -129,6 +129,7 @@ public:
protected:
// Report errors:
+ QVariantMap restoreSettings(const Utils::FileName &settingsPath, QWidget *parent) const;
ProceedInfo reportIssues(const Issue &issue, const FileName &path, QWidget *parent) const;
virtual QVariantMap preprocessReadSettings(const QVariantMap &data) const;
@@ -234,7 +235,8 @@ class MergingSettingsAccessor;
class QTCREATOR_UTILS_EXPORT UpgradingSettingsAccessor : public BackingUpSettingsAccessor
{
public:
- UpgradingSettingsAccessor(const QString &displayName, const QString &applicationDisplayName);
+ UpgradingSettingsAccessor(const QString &docType,
+ const QString &displayName, const QString &applicationDisplayName);
UpgradingSettingsAccessor(std::unique_ptr<BackUpStrategy> &&strategy, const QString &docType,
const QString &displayName, const QString &appDisplayName);