From c7cf450bd86322c04b28dab1c802badbc2ab1ed8 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 18 Jul 2023 14:05:42 +0200 Subject: [PATCH] VcsBase: Remove almost unused access to VcssBaseClientImpl::settings() Change-Id: I090714e9724dcc00b37651bb1310d7848066e03e Reviewed-by: Orgad Shaneh --- src/plugins/subversion/subversionclient.cpp | 6 ++---- src/plugins/vcsbase/vcsbaseclient.cpp | 5 ----- src/plugins/vcsbase/vcsbaseclient.h | 2 -- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index 4ab11b6c913..0e47c584542 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -234,13 +234,12 @@ void SubversionDiffEditorController::setChangeNumber(int changeNumber) SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const QString &documentId, const FilePath &source, const QString &title, const FilePath &workingDirectory) { - SubversionSettings &settings = Internal::settings(); IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title); auto controller = qobject_cast( DiffEditorController::controller(document)); if (!controller) { controller = new SubversionDiffEditorController(document); - controller->setVcsBinary(settings.binaryPath()); + controller->setVcsBinary(settings().binaryPath()); controller->setProcessEnvironment(processEnvironment()); controller->setWorkingDirectory(workingDirectory); } @@ -271,8 +270,7 @@ void SubversionClient::log(const FilePath &workingDir, bool enableAnnotationContextMenu, const std::function &addAuthOptions) { - auto &settings = static_cast(this->settings()); - const int logCount = settings.logCount(); + const int logCount = settings().logCount(); QStringList svnExtraOptions = extraOptions; if (logCount > 0) svnExtraOptions << QLatin1String("-l") << QString::number(logCount); diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index b58524209d0..700f32284e5 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -61,11 +61,6 @@ VcsBaseClientImpl::VcsBaseClientImpl(VcsBaseSettings *baseSettings) this, &VcsBaseClientImpl::saveSettings); } -VcsBaseSettings &VcsBaseClientImpl::settings() const -{ - return *m_baseSettings; -} - FilePath VcsBaseClientImpl::vcsBinary() const { return m_baseSettings->binaryPath(); diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index 035e2f00424..1c22fbf968e 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -44,8 +44,6 @@ public: explicit VcsBaseClientImpl(VcsBaseSettings *baseSettings); ~VcsBaseClientImpl() override = default; - VcsBaseSettings &settings() const; - virtual Utils::FilePath vcsBinary() const; int vcsTimeoutS() const;