diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index 794f59d799a..024ecb4d949 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -242,22 +242,6 @@ void GitEditorWidget::revertChange() sourceWorkingDirectory(), m_currentChange); } -void GitEditorWidget::stageDiffChunk() -{ - const QAction *a = qobject_cast(sender()); - QTC_ASSERT(a, return); - const DiffChunk chunk = qvariant_cast(a->data()); - return applyDiffChunk(chunk, false); -} - -void GitEditorWidget::unstageDiffChunk() -{ - const QAction *a = qobject_cast(sender()); - QTC_ASSERT(a, return); - const DiffChunk chunk = qvariant_cast(a->data()); - return applyDiffChunk(chunk, true); -} - void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert) { QTemporaryFile patchFile; @@ -303,12 +287,14 @@ void GitEditorWidget::addDiffActions(QMenu *menu, const DiffChunk &chunk) menu->addSeparator(); QAction *stageAction = menu->addAction(tr("Stage Chunk...")); - stageAction->setData(qVariantFromValue(chunk)); - connect(stageAction, &QAction::triggered, this, &GitEditorWidget::stageDiffChunk); + connect(stageAction, &QAction::triggered, this, [this, chunk] { + applyDiffChunk(chunk, false); + }); QAction *unstageAction = menu->addAction(tr("Unstage Chunk...")); - unstageAction->setData(qVariantFromValue(chunk)); - connect(unstageAction, &QAction::triggered, this, &GitEditorWidget::unstageDiffChunk); + connect(unstageAction, &QAction::triggered, this, [this, chunk] { + applyDiffChunk(chunk, true); + }); } bool GitEditorWidget::open(QString *errorString, const QString &fileName, const QString &realFileName) diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h index 2e385d78c3e..8de4d4ebf17 100644 --- a/src/plugins/git/giteditor.h +++ b/src/plugins/git/giteditor.h @@ -59,8 +59,6 @@ private slots: void resetChange(); void cherryPickChange(); void revertChange(); - void stageDiffChunk(); - void unstageDiffChunk(); void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert); private: