Vcs: Collapse VcsSubmitEditorFactory hierarchy

Same pattern as for VcsSubmitFactory.

Change-Id: I7adb8868a83842c1b6c642db372a3624dd2e879e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

src/plugins/git/gitplugin.cpp

@@ -280,8 +280,6 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_gitClient = new GitClient(&m_settings);
 
-    typedef VcsSubmitEditorFactory<GitSubmitEditor> GitSubmitEditorFactory;
-
     initializeVcs(new GitVersionControl(m_gitClient));
 
     // Create the globalcontext list to register actions accordingly
@@ -296,7 +294,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     for (int i = 0; i < editorCount; i++)
         addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, m_gitClient, describeSlot));
 
-    addAutoReleasedObject(new GitSubmitEditorFactory(&submitParameters));
+    addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters,
+        []() { return new GitSubmitEditor(&submitParameters); }));
 
     auto cloneWizardFactory = new VcsBase::BaseCheckoutWizardFactory;
     cloneWizardFactory->setId(QLatin1String(VcsBase::Constants::VCS_ID_GIT));

src/plugins/git/gitsubmiteditor.cpp

@@ -123,8 +123,8 @@ private:
  * option for staged files. So, we sort apart the diff file lists
  * according to a type flag we add to the model. */
 
-GitSubmitEditor::GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parent) :
-    VcsBaseSubmitEditor(parameters, new GitSubmitEditorWidget(parent)),
+GitSubmitEditor::GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters) :
+    VcsBaseSubmitEditor(parameters, new GitSubmitEditorWidget),
     m_model(0),
     m_commitEncoding(0),
     m_commitType(SimpleCommit),

src/plugins/git/gitsubmiteditor.h

@@ -50,7 +50,7 @@ class GitSubmitEditor : public VcsBase::VcsBaseSubmitEditor
 {
     Q_OBJECT
 public:
-    explicit GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parent);
+    explicit GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters);
     ~GitSubmitEditor();
 
     void setCommitData(const CommitData &);

src/plugins/git/gitsubmiteditorwidget.cpp

@@ -45,8 +45,7 @@ namespace Git {
 namespace Internal {
 
 // ------------------
-GitSubmitEditorWidget::GitSubmitEditorWidget(QWidget *parent) :
-    VcsBase::SubmitEditorWidget(parent),
+GitSubmitEditorWidget::GitSubmitEditorWidget() :
     m_pushAction(NoPush),
     m_gitSubmitPanel(new QWidget),
     m_logChangeWidget(0),

src/plugins/git/gitsubmiteditorwidget.h

@@ -64,7 +64,7 @@ class GitSubmitEditorWidget : public VcsBase::SubmitEditorWidget
     Q_OBJECT
 
 public:
-    explicit GitSubmitEditorWidget(QWidget *parent = 0);
+    GitSubmitEditorWidget();
 
     GitSubmitEditorPanelData panelData() const;
     QString amendSHA1() const;