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

Git: Replace two uses of QAction::setData

Browse Source 
Change-Id: I540d1fd221cc331c230950cb97848e39780b650c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2015-03-03 23:32:46 +01:00
committed by Orgad Shaneh
parent 8a3c5bc1e7
commit 7f20035881
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,22 +242,6 @@ void GitEditorWidget::revertChange()
sourceWorkingDirectory(), m_currentChange); sourceWorkingDirectory(), m_currentChange);
} }
void GitEditorWidget::stageDiffChunk()
{
const QAction *a = qobject_cast<QAction *>(sender());
QTC_ASSERT(a, return);
const DiffChunk chunk = qvariant_cast<DiffChunk>(a->data());
return applyDiffChunk(chunk, false);
}
void GitEditorWidget::unstageDiffChunk()
{
const QAction *a = qobject_cast<QAction *>(sender());
QTC_ASSERT(a, return);
const DiffChunk chunk = qvariant_cast<DiffChunk>(a->data());
return applyDiffChunk(chunk, true);
}
void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert) void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert)
{ {
QTemporaryFile patchFile; QTemporaryFile patchFile;
@@ -303,12 +287,14 @@ void GitEditorWidget::addDiffActions(QMenu *menu, const DiffChunk &chunk)
menu->addSeparator(); menu->addSeparator();
QAction *stageAction = menu->addAction(tr("Stage Chunk...")); QAction *stageAction = menu->addAction(tr("Stage Chunk..."));
stageAction->setData(qVariantFromValue(chunk)); connect(stageAction, &QAction::triggered, this, [this, chunk] {
connect(stageAction, &QAction::triggered, this, &GitEditorWidget::stageDiffChunk); applyDiffChunk(chunk, false);
});
QAction *unstageAction = menu->addAction(tr("Unstage Chunk...")); QAction *unstageAction = menu->addAction(tr("Unstage Chunk..."));
unstageAction->setData(qVariantFromValue(chunk)); connect(unstageAction, &QAction::triggered, this, [this, chunk] {
connect(unstageAction, &QAction::triggered, this, &GitEditorWidget::unstageDiffChunk); applyDiffChunk(chunk, true);
});
} }
bool GitEditorWidget::open(QString *errorString, const QString &fileName, const QString &realFileName) bool GitEditorWidget::open(QString *errorString, const QString &fileName, const QString &realFileName)

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

@@ -59,8 +59,6 @@ private slots:
void resetChange(); void resetChange();
void cherryPickChange(); void cherryPickChange();
void revertChange(); void revertChange();
void stageDiffChunk();
void unstageDiffChunk();
void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert); void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert);
private: private: