aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/subversion
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/subversion')
-rw-r--r--src/plugins/subversion/subversionclient.cpp6
-rw-r--r--src/plugins/subversion/subversionclient.h3
-rw-r--r--src/plugins/subversion/subversionplugin.cpp2
-rw-r--r--src/plugins/subversion/subversionplugin.h1
4 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index c2d7744939..c58b5ec779 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -69,10 +69,10 @@ public:
}
};
-SubversionClient::SubversionClient() : VcsBaseClient(new SubversionSettings)
+SubversionClient::SubversionClient(SubversionSettings *settings) : VcsBaseClient(settings)
{
- setLogConfigCreator([this](QToolBar *toolBar) {
- return new SubversionLogConfig(settings(), toolBar);
+ setLogConfigCreator([settings](QToolBar *toolBar) {
+ return new SubversionLogConfig(*settings, toolBar);
});
}
diff --git a/src/plugins/subversion/subversionclient.h b/src/plugins/subversion/subversionclient.h
index aa11695e9b..b08f0de41f 100644
--- a/src/plugins/subversion/subversionclient.h
+++ b/src/plugins/subversion/subversionclient.h
@@ -35,13 +35,14 @@ namespace Subversion {
namespace Internal {
class SubversionDiffEditorController;
+class SubversionSettings;
class SubversionClient : public VcsBase::VcsBaseClient
{
Q_OBJECT
public:
- SubversionClient();
+ SubversionClient(SubversionSettings *settings);
bool doCommit(const QString &repositoryRoot,
const QStringList &files,
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index bd55af03c9..4b83b602f1 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -229,7 +229,7 @@ SubversionPluginPrivate::SubversionPluginPrivate() :
auto vcsCtrl = new SubversionControl(this);
initializeVcs(vcsCtrl, context);
- m_client = new SubversionClient;
+ m_client = new SubversionClient(&m_settings);
new SettingsPage(versionControl(), this);
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 1988efb7aa..de8d19dbb4 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -138,6 +138,7 @@ private:
const QStringList m_svnDirectories;
+ SubversionSettings m_settings;
SubversionClient *m_client = nullptr;
QString m_commitMessageFileName;
QString m_commitRepository;