From ce85282866dcd714d0eb4fca234268a8c86e5b61 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 19 Mar 2021 14:19:16 +0100 Subject: VcsBase: Remove VcsBaseClientSettings It's replaced by VcsBaseSettings. Change-Id: I60a0e4e267337f71e8a32b9b220565b765c973b1 Reviewed-by: Orgad Shaneh --- src/plugins/subversion/subversionclient.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/subversion/subversionclient.cpp') diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index 6ed9a8e50a..2f1d930184 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -69,7 +69,7 @@ public: } }; -SubversionClient::SubversionClient(SubversionSettings *settings) : VcsBaseClient(nullptr, settings) +SubversionClient::SubversionClient(SubversionSettings *settings) : VcsBaseClient(settings) { setLogConfigCreator([settings](QToolBar *toolBar) { return new SubversionLogConfig(*settings, toolBar); @@ -83,7 +83,7 @@ bool SubversionClient::doCommit(const QString &repositoryRoot, { const QStringList svnExtraOptions = QStringList(extraOptions) - << SubversionClient::addAuthenticationOptions(static_cast(baseSettings())) + << SubversionClient::addAuthenticationOptions(static_cast(settings())) << QLatin1String(Constants::NON_INTERACTIVE_OPTION) << QLatin1String("--encoding") << QLatin1String("UTF-8") << QLatin1String("--file") << commitMessageFile; @@ -260,7 +260,7 @@ SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const Q const QString &title, const QString &workingDirectory) { - auto &settings = static_cast(baseSettings()); + auto &settings = static_cast(this->settings()); IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title); auto controller = qobject_cast( DiffEditorController::controller(document)); @@ -296,7 +296,7 @@ void SubversionClient::log(const QString &workingDir, const QStringList &extraOptions, bool enableAnnotationContextMenu) { - auto &settings = static_cast(baseSettings()); + auto &settings = static_cast(this->settings()); const int logCount = settings.logCount.value(); QStringList svnExtraOptions = extraOptions; svnExtraOptions.append(SubversionClient::addAuthenticationOptions(settings)); -- cgit v1.2.1