Vcs: Separate plugin and QObject parent roles for VcsSubmitEditorFactory

These are different when the factories are used as real members,
as already done in Bazaar.

Change-Id: I3c187896dcbacb5156be1543424ccacb9140a493
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

8 files changed, 11 insertions, 9 deletions

diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 7e97a2e1e70..a2225c01c54 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -439,7 +439,7 @@ ClearCasePluginPrivate::ClearCasePluginPrivate()
 
     new ClearCaseSettingsPage(this);
 
-    new VcsSubmitEditorFactory(submitParameters, [] { return new ClearCaseSubmitEditor; }, this);
+    new VcsSubmitEditorFactory(submitParameters, [] { return new ClearCaseSubmitEditor; }, this, this);
 
     // any editor responds to describe (when clicking a version)
     const auto describeFunc = [this](const QString &source, const QString &changeNr) {
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index de59c20580b..2cefbb371b7 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -518,7 +518,7 @@ CvsPluginPrivate::CvsPluginPrivate()
 
     new CvsSettingsPage([this] { configurationChanged(); }, &m_settings, this);
 
-    new VcsSubmitEditorFactory(submitParameters, [] { return new CvsSubmitEditor; }, this);
+    new VcsSubmitEditorFactory(submitParameters, [] { return new CvsSubmitEditor; }, this, this);
 
     const auto describeFunc = [this](const QString &source, const QString &changeNr) {
         QString errorMessage;
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index d22f3ee741a..c733225429c 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -367,7 +367,7 @@ GitPluginPrivate::GitPluginPrivate()
     for (int i = 0; i < editorCount; i++)
         new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc, this);
 
-    new VcsSubmitEditorFactory(submitParameters, [] { return new GitSubmitEditor; }, this);
+    new VcsSubmitEditorFactory(submitParameters, [] { return new GitSubmitEditor; }, this, this);
 
     const QString prefix = "git";
     m_commandLocator = new CommandLocator("Git", prefix, prefix, this);
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 2ab9402b189..a6efdd7e6f3 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -256,7 +256,7 @@ MercurialPluginPrivate::MercurialPluginPrivate()
     for (auto &editor : editorParameters)
         new VcsEditorFactory(&editor, widgetCreator, describeFunc, this);
 
-    new VcsSubmitEditorFactory(submitEditorParameters, [] { return new CommitEditor; }, this);
+    new VcsSubmitEditorFactory(submitEditorParameters, [] { return new CommitEditor; }, this, this);
 
     const QString prefix = QLatin1String("hg");
     m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix, this);
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 7f128d13d2f..4f641107637 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -381,7 +381,7 @@ PerforcePluginPrivate::PerforcePluginPrivate()
     m_settings.fromSettings(ICore::settings());
 
     // Editor factories
-    new VcsSubmitEditorFactory(submitParameters, [] { return new PerforceSubmitEditor; }, this);
+    new VcsSubmitEditorFactory(submitParameters, [] { return new PerforceSubmitEditor; }, this, this);
 
     const auto describeFunc = [this](const QString &source, const QString &n) {
         describe(source, n);
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 7a6fb59386c..eeebf960ee1 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -388,7 +388,7 @@ SubversionPluginPrivate::SubversionPluginPrivate()
     using namespace Core::Constants;
     Context context(SUBVERSION_CONTEXT);
 
-    new VcsSubmitEditorFactory(submitParameters, [] { return new SubversionSubmitEditor; }, this);
+    new VcsSubmitEditorFactory(submitParameters, [] { return new SubversionSubmitEditor; }, this, this);
 
     const auto describeFunc = [this](const QString &source, const QString &id) {
         describe(source, id);
diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
index b6d862a6e1e..be84f19c421 100644
--- a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
@@ -43,8 +43,9 @@ const char DIFF_SELECTED[] = "Vcs.DiffSelectedFiles";
 VcsSubmitEditorFactory::VcsSubmitEditorFactory
         (const VcsBaseSubmitEditorParameters &parameters,
          const EditorCreator &editorCreator,
-         VcsBasePluginPrivate *plugin)
-    : IEditorFactory(plugin)
+         VcsBasePluginPrivate *plugin,
+         QObject *parent)
+    : IEditorFactory(parent)
 {
     setId(parameters.id);
     setDisplayName(QLatin1String(parameters.displayName));
diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.h b/src/plugins/vcsbase/basevcssubmiteditorfactory.h
index 133d9fd0ff5..15386b915a9 100644
--- a/src/plugins/vcsbase/basevcssubmiteditorfactory.h
+++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.h
@@ -49,7 +49,8 @@ public:
 
     VcsSubmitEditorFactory(const VcsBaseSubmitEditorParameters &parameters,
                            const EditorCreator &editorCreator,
-                           VcsBasePluginPrivate *plugin);
+                           VcsBasePluginPrivate *plugin,
+                           QObject *parent = nullptr);
 
 private:
     QAction *m_submitAction = nullptr;