summaryrefslogtreecommitdiff
path: root/src/plugins/subversion/subversionclient.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2021-03-19 14:19:16 +0100
committerhjk <hjk@qt.io>2021-03-22 09:34:52 +0000
commitce85282866dcd714d0eb4fca234268a8c86e5b61 (patch)
tree4ad29ba94b3613e06d79140631fe35516a6e7890 /src/plugins/subversion/subversionclient.cpp
parent62974b0ad9011ec26770f5b012484bb6a1b2738f (diff)
downloadqt-creator-ce85282866dcd714d0eb4fca234268a8c86e5b61.tar.gz
VcsBase: Remove VcsBaseClientSettings
It's replaced by VcsBaseSettings. Change-Id: I60a0e4e267337f71e8a32b9b220565b765c973b1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/subversion/subversionclient.cpp')
-rw-r--r--src/plugins/subversion/subversionclient.cpp8
1 files changed, 4 insertions, 4 deletions
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<SubversionSettings &>(baseSettings()))
+ << SubversionClient::addAuthenticationOptions(static_cast<SubversionSettings &>(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<SubversionSettings &>(baseSettings());
+ auto &settings = static_cast<SubversionSettings &>(this->settings());
IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title);
auto controller = qobject_cast<SubversionDiffEditorController *>(
DiffEditorController::controller(document));
@@ -296,7 +296,7 @@ void SubversionClient::log(const QString &workingDir,
const QStringList &extraOptions,
bool enableAnnotationContextMenu)
{
- auto &settings = static_cast<SubversionSettings &>(baseSettings());
+ auto &settings = static_cast<SubversionSettings &>(this->settings());
const int logCount = settings.logCount.value();
QStringList svnExtraOptions = extraOptions;
svnExtraOptions.append(SubversionClient::addAuthenticationOptions(settings));