VCS: Consolidate submit editor actions setup

Change-Id: I36754779b6a9aa35de705b368daf8c2a1de058c6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

3 files changed, 1 insertions, 32 deletions

diff --git a/src/plugins/mercurial/constants.h b/src/plugins/mercurial/constants.h
index d08c3e2fdf..b515c28b8b 100644
--- a/src/plugins/mercurial/constants.h
+++ b/src/plugins/mercurial/constants.h
@@ -86,8 +86,5 @@ const char OUTGOING[] = "Mercurial.Action.Outgoing";
 const char COMMIT[] = "Mercurial.Action.Commit";
 const char CREATE_REPOSITORY[] = "Mercurial.Action.CreateRepository";
 
-// Submit editor actions
-const char DIFFEDITOR[] = "Mercurial.Action.Editor.Diff";
-
 } // namespace Constants
 } // namespace mercurial
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 12accd6747..662586b7a8 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -145,8 +145,6 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
 
     createMenu(context);
 
-    createSubmitEditorActions();
-
     return true;
 }
 
@@ -472,25 +470,6 @@ void MercurialPlugin::outgoing()
     m_client->outgoing(state.topLevel());
 }
 
-void MercurialPlugin::createSubmitEditorActions()
-{
-    Core::Context context(Constants::COMMIT_ID);
-
-    editorCommit = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this);
-    Core::Command *command = Core::ActionManager::registerAction(editorCommit, Core::Id(Constants::COMMIT), context);
-    command->setAttribute(Core::Command::CA_UpdateText);
-    connect(editorCommit, &QAction::triggered, this, &MercurialPlugin::commitFromEditor);
-
-    editorDiff = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
-    Core::ActionManager::registerAction(editorDiff, Core::Id(Constants::DIFFEDITOR), context);
-
-    editorUndo = new QAction(tr("&Undo"), this);
-    Core::ActionManager::registerAction(editorUndo, Core::Id(Core::Constants::UNDO), context);
-
-    editorRedo = new QAction(tr("&Redo"), this);
-    Core::ActionManager::registerAction(editorRedo, Core::Id(Core::Constants::REDO), context);
-}
-
 void MercurialPlugin::commit()
 {
     if (!promptBeforeCommit())
@@ -538,7 +517,6 @@ void MercurialPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &s
     CommitEditor *commitEditor = static_cast<CommitEditor *>(editor);
     setSubmitEditor(commitEditor);
 
-    commitEditor->registerActions(editorUndo, editorRedo, editorCommit, editorDiff);
     connect(commitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
             this, &MercurialPlugin::diffFromEditorSelected);
     commitEditor->setCheckScriptWorkingDirectory(m_submitRepository);
diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h
index 890238b375..696d77d491 100644
--- a/src/plugins/mercurial/mercurialplugin.h
+++ b/src/plugins/mercurial/mercurialplugin.h
@@ -98,7 +98,7 @@ private:
     void outgoing();
     void commit();
     void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
-    void commitFromEditor();
+    void commitFromEditor() override;
     void diffFromEditorSelected(const QStringList &files);
 
     //TODO implement
@@ -116,7 +116,6 @@ private:
     void serve();*/
 
     void createMenu(const Core::Context &context);
-    void createSubmitEditorActions();
     void createFileActions(const Core::Context &context);
     void createDirectoryActions(const Core::Context &context);
     void createRepositoryActions(const Core::Context &context);
@@ -142,11 +141,6 @@ private:
     Utils::ParameterAction *statusFile = nullptr;
 
     QAction *m_createRepositoryAction = nullptr;
-    // Submit editor actions
-    QAction *editorCommit = nullptr;
-    QAction *editorDiff = nullptr;
-    QAction *editorUndo = nullptr;
-    QAction *editorRedo = nullptr;
     QAction *m_menuAction = nullptr;
 
     QString m_submitRepository;