Utils: Remove displayName from SettingsAccessors

It was not used.

Change-Id: I7c0927698bf31548ec076c39881561d72e8495e6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

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,
+SettingsAccessor::SettingsAccessor(const QString &docType, const QString &applicationDisplayName)
-                                   const QString &displayName,
+    : docType(docType), applicationDisplayName(applicationDisplayName)
-                                   const QString &applicationDisplayName) :
-docType(docType),
-displayName(displayName),
-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,

src/libs/utils/settingsaccessor.h

@@ -51,8 +51,7 @@ using SettingsMergeResult = std::optional<QPair<QString, QVariant>>;
 class QTCREATOR_UTILS_EXPORT SettingsAccessor
 {
 public:
-    SettingsAccessor(const QString &docType, const QString &displayName,
+    SettingsAccessor(const QString &docType, const QString &applicationDisplayName);
-                     const QString &applicationDisplayName);
     virtual ~SettingsAccessor();
 
     enum ProceedInfo { Continue, DiscardAndContinue };
@@ -96,7 +95,6 @@ public:
     bool saveSettings(const QVariantMap &data, QWidget *parent) const;
 
     const QString docType;
-    const QString displayName;
     const QString applicationDisplayName;
 
     void setBaseFilePath(const FilePath &baseFilePath) { m_baseFilePath = baseFilePath; }
@@ -148,10 +146,9 @@ public:
 class QTCREATOR_UTILS_EXPORT BackingUpSettingsAccessor : public SettingsAccessor
 {
 public:
-    BackingUpSettingsAccessor(const QString &docType, const QString &displayName,
+    BackingUpSettingsAccessor(const QString &docType, const QString &applicationDisplayName);
-                              const QString &applicationDisplayName);
     BackingUpSettingsAccessor(std::unique_ptr<BackUpStrategy> &&strategy, const QString &docType,
-                              const QString &displayName, const QString &applicationDisplayName);
+                              const QString &applicationDisplayName);
 
     RestoreData readData(const FilePath &path, QWidget *parent) const override;
     std::optional<Issue> writeData(const FilePath &path,
@@ -220,10 +217,9 @@ class MergingSettingsAccessor;
 class QTCREATOR_UTILS_EXPORT UpgradingSettingsAccessor : public BackingUpSettingsAccessor
 {
 public:
-    UpgradingSettingsAccessor(const QString &docType,
+    UpgradingSettingsAccessor(const QString &docType, const QString &applicationDisplayName);
-                              const QString &displayName, const QString &applicationDisplayName);
     UpgradingSettingsAccessor(std::unique_ptr<BackUpStrategy> &&strategy, const QString &docType,
-                              const QString &displayName, const QString &appDisplayName);
+                              const QString &appDisplayName);
 
     int currentVersion() const;
     int firstSupportedVersion() const;
@@ -264,7 +260,7 @@ public:
     };
 
     MergingSettingsAccessor(std::unique_ptr<BackUpStrategy> &&strategy,
-                            const QString &docType, const QString &displayName,
+                            const QString &docType,
                             const QString &applicationDisplayName);
 
     RestoreData readData(const FilePath &path, QWidget *parent) const final;

src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp

@@ -139,9 +139,7 @@ mergeTools(std::vector<std::unique_ptr<CMakeTool>> &sdkTools,
 // --------------------------------------------------------------------
 
 CMakeToolSettingsAccessor::CMakeToolSettingsAccessor() :
-    UpgradingSettingsAccessor("QtCreatorCMakeTools",
+    UpgradingSettingsAccessor("QtCreatorCMakeTools", Core::Constants::IDE_DISPLAY_NAME)
-                              Tr::tr("CMake"),
-                              Core::Constants::IDE_DISPLAY_NAME)
 {
     setBaseFilePath(Core::ICore::userResourcePath(CMAKE_TOOL_FILENAME));
 

src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp

@@ -26,9 +26,7 @@ static QString entryName(int index)
 }
 
 ToolsSettingsAccessor::ToolsSettingsAccessor()
-    : UpgradingSettingsAccessor("QtCreatorMesonTools",
+    : UpgradingSettingsAccessor("QtCreatorMesonTools", Core::Constants::IDE_DISPLAY_NAME)
-                                Tr::tr("Meson"),
-                                Core::Constants::IDE_DISPLAY_NAME)
 {
     setBaseFilePath(Core::ICore::userResourcePath(Constants::ToolsSettings::FILENAME));
 }

src/plugins/projectexplorer/extraabi.cpp

@@ -4,7 +4,6 @@
 #include "extraabi.h"
 
 #include "abi.h"
-#include "projectexplorertr.h"
 
 #include <coreplugin/icore.h>
 
@@ -40,8 +39,7 @@ public:
 };
 
 AbiFlavorAccessor::AbiFlavorAccessor() :
-    UpgradingSettingsAccessor("QtCreatorExtraAbi", Tr::tr("ABI"),
+    UpgradingSettingsAccessor("QtCreatorExtraAbi", Core::Constants::IDE_DISPLAY_NAME)
-                              Core::Constants::IDE_DISPLAY_NAME)
 {
     setBaseFilePath(Core::ICore::installerResourcePath("abi.xml"));
 

src/plugins/projectexplorer/toolchainsettingsaccessor.cpp

@@ -170,9 +170,7 @@ static ToolChainOperations mergeToolChainLists(const Toolchains &systemFileTcs,
 // --------------------------------------------------------------------
 
 ToolChainSettingsAccessor::ToolChainSettingsAccessor() :
-    UpgradingSettingsAccessor("QtCreatorToolChains",
+    UpgradingSettingsAccessor("QtCreatorToolChains", Core::Constants::IDE_DISPLAY_NAME)
-                              Tr::tr("Tool Chains"),
-                              Core::Constants::IDE_DISPLAY_NAME)
 {
     setBaseFilePath(Core::ICore::userResourcePath(TOOLCHAIN_FILENAME));
 

src/plugins/projectexplorer/userfileaccessor.cpp

@@ -285,7 +285,7 @@ FilePaths UserFileBackUpStrategy::readFileCandidates(const FilePath &baseFileNam
 
 UserFileAccessor::UserFileAccessor(Project *project) :
     MergingSettingsAccessor(std::make_unique<VersionedBackUpStrategy>(this),
-                            "QtCreatorProject", project->displayName(),
+                            "QtCreatorProject",
                             Core::Constants::IDE_DISPLAY_NAME),
     m_project(project)
 {
@@ -295,7 +295,7 @@ UserFileAccessor::UserFileAccessor(Project *project) :
     setBaseFilePath(externalUser.isEmpty() ? projectUser : externalUser);
 
     auto secondary
-            = std::make_unique<SettingsAccessor>(docType, displayName, applicationDisplayName);
+            = std::make_unique<SettingsAccessor>(docType, applicationDisplayName);
     secondary->setBaseFilePath(sharedFile());
     secondary->setReadOnly();
     setSecondaryAccessor(std::move(secondary));

tests/auto/utils/settings/tst_settings.cpp

@@ -10,7 +10,6 @@
 
 using namespace Utils;
 
-const char TESTACCESSOR_DN[] = "Test Settings Accessor";
 const char TESTACCESSOR_APPLICATION_DN[] = "SettingsAccessor Test (Basic)";
 const char TESTACCESSOR_DEFAULT_ID[] = "testId";
 
@@ -145,7 +144,7 @@ public:
 
 BasicTestSettingsAccessor::BasicTestSettingsAccessor(const FilePath &baseName, const QByteArray &id) :
     Utils::MergingSettingsAccessor(std::make_unique<TestBackUpStrategy>(this),
-                                   "TestData", TESTACCESSOR_DN, TESTACCESSOR_APPLICATION_DN)
+                                   "TestData", TESTACCESSOR_APPLICATION_DN)
 {
     setSettingsId(id);
     setBaseFilePath(baseName);