aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/mercurial
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-02-05 09:27:26 +0100
committerhjk <hjk@qt.io>2020-02-06 07:03:44 +0000
commit7f37c503db291d031770701cd0b912405597dbb7 (patch)
treeb20a9480011e16bc7c72bce627d182f9a62b7b1d /src/plugins/mercurial
parentc17767c78ebc6b3d3b66e4d78d46b0eef4ac003f (diff)
Vcs: Move responsibility to set editor parameters to editor factory
So it doesn't need to be named twice in the editor factory setup. This intentially includes a de-optimiztion: storing the parameters by value, not by pointer. That's more natural, does not need to keep the parameters alive on the caller side, and it's uncritical in this context. Change-Id: I92867d3f2f75c38911ae82d3eeb4759cba71b723 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r--src/plugins/mercurial/commiteditor.cpp4
-rw-r--r--src/plugins/mercurial/commiteditor.h2
-rw-r--r--src/plugins/mercurial/mercurialplugin.cpp3
3 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp
index 3a2bdb2a1d7..84abca39824 100644
--- a/src/plugins/mercurial/commiteditor.cpp
+++ b/src/plugins/mercurial/commiteditor.cpp
@@ -36,8 +36,8 @@ using namespace VcsBase;
namespace Mercurial {
namespace Internal {
-CommitEditor::CommitEditor(const VcsBaseSubmitEditorParameters *parameters) :
- VcsBaseSubmitEditor(parameters, new MercurialCommitWidget)
+CommitEditor::CommitEditor() :
+ VcsBaseSubmitEditor(new MercurialCommitWidget)
{
document()->setPreferredDisplayName(tr("Commit Editor"));
}
diff --git a/src/plugins/mercurial/commiteditor.h b/src/plugins/mercurial/commiteditor.h
index 2d977f7bd70..27fa5274257 100644
--- a/src/plugins/mercurial/commiteditor.h
+++ b/src/plugins/mercurial/commiteditor.h
@@ -42,7 +42,7 @@ class CommitEditor : public VcsBase::VcsBaseSubmitEditor
Q_OBJECT
public:
- explicit CommitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters);
+ CommitEditor();
void setFields(const QFileInfo &repositoryRoot, const QString &branch,
const QString &userName, const QString &email,
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 8a905e24256..2ab9402b189 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -256,8 +256,7 @@ MercurialPluginPrivate::MercurialPluginPrivate()
for (auto &editor : editorParameters)
new VcsEditorFactory(&editor, widgetCreator, describeFunc, this);
- new VcsSubmitEditorFactory(&submitEditorParameters,
- []() { return new CommitEditor(&submitEditorParameters); }, this);
+ new VcsSubmitEditorFactory(submitEditorParameters, [] { return new CommitEditor; }, this);
const QString prefix = QLatin1String("hg");
m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix, this);