aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/settingsaccessor.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-04-18 13:36:45 +0200
committerhjk <hjk@qt.io>2023-04-26 06:23:21 +0000
commitb4a6af026e5bce2340a900a92250e61d9205e511 (patch)
tree322711149e8c3a7902c3e947394e3a3a853ad85f /src/libs/utils/settingsaccessor.cpp
parentfe3887e2bf41efb4d62d62b2e94e81471323b95b (diff)
Utils: Remove displayName from SettingsAccessors
It was not used. Change-Id: I7c0927698bf31548ec076c39881561d72e8495e6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/utils/settingsaccessor.cpp')
-rw-r--r--src/libs/utils/settingsaccessor.cpp24
1 files changed, 7 insertions, 17 deletions
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp
index dc3cd0711e..24f922bf98 100644
--- a/src/libs/utils/settingsaccessor.cpp
+++ b/src/libs/utils/settingsaccessor.cpp
@@ -39,15 +39,10 @@ QMessageBox::StandardButtons SettingsAccessor::Issue::allButtons() const
/*!
* The SettingsAccessor can be used to read/write settings in XML format.
*/
-SettingsAccessor::SettingsAccessor(const QString &docType,
- const QString &displayName,
- const QString &applicationDisplayName) :
-docType(docType),
-displayName(displayName),
-applicationDisplayName(applicationDisplayName)
+SettingsAccessor::SettingsAccessor(const QString &docType, const QString &applicationDisplayName)
+ : docType(docType), applicationDisplayName(applicationDisplayName)
{
QTC_CHECK(!docType.isEmpty());
- QTC_CHECK(!displayName.isEmpty());
QTC_CHECK(!applicationDisplayName.isEmpty());
}
@@ -227,16 +222,14 @@ std::optional<FilePath> BackUpStrategy::backupName(const QVariantMap &oldData,
}
BackingUpSettingsAccessor::BackingUpSettingsAccessor(const QString &docType,
- const QString &displayName,
const QString &applicationDisplayName) :
- BackingUpSettingsAccessor(std::make_unique<BackUpStrategy>(), docType, displayName, applicationDisplayName)
+ BackingUpSettingsAccessor(std::make_unique<BackUpStrategy>(), docType, applicationDisplayName)
{ }
BackingUpSettingsAccessor::BackingUpSettingsAccessor(std::unique_ptr<BackUpStrategy> &&strategy,
const QString &docType,
- const QString &displayName,
const QString &applicationDisplayName) :
- SettingsAccessor(docType, displayName, applicationDisplayName),
+ SettingsAccessor(docType, applicationDisplayName),
m_strategy(std::move(strategy))
{ }
@@ -411,17 +404,15 @@ QVariantMap VersionUpgrader::renameKeys(const QList<Change> &changes, QVariantMa
* upgrade the settings on load to the latest supported version (if possible).
*/
UpgradingSettingsAccessor::UpgradingSettingsAccessor(const QString &docType,
- const QString &displayName,
const QString &applicationDisplayName) :
UpgradingSettingsAccessor(std::make_unique<VersionedBackUpStrategy>(this), docType,
- displayName, applicationDisplayName)
+ applicationDisplayName)
{ }
UpgradingSettingsAccessor::UpgradingSettingsAccessor(std::unique_ptr<BackUpStrategy> &&strategy,
const QString &docType,
- const QString &displayName,
const QString &applicationDisplayName) :
- BackingUpSettingsAccessor(std::move(strategy), docType, displayName, applicationDisplayName)
+ BackingUpSettingsAccessor(std::move(strategy), docType, applicationDisplayName)
{ }
int UpgradingSettingsAccessor::currentVersion() const
@@ -579,9 +570,8 @@ UpgradingSettingsAccessor::validateVersionRange(const RestoreData &data) const
*/
MergingSettingsAccessor::MergingSettingsAccessor(std::unique_ptr<BackUpStrategy> &&strategy,
const QString &docType,
- const QString &displayName,
const QString &applicationDisplayName) :
- UpgradingSettingsAccessor(std::move(strategy), docType, displayName, applicationDisplayName)
+ UpgradingSettingsAccessor(std::move(strategy), docType, applicationDisplayName)
{ }
SettingsAccessor::RestoreData MergingSettingsAccessor::readData(const FilePath &path,