feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GitEditor: Convert some one-line slots to lambdas

Browse Source 
Change-Id: I83326fbbdd5a43bc29924661b51bae57ecbfe0f9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2018-12-21 18:01:55 +01:00
committed by André Hartmann
parent 4c69ec5b89
commit 53f0716f16
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/git/giteditor.cpp
View File

@@ -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,

4
src/plugins/git/giteditor.h
View File

@@ -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;