From d2f7bea0b6401b52e0d48ae6a7ab3f3e860a488b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 16 Feb 2021 14:26:01 +0100 Subject: [PATCH] VCS: Remove reading of very old settings Change-Id: Id75da5d764c0ea65942c49324c2db6d033cf62a1 Reviewed-by: Orgad Shaneh Reviewed-by: Alessandro Portale --- src/plugins/cvs/cvssettings.cpp | 14 -------------- src/plugins/cvs/cvssettings.h | 3 --- src/plugins/subversion/subversionsettings.cpp | 14 -------------- src/plugins/subversion/subversionsettings.h | 3 --- src/plugins/vcsbase/vcsbaseclientsettings.cpp | 7 ------- src/plugins/vcsbase/vcsbaseclientsettings.h | 2 -- 6 files changed, 43 deletions(-) diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp index 12a46bba26b..2f3c2897f0c 100644 --- a/src/plugins/cvs/cvssettings.cpp +++ b/src/plugins/cvs/cvssettings.cpp @@ -69,19 +69,5 @@ QStringList CvsSettings::addOptions(const QStringList &args) const return rc; } -void CvsSettings::readLegacySettings(const QSettings *settings) -{ - const QString keyRoot = settingsGroup() + QLatin1Char('/'); - const QString oldBinaryPathKey = keyRoot + QLatin1String("Command"); - const QString oldPromptOnSubmitKey = keyRoot + QLatin1String("PromptForSubmit"); - const QString oldTimeoutKey = keyRoot + QLatin1String("TimeOut"); - if (settings->contains(oldBinaryPathKey)) - this->setValue(binaryPathKey, settings->value(oldBinaryPathKey).toString()); - if (settings->contains(oldPromptOnSubmitKey)) - this->setValue(promptOnSubmitKey, settings->value(oldPromptOnSubmitKey).toBool()); - if (settings->contains(oldTimeoutKey)) - this->setValue(timeoutKey, settings->value(oldTimeoutKey).toInt()); -} - } // namespace Internal } // namespace Cvs diff --git a/src/plugins/cvs/cvssettings.h b/src/plugins/cvs/cvssettings.h index 3884cc32c17..1294e33bf20 100644 --- a/src/plugins/cvs/cvssettings.h +++ b/src/plugins/cvs/cvssettings.h @@ -44,9 +44,6 @@ public: int timeOutMs() const; QStringList addOptions(const QStringList &args) const; - -protected: - void readLegacySettings(const QSettings *settings) override; }; } // namespace Internal diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp index 78a0f4728ac..18c47e61d92 100644 --- a/src/plugins/subversion/subversionsettings.cpp +++ b/src/plugins/subversion/subversionsettings.cpp @@ -58,19 +58,5 @@ bool SubversionSettings::hasAuthentication() const return boolValue(useAuthenticationKey) && !stringValue(userKey).isEmpty(); } -void SubversionSettings::readLegacySettings(const QSettings *settings) -{ - const QString keyRoot = settingsGroup() + QLatin1Char('/'); - const QString oldBinaryPathKey = keyRoot + QLatin1String("Command"); - const QString oldPromptOnSubmitKey = keyRoot + QLatin1String("PromptForSubmit"); - const QString oldTimeoutKey = keyRoot + QLatin1String("TimeOut"); - if (settings->contains(oldBinaryPathKey)) - this->setValue(binaryPathKey, settings->value(oldBinaryPathKey).toString()); - if (settings->contains(oldPromptOnSubmitKey)) - this->setValue(promptOnSubmitKey, settings->value(oldPromptOnSubmitKey).toBool()); - if (settings->contains(oldTimeoutKey)) - this->setValue(timeoutKey, settings->value(oldTimeoutKey).toInt()); -} - } // namespace Internal } // namespace Subversion diff --git a/src/plugins/subversion/subversionsettings.h b/src/plugins/subversion/subversionsettings.h index 40deb8d9972..6b54c24c007 100644 --- a/src/plugins/subversion/subversionsettings.h +++ b/src/plugins/subversion/subversionsettings.h @@ -42,9 +42,6 @@ public: SubversionSettings(); bool hasAuthentication() const; - -protected: - void readLegacySettings(const QSettings *settings) override; }; } // namespace Internal diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index 5e9e311c09e..9407673da80 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -258,8 +258,6 @@ void VcsBaseClientSettings::readSettings(const QSettings *settings) break; } } - - this->readLegacySettings(settings); } bool VcsBaseClientSettings::equals(const VcsBaseClientSettings &rhs) const @@ -397,9 +395,4 @@ QVariant VcsBaseClientSettings::keyDefaultValue(const QString &key) const return QVariant(valueType(key)); } -void VcsBaseClientSettings::readLegacySettings(const QSettings *settings) -{ - Q_UNUSED(settings) -} - } // namespace VcsBase diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h index db0ca0bf64c..facdd50ab3b 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.h +++ b/src/plugins/vcsbase/vcsbaseclientsettings.h @@ -89,8 +89,6 @@ protected: void declareKey(const QString &key, const QVariant &defaultValue); QVariant keyDefaultValue(const QString &key) const; - virtual void readLegacySettings(const QSettings *settings); - private: friend bool equals(const VcsBaseClientSettings &rhs); friend class VcsBaseClientSettingsPrivate;