From 53f0716f1697c36a9662f232219f20ccab83dd41 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Fri, 21 Dec 2018 18:01:55 +0100 Subject: [PATCH] GitEditor: Convert some one-line slots to lambdas Change-Id: I83326fbbdd5a43bc29924661b51bae57ecbfe0f9 Reviewed-by: Orgad Shaneh --- src/plugins/git/giteditor.cpp | 38 ++++++++++++----------------------- src/plugins/git/giteditor.h | 4 ---- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index fadf1b4af20..866e7085e90 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -189,33 +189,12 @@ void GitEditorWidget::setPlainText(const QString &text) textDocument()->setPlainText(modText); } -void GitEditorWidget::checkoutChange() -{ - GitPlugin::client()->checkout(sourceWorkingDirectory(), m_currentChange); -} - void GitEditorWidget::resetChange(const QByteArray &resetType) { GitPlugin::client()->reset( sourceWorkingDirectory(), QLatin1String("--" + resetType), m_currentChange); } -void GitEditorWidget::cherryPickChange() -{ - GitPlugin::client()->synchronousCherryPick(sourceWorkingDirectory(), m_currentChange); -} - -void GitEditorWidget::revertChange() -{ - GitPlugin::client()->synchronousRevert(sourceWorkingDirectory(), m_currentChange); -} - -void GitEditorWidget::logChange() -{ - GitPlugin::client()->log( - sourceWorkingDirectory(), QString(), false, {m_currentChange}); -} - void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert) { Utils::TemporaryFile patchFile("git-apply-chunk"); @@ -313,13 +292,22 @@ void GitEditorWidget::addChangeActions(QMenu *menu, const QString &change) m_currentChange = change; if (contentType() != OtherContent) { connect(menu->addAction(tr("Cherr&y-Pick Change %1").arg(change)), &QAction::triggered, - this, &GitEditorWidget::cherryPickChange); + this, [this]() { + GitPlugin::client()->synchronousCherryPick(sourceWorkingDirectory(), m_currentChange); + }); connect(menu->addAction(tr("Re&vert Change %1").arg(change)), &QAction::triggered, - this, &GitEditorWidget::revertChange); + this, [this]() { + GitPlugin::client()->synchronousRevert(sourceWorkingDirectory(), m_currentChange); + }); connect(menu->addAction(tr("C&heckout Change %1").arg(change)), &QAction::triggered, - this, &GitEditorWidget::checkoutChange); + this, [this]() { + GitPlugin::client()->checkout(sourceWorkingDirectory(), m_currentChange); + }); connect(menu->addAction(tr("&Log for Change %1").arg(change)), &QAction::triggered, - this, &GitEditorWidget::logChange); + this, [this]() { + GitPlugin::client()->log( + sourceWorkingDirectory(), QString(), false, {m_currentChange}); + }); QMenu *resetMenu = new QMenu(tr("&Reset to Change %1").arg(change), menu); connect(resetMenu->addAction(tr("&Hard")), &QAction::triggered, diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h index f074f8fedda..a23a4fe76d3 100644 --- a/src/plugins/git/giteditor.h +++ b/src/plugins/git/giteditor.h @@ -42,10 +42,6 @@ public: void setPlainText(const QString &text) override; private: - void checkoutChange(); - void cherryPickChange(); - void revertChange(); - void logChange(); void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert); void init() override;