aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2018-12-21 18:01:55 +0100
committerAndré Hartmann <aha_1980@gmx.de>2018-12-22 16:15:26 +0000
commit53f0716f1697c36a9662f232219f20ccab83dd41 (patch)
treeec3174334f82059d60cb0b0bc9c07a70448865f5 /src/plugins/git
parent4c69ec5b8969bebea5df275d9e0d82817f78b0da (diff)
GitEditor: Convert some one-line slots to lambdas
Change-Id: I83326fbbdd5a43bc29924661b51bae57ecbfe0f9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git')
-rw-r--r--src/plugins/git/giteditor.cpp38
-rw-r--r--src/plugins/git/giteditor.h4
2 files changed, 13 insertions, 29 deletions
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index fadf1b4af2..866e7085e9 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 f074f8fedd..a23a4fe76d 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;