feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove displayName from SettingsAccessors

Browse Source 
It was not used.

Change-Id: I7c0927698bf31548ec076c39881561d72e8495e6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-04-18 13:36:45 +02:00
parent fe3887e2bf
commit b4a6af026e
8 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libs/utils/settingsaccessor.cpp
View File

@@ -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,

16
src/libs/utils/settingsaccessor.h
View File

@@ -51,8 +51,7 @@ using SettingsMergeResult = std::optional<QPair<QString, QVariant>>;
class QTCREATOR_UTILS_EXPORT SettingsAccessor
{
public:
SettingsAccessor(const QString &docType, const QString &displayName,
const QString &applicationDisplayName);
SettingsAccessor(const QString &docType, 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,
const QString &applicationDisplayName);
BackingUpSettingsAccessor(const QString &docType, 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,
const QString &displayName, const QString &applicationDisplayName);
UpgradingSettingsAccessor(const QString &docType, 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;

4
src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
View File

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

4
src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp
View File

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

4
src/plugins/projectexplorer/extraabi.cpp
View File

@@ -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"),
Core::Constants::IDE_DISPLAY_NAME)
UpgradingSettingsAccessor("QtCreatorExtraAbi", Core::Constants::IDE_DISPLAY_NAME)
{
setBaseFilePath(Core::ICore::installerResourcePath("abi.xml"));

4
src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
View File

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

4
src/plugins/projectexplorer/userfileaccessor.cpp
View File

@@ -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));

3
tests/auto/utils/settings/tst_settings.cpp
View File

@@ -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);