diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 766f2eac9db..16fb5c9699e 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -45,10 +45,10 @@ const char VERSION_KEY[] = "Version"; namespace Utils { // -------------------------------------------------------------------- -// BasicSettingsAccessor::Issue: +// SettingsAccessor::Issue: // -------------------------------------------------------------------- -QMessageBox::StandardButtons BasicSettingsAccessor::Issue::allButtons() const +QMessageBox::StandardButtons SettingsAccessor::Issue::allButtons() const { QMessageBox::StandardButtons result = QMessageBox::NoButton; for (const QMessageBox::StandardButton &b : buttons.keys()) @@ -57,18 +57,18 @@ QMessageBox::StandardButtons BasicSettingsAccessor::Issue::allButtons() const } // -------------------------------------------------------------------- -// BasicSettingsAccessor: +// SettingsAccessor: // -------------------------------------------------------------------- /*! - * The BasicSettingsAccessor can be used to read/write settings in XML format. + * The SettingsAccessor can be used to read/write settings in XML format. */ -BasicSettingsAccessor::BasicSettingsAccessor(const QString &docType, - const QString &displayName, - const QString &applicationDisplayName) : - docType(docType), - displayName(displayName), - applicationDisplayName(applicationDisplayName) +SettingsAccessor::SettingsAccessor(const QString &docType, + const QString &displayName, + const QString &applicationDisplayName) : +docType(docType), +displayName(displayName), +applicationDisplayName(applicationDisplayName) { QTC_CHECK(!docType.isEmpty()); QTC_CHECK(!displayName.isEmpty()); @@ -78,7 +78,7 @@ BasicSettingsAccessor::BasicSettingsAccessor(const QString &docType, /*! * Restore settings from disk and report any issues in a message box centered on \a parent. */ -QVariantMap BasicSettingsAccessor::restoreSettings(QWidget *parent) const +QVariantMap SettingsAccessor::restoreSettings(QWidget *parent) const { QTC_ASSERT(!m_baseFilePath.isEmpty(), return QVariantMap()); @@ -90,7 +90,7 @@ QVariantMap BasicSettingsAccessor::restoreSettings(QWidget *parent) const /*! * Save \a data to disk and report any issues in a message box centered on \a parent. */ -bool BasicSettingsAccessor::saveSettings(const QVariantMap &data, QWidget *parent) const +bool SettingsAccessor::saveSettings(const QVariantMap &data, QWidget *parent) const { const optional result = writeData(m_baseFilePath, data, parent); const ProceedInfo pi = result ? reportIssues(result.value(), m_baseFilePath, parent) : ProceedInfo::Continue; @@ -100,8 +100,7 @@ bool BasicSettingsAccessor::saveSettings(const QVariantMap &data, QWidget *paren /*! * Read data from \a path. Do all the necessary postprocessing of the data. */ -BasicSettingsAccessor::RestoreData BasicSettingsAccessor::readData(const FileName &path, - QWidget *parent) const +SettingsAccessor::RestoreData SettingsAccessor::readData(const FileName &path, QWidget *parent) const { Q_UNUSED(parent); RestoreData result = readFile(path); @@ -113,8 +112,8 @@ BasicSettingsAccessor::RestoreData BasicSettingsAccessor::readData(const FileNam /*! * Store the \a data in \a path on disk. Do all the necessary preprocessing of the data. */ -Utils::optional -BasicSettingsAccessor::writeData(const FileName &path, const QVariantMap &data, QWidget *parent) const +Utils::optional +SettingsAccessor::writeData(const FileName &path, const QVariantMap &data, QWidget *parent) const { Q_UNUSED(parent); return writeFile(path, prepareToWriteSettings(data)); @@ -125,7 +124,7 @@ BasicSettingsAccessor::writeData(const FileName &path, const QVariantMap &data, * * This method does not do *any* processing of the file contents. */ -BasicSettingsAccessor::RestoreData BasicSettingsAccessor::readFile(const FileName &path) const +SettingsAccessor::RestoreData SettingsAccessor::readFile(const FileName &path) const { PersistentSettingsReader reader; if (!reader.load(path)) { @@ -142,8 +141,8 @@ BasicSettingsAccessor::RestoreData BasicSettingsAccessor::readFile(const FileNam * * This method does not do *any* processing of the file contents. */ -Utils::optional -BasicSettingsAccessor::writeFile(const FileName &path, const QVariantMap &data) const +Utils::optional +SettingsAccessor::writeFile(const FileName &path, const QVariantMap &data) const { if (data.isEmpty()) { return Issue(QCoreApplication::translate("Utils::SettingsAccessor", "Failed to Write File"), @@ -162,9 +161,9 @@ BasicSettingsAccessor::writeFile(const FileName &path, const QVariantMap &data) return {}; } -BasicSettingsAccessor::ProceedInfo -BasicSettingsAccessor::reportIssues(const BasicSettingsAccessor::Issue &issue, const FileName &path, - QWidget *parent) const +SettingsAccessor::ProceedInfo +SettingsAccessor::reportIssues(const SettingsAccessor::Issue &issue, const FileName &path, + QWidget *parent) const { if (!path.exists()) return Continue; @@ -187,7 +186,7 @@ BasicSettingsAccessor::reportIssues(const BasicSettingsAccessor::Issue &issue, c /*! * This method is called right after reading data from disk and modifies \a data. */ -QVariantMap BasicSettingsAccessor::preprocessReadSettings(const QVariantMap &data) const +QVariantMap SettingsAccessor::preprocessReadSettings(const QVariantMap &data) const { return data; } @@ -195,7 +194,7 @@ QVariantMap BasicSettingsAccessor::preprocessReadSettings(const QVariantMap &dat /*! * This method is called right before writing data to disk and modifies \a data. */ -QVariantMap BasicSettingsAccessor::prepareToWriteSettings(const QVariantMap &data) const +QVariantMap SettingsAccessor::prepareToWriteSettings(const QVariantMap &data) const { return data; } @@ -214,8 +213,8 @@ FileNameList BackUpStrategy::readFileCandidates(const FileName &baseFileName) co return Utils::transform(list, [](const QFileInfo &fi) { return FileName::fromString(fi.absoluteFilePath()); }); } -int BackUpStrategy::compare(const BasicSettingsAccessor::RestoreData &data1, - const BasicSettingsAccessor::RestoreData &data2) const +int BackUpStrategy::compare(const SettingsAccessor::RestoreData &data1, + const SettingsAccessor::RestoreData &data2) const { if (!data1.hasError() && !data1.data.isEmpty()) return -1; @@ -246,11 +245,11 @@ BackingUpSettingsAccessor::BackingUpSettingsAccessor(std::unique_ptrNo valid settings file could be found.

" "

All settings files found in directory \"%1\" " "were unsuitable for the current version of %2.

") @@ -275,7 +274,7 @@ BackingUpSettingsAccessor::readData(const Utils::FileName &path, QWidget *parent return result; } -Utils::optional +Utils::optional BackingUpSettingsAccessor::writeData(const Utils::FileName &path, const QVariantMap &data, QWidget *parent) const { @@ -284,7 +283,7 @@ BackingUpSettingsAccessor::writeData(const Utils::FileName &path, const QVariant backupFile(path, data, parent); - return BasicSettingsAccessor::writeData(path, data, parent); + return SettingsAccessor::writeData(path, data, parent); } FileNameList BackingUpSettingsAccessor::readFileCandidates(const Utils::FileName &path) const @@ -296,12 +295,12 @@ FileNameList BackingUpSettingsAccessor::readFileCandidates(const Utils::FileName return result; } -BasicSettingsAccessor::RestoreData +SettingsAccessor::RestoreData BackingUpSettingsAccessor::bestReadFileData(const FileNameList &candidates, QWidget *parent) const { - BasicSettingsAccessor::RestoreData bestMatch; + SettingsAccessor::RestoreData bestMatch; for (const FileName &c : candidates) { - RestoreData cData = BasicSettingsAccessor::readData(c, parent); + RestoreData cData = SettingsAccessor::readData(c, parent); if (m_strategy->compare(bestMatch, cData) > 0) bestMatch = cData; } @@ -311,7 +310,7 @@ BackingUpSettingsAccessor::bestReadFileData(const FileNameList &candidates, QWid void BackingUpSettingsAccessor::backupFile(const FileName &path, const QVariantMap &data, QWidget *parent) const { - RestoreData oldSettings = BasicSettingsAccessor::readData(path, parent); + RestoreData oldSettings = SettingsAccessor::readData(path, parent); if (oldSettings.data.isEmpty()) return; @@ -332,8 +331,8 @@ VersionedBackUpStrategy::VersionedBackUpStrategy(const UpgradingSettingsAccessor QTC_CHECK(accessor); } -int VersionedBackUpStrategy::compare(const BasicSettingsAccessor::RestoreData &data1, - const BasicSettingsAccessor::RestoreData &data2) const +int VersionedBackUpStrategy::compare(const SettingsAccessor::RestoreData &data1, + const SettingsAccessor::RestoreData &data2) const { const int origVersion = versionFromMap(data1.data); const bool origValid = m_accessor->isValidVersionAndId(origVersion, settingsIdFromMap(data1.data)); @@ -450,8 +449,8 @@ bool UpgradingSettingsAccessor::isValidVersionAndId(const int version, const QBy && (id == m_id || m_id.isEmpty()); } -BasicSettingsAccessor::RestoreData UpgradingSettingsAccessor::readData(const FileName &path, - QWidget *parent) const +SettingsAccessor::RestoreData UpgradingSettingsAccessor::readData(const FileName &path, + QWidget *parent) const { return upgradeSettings(BackingUpSettingsAccessor::readData(path, parent), currentVersion()); } @@ -490,7 +489,7 @@ VersionUpgrader *UpgradingSettingsAccessor::upgrader(const int version) const return upgrader; } -BasicSettingsAccessor::RestoreData +SettingsAccessor::RestoreData UpgradingSettingsAccessor::upgradeSettings(const RestoreData &data, const int targetVersion) const { if (data.hasError()) @@ -517,7 +516,7 @@ UpgradingSettingsAccessor::upgradeSettings(const RestoreData &data, const int ta return result; } -BasicSettingsAccessor::RestoreData +SettingsAccessor::RestoreData UpgradingSettingsAccessor::validateVersionRange(const RestoreData &data) const { RestoreData result = data; @@ -588,8 +587,8 @@ MergingSettingsAccessor::MergingSettingsAccessor(std::unique_ptr UpgradingSettingsAccessor(std::move(strategy), docType, displayName, applicationDisplayName) { } -BasicSettingsAccessor::RestoreData MergingSettingsAccessor::readData(const FileName &path, - QWidget *parent) const +SettingsAccessor::RestoreData MergingSettingsAccessor::readData(const FileName &path, + QWidget *parent) const { RestoreData mainData = UpgradingSettingsAccessor::readData(path, parent); // FULLY upgraded! if (mainData.hasIssue()) { @@ -614,9 +613,9 @@ BasicSettingsAccessor::RestoreData MergingSettingsAccessor::readData(const FileN // that perfectly match corresponding user ones. If we don't have valid user // settings to compare against, there's nothing we can do. - secondaryData.issue = Issue(QApplication::translate("Utils::BasicSettingsAccessor", + secondaryData.issue = Issue(QApplication::translate("Utils::SettingsAccessor", "Unsupported Merge Settings File"), - QApplication::translate("Utils::BasicSettingsAccessor", + QApplication::translate("Utils::SettingsAccessor", "\"%1\" is not supported by %1. " "Do you want to try loading it anyway?") .arg(secondaryData.path.toUserOutput()) @@ -639,7 +638,7 @@ BasicSettingsAccessor::RestoreData MergingSettingsAccessor::readData(const FileN return mergeSettings(mainData, secondaryData); } -void MergingSettingsAccessor::setSecondaryAccessor(std::unique_ptr &&secondary) +void MergingSettingsAccessor::setSecondaryAccessor(std::unique_ptr &&secondary) { m_secondaryAccessor = std::move(secondary); } @@ -647,9 +646,9 @@ void MergingSettingsAccessor::setSecondaryAccessor(std::unique_ptr>; // -------------------------------------------------------------------- -// BasicSettingsAccessor: +// SettingsAccessor: // -------------------------------------------------------------------- // Read/write files incl. error handling suitable for the UI: -class QTCREATOR_UTILS_EXPORT BasicSettingsAccessor +class QTCREATOR_UTILS_EXPORT SettingsAccessor { public: - BasicSettingsAccessor(const QString &docType, const QString &displayName, - const QString &applicationDisplayName); - virtual ~BasicSettingsAccessor() = default; + SettingsAccessor(const QString &docType, const QString &displayName, + const QString &applicationDisplayName); + virtual ~SettingsAccessor() = default; enum ProceedInfo { Continue, DiscardAndContinue }; typedef QHash ButtonMap; @@ -154,14 +154,14 @@ public: virtual FileNameList readFileCandidates(const Utils::FileName &baseFileName) const; // Return -1 if data1 is better that data2, 0 if both are equally worthwhile // and 1 if data2 is better than data1 - virtual int compare(const BasicSettingsAccessor::RestoreData &data1, - const BasicSettingsAccessor::RestoreData &data2) const; + virtual int compare(const SettingsAccessor::RestoreData &data1, + const SettingsAccessor::RestoreData &data2) const; virtual optional backupName(const QVariantMap &oldData, const FileName &path, const QVariantMap &data) const; }; -class QTCREATOR_UTILS_EXPORT BackingUpSettingsAccessor : public BasicSettingsAccessor +class QTCREATOR_UTILS_EXPORT BackingUpSettingsAccessor : public SettingsAccessor { public: BackingUpSettingsAccessor(const QString &docType, const QString &displayName, @@ -196,8 +196,8 @@ public: // Return -1 if data1 is better that data2, 0 if both are equally worthwhile // and 1 if data2 is better than data1 - int compare(const BasicSettingsAccessor::RestoreData &data1, - const BasicSettingsAccessor::RestoreData &data2) const override; + int compare(const SettingsAccessor::RestoreData &data1, + const SettingsAccessor::RestoreData &data2) const override; optional backupName(const QVariantMap &oldData, const FileName &path, const QVariantMap &data) const override; @@ -282,7 +282,7 @@ public: RestoreData readData(const Utils::FileName &path, QWidget *parent) const final; - void setSecondaryAccessor(std::unique_ptr &&secondary); + void setSecondaryAccessor(std::unique_ptr &&secondary); protected: @@ -296,7 +296,7 @@ protected: const QVariantMap &result) const; private: - std::unique_ptr m_secondaryAccessor; + std::unique_ptr m_secondaryAccessor; }; using SettingsMergeFunction = std::function(docType, displayName, applicationDisplayName); + = std::make_unique(docType, displayName, applicationDisplayName); secondary->setBaseFilePath(sharedFile()); setSecondaryAccessor(std::move(secondary)); diff --git a/tests/auto/utils/settings/tst_settings.cpp b/tests/auto/utils/settings/tst_settings.cpp index 07578f6ca5c..867f9bbe910 100644 --- a/tests/auto/utils/settings/tst_settings.cpp +++ b/tests/auto/utils/settings/tst_settings.cpp @@ -111,8 +111,8 @@ protected: Utils::optional writeFile(const Utils::FileName &path, const QVariantMap &data) const override { if (data.isEmpty()) { - return Issue(QCoreApplication::translate("Utils::BasicSettingsAccessor", "Failed to Write File"), - QCoreApplication::translate("Utils::BasicSettingsAccessor", "There was nothing to write."), + return Issue(QCoreApplication::translate("Utils::SettingsAccessor", "Failed to Write File"), + QCoreApplication::translate("Utils::SettingsAccessor", "There was nothing to write."), Issue::Type::WARNING); } @@ -235,14 +235,14 @@ static QVariantMap versionedMap(int version, const QByteArray &id = QByteArray() return result; } -static Utils::BasicSettingsAccessor::RestoreData restoreData(const Utils::FileName &path, - const QVariantMap &data) +static Utils::SettingsAccessor::RestoreData restoreData(const Utils::FileName &path, + const QVariantMap &data) { - return Utils::BasicSettingsAccessor::RestoreData(path, data); + return Utils::SettingsAccessor::RestoreData(path, data); } -static Utils::BasicSettingsAccessor::RestoreData restoreData(const QByteArray &path, - const QVariantMap &data) +static Utils::SettingsAccessor::RestoreData restoreData(const QByteArray &path, + const QVariantMap &data) { return restoreData(Utils::FileName::fromUtf8(path), data); } @@ -344,8 +344,8 @@ void tst_SettingsAccessor::RestoreDataCompare() { const TestSettingsAccessor accessor; - Utils::BasicSettingsAccessor::RestoreData a = restoreData("/foo/bar", versionedMap(5, TESTACCESSOR_DEFAULT_ID)); - Utils::BasicSettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(6, TESTACCESSOR_DEFAULT_ID)); + Utils::SettingsAccessor::RestoreData a = restoreData("/foo/bar", versionedMap(5, TESTACCESSOR_DEFAULT_ID)); + Utils::SettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(6, TESTACCESSOR_DEFAULT_ID)); QCOMPARE(accessor.strategy()->compare(a, a), 0); QCOMPARE(accessor.strategy()->compare(a, b), 1); @@ -356,8 +356,8 @@ void tst_SettingsAccessor::RestoreDataCompare_idMismatch() { const TestSettingsAccessor accessor; - Utils::BasicSettingsAccessor::RestoreData a = restoreData("/foo/bar", versionedMap(5, TESTACCESSOR_DEFAULT_ID)); - Utils::BasicSettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(6, "foo")); + Utils::SettingsAccessor::RestoreData a = restoreData("/foo/bar", versionedMap(5, TESTACCESSOR_DEFAULT_ID)); + Utils::SettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(6, "foo")); QCOMPARE(accessor.strategy()->compare(a, b), -1); QCOMPARE(accessor.strategy()->compare(b, a), 1); @@ -367,8 +367,8 @@ void tst_SettingsAccessor::RestoreDataCompare_noId() { const TestSettingsAccessor accessor(Utils::FileName::fromString("/foo/baz"), QByteArray()); - Utils::BasicSettingsAccessor::RestoreData a = restoreData("/foo/bar", versionedMap(5, TESTACCESSOR_DEFAULT_ID)); - Utils::BasicSettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(6, "foo")); + Utils::SettingsAccessor::RestoreData a = restoreData("/foo/bar", versionedMap(5, TESTACCESSOR_DEFAULT_ID)); + Utils::SettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(6, "foo")); QCOMPARE(accessor.strategy()->compare(a, b), 1); QCOMPARE(accessor.strategy()->compare(b, a), -1); @@ -378,8 +378,8 @@ void tst_SettingsAccessor::RestoreDataCompare_sameVersion() { const TestSettingsAccessor accessor; - Utils::BasicSettingsAccessor::RestoreData a = restoreData("/foo/bar", versionedMap(7, TESTACCESSOR_DEFAULT_ID)); - Utils::BasicSettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(7, TESTACCESSOR_DEFAULT_ID)); + Utils::SettingsAccessor::RestoreData a = restoreData("/foo/bar", versionedMap(7, TESTACCESSOR_DEFAULT_ID)); + Utils::SettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(7, TESTACCESSOR_DEFAULT_ID)); QCOMPARE(accessor.strategy()->compare(a, b), 0); QCOMPARE(accessor.strategy()->compare(b, a), 0); @@ -389,8 +389,8 @@ void tst_SettingsAccessor::RestoreDataCompare_emptyMap() { const TestSettingsAccessor accessor; - Utils::BasicSettingsAccessor::RestoreData a = restoreData("/foo/bar", QVariantMap()); - Utils::BasicSettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(7, TESTACCESSOR_DEFAULT_ID)); + Utils::SettingsAccessor::RestoreData a = restoreData("/foo/bar", QVariantMap()); + Utils::SettingsAccessor::RestoreData b = restoreData("/foo/baz", versionedMap(7, TESTACCESSOR_DEFAULT_ID)); QCOMPARE(accessor.strategy()->compare(a, b), 1); QCOMPARE(accessor.strategy()->compare(b, a), -1); @@ -400,8 +400,8 @@ void tst_SettingsAccessor::RestoreDataCompare_twoEmptyMaps() { const TestSettingsAccessor accessor; - Utils::BasicSettingsAccessor::RestoreData a = restoreData("/foo/bar", QVariantMap()); - Utils::BasicSettingsAccessor::RestoreData b = restoreData("/foo/baz", QVariantMap()); + Utils::SettingsAccessor::RestoreData a = restoreData("/foo/bar", QVariantMap()); + Utils::SettingsAccessor::RestoreData b = restoreData("/foo/baz", QVariantMap()); QCOMPARE(accessor.strategy()->compare(a, b), 0); QCOMPARE(accessor.strategy()->compare(b, a), 0); @@ -411,11 +411,11 @@ void tst_SettingsAccessor::upgradeSettings_noUpgradeNecessary() { const TestSettingsAccessor accessor; const int startVersion = 8; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, TESTACCESSOR_DEFAULT_ID, generateExtraData())); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); QVERIFY(!result.hasIssue()); for (auto it = result.data.cbegin(); it != result.data.cend(); ++it) { @@ -433,12 +433,12 @@ void tst_SettingsAccessor::upgradeSettings_invalidId() { const TestSettingsAccessor accessor; const int startVersion = 8; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, "foo", generateExtraData())); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); // Data is unchanged QVERIFY(result.hasWarning()); @@ -457,11 +457,11 @@ void tst_SettingsAccessor::upgradeSettings_tooOld() { const TestSettingsAccessor accessor; const int startVersion = 1; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, TESTACCESSOR_DEFAULT_ID, generateExtraData())); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); // Data is unchanged QVERIFY(result.hasIssue()); @@ -472,11 +472,11 @@ void tst_SettingsAccessor::upgradeSettings_tooNew() { const TestSettingsAccessor accessor; const int startVersion = 42; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, TESTACCESSOR_DEFAULT_ID, generateExtraData())); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); // Data is unchanged QVERIFY(result.hasIssue()); @@ -487,11 +487,11 @@ void tst_SettingsAccessor::upgradeSettings_oneStep() { const TestSettingsAccessor accessor; const int startVersion = 7; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, TESTACCESSOR_DEFAULT_ID, generateExtraData())); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); QVERIFY(!result.hasIssue()); for (auto it = result.data.cbegin(); it != result.data.cend(); ++it) { @@ -513,12 +513,12 @@ void tst_SettingsAccessor::upgradeSettings_twoSteps() { const TestSettingsAccessor accessor; const int startVersion = 6; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, TESTACCESSOR_DEFAULT_ID, generateExtraData())); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 8); QVERIFY(!result.hasIssue()); for (auto it = result.data.cbegin(); it != result.data.cend(); ++it) { @@ -542,11 +542,11 @@ void tst_SettingsAccessor::upgradeSettings_partialUpdate() { const TestSettingsAccessor accessor; const int startVersion = 6; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, TESTACCESSOR_DEFAULT_ID, generateExtraData())); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 7); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 7); QVERIFY(!result.hasIssue()); for (auto it = result.data.cbegin(); it != result.data.cend(); ++it) { @@ -569,11 +569,11 @@ void tst_SettingsAccessor::upgradeSettings_targetVersionTooOld() const TestSettingsAccessor accessor; const QVariantMap extra = generateExtraData(); const int startVersion = 6; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, TESTACCESSOR_DEFAULT_ID, extra)); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 2); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 2); // result is unchanged! QVERIFY(!result.hasIssue()); @@ -585,11 +585,11 @@ void tst_SettingsAccessor::upgradeSettings_targetVersionTooNew() const TestSettingsAccessor accessor; const QVariantMap extra = generateExtraData(); const int startVersion = 6; - const Utils::BasicSettingsAccessor::RestoreData input + const Utils::SettingsAccessor::RestoreData input = restoreData(accessor.baseFilePath(), versionedMap(startVersion, TESTACCESSOR_DEFAULT_ID, extra)); - const Utils::BasicSettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 42); + const Utils::SettingsAccessor::RestoreData result = accessor.upgradeSettings(input, 42); // result is unchanged! QVERIFY(!result.hasIssue());