forked from qt-creator/qt-creator
Vcs: Move settings ownership from VcsBaseClientImpl to plugin
Turns out CVS and Bazaar already had an unused copy there... Change-Id: I512c4d6322620e2b55d9008600ac676ce09032aa Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -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);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -138,6 +138,7 @@ private:
|
||||
|
||||
const QStringList m_svnDirectories;
|
||||
|
||||
SubversionSettings m_settings;
|
||||
SubversionClient *m_client = nullptr;
|
||||
QString m_commitMessageFileName;
|
||||
QString m_commitRepository;
|
||||
|
||||
Reference in New Issue
Block a user