diff options
| -rw-r--r-- | src/plugins/projectexplorer/userfileaccessor.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/projectexplorer/userfileaccessor.h b/src/plugins/projectexplorer/userfileaccessor.h index 0b242453e03..be9cfda2e27 100644 --- a/src/plugins/projectexplorer/userfileaccessor.h +++ b/src/plugins/projectexplorer/userfileaccessor.h @@ -20,22 +20,22 @@ class UserFileAccessor : public Utils::MergingSettingsAccessor public: UserFileAccessor(Project *project); - virtual QVariant retrieveSharedSettings() const; - - Utils::FilePath projectUserFile() const; - Utils::FilePath externalUserFile() const; - Utils::FilePath sharedFile() const; - protected: + Utils::Store prepareToWriteSettings(const Utils::Store &data) const final; + +private: Utils::Store postprocessMerge(const Utils::Store &main, const Utils::Store &secondary, const Utils::Store &result) const final; - Utils::Store prepareToWriteSettings(const Utils::Store &data) const final; - Utils::SettingsMergeResult merge(const SettingsMergeData &global, const SettingsMergeData &local) const final; -private: + + virtual QVariant retrieveSharedSettings() const; + + Utils::FilePath projectUserFile() const; + Utils::FilePath externalUserFile() const; + Utils::FilePath sharedFile() const; Utils::SettingsMergeFunction userStickyTrackerFunction(Utils::KeyList &stickyKeys) const; Project * const m_project; |