Fix repeting Stage/Unstage actions in unified diff editor

Don't store diff file index, chunk index and diff editor
controller anymore. Pass needed indices by value,
retrieve them when needed as lambda copy.

Change-Id: I3a81f1ab6d131c0b1d9899ac4b061b6e25582f51
Reviewed-by: Tobias Hunger <[email protected]>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index d98d46d4903..206a3c7b7bb 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -329,12 +329,11 @@ public:
 
 private:
     void finishSubmoduleUpdate();
-    void slotChunkActionsRequested(QMenu *menu, bool isValid);
-    void slotStageChunk();
-    void slotUnstageChunk();
+    void chunkActionsRequested(QMenu *menu, int fileIndex, int chunkIndex);
     void branchesForCommit(const QString &revision);
 
-    void stage(const QString &patch, bool revert);
+    void stage(DiffEditor::DiffEditorController *diffController,
+               const QString &patch, bool revert);
 
     enum CodecType { CodecSource, CodecLogOutput, CodecNone };
     QTextCodec *codecFor(CodecType codecType, const QString &source = QString()) const;
@@ -378,7 +377,6 @@ private:
     QMap<QString, StashInfo> m_stashInfo;
     QStringList m_updatedSubmodules;
     bool m_disableEditor;
-    QPointer<DiffEditor::DiffEditorController> m_contextController;
     QFutureSynchronizer<void> m_synchronizer; // for commit updates
 };