aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/diffeditor/diffeditorcontroller.h
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-11-29 21:36:30 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2019-11-19 11:19:43 +0000
commit17668329181be771669c10baa0e322e0192fecdb (patch)
treeca70331ef982dc38de26da13201b6f8c090dd3c9 /src/plugins/diffeditor/diffeditorcontroller.h
parent27586827238ca9079860e77a7b23ae20d163143e (diff)
DiffEditor: Stage and unstage selected lines for Git
Fixes: QTCREATORBUG-19071 Change-Id: I560ba208e68e477ea865e499847d819cfdfeb6f3 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorcontroller.h')
-rw-r--r--src/plugins/diffeditor/diffeditorcontroller.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h
index b32537c0e4..ef8f209254 100644
--- a/src/plugins/diffeditor/diffeditorcontroller.h
+++ b/src/plugins/diffeditor/diffeditorcontroller.h
@@ -38,6 +38,8 @@ namespace DiffEditor {
namespace Internal { class DiffEditorDocument; }
+class ChunkSelection;
+
class DIFFEDITOR_EXPORT DiffEditorController : public QObject
{
Q_OBJECT
@@ -58,18 +60,21 @@ public:
AddPrefix = 2
};
Q_DECLARE_FLAGS(PatchOptions, PatchOption)
- QString makePatch(int fileIndex, int chunkIndex, PatchOptions options) const;
+ QString makePatch(int fileIndex, int chunkIndex, const ChunkSelection &selection,
+ PatchOptions options) const;
static Core::IDocument *findOrCreateDocument(const QString &vcsId,
const QString &displayName);
static DiffEditorController *controller(Core::IDocument *document);
- void requestChunkActions(QMenu *menu, int fileIndex, int chunkIndex);
+ void requestChunkActions(QMenu *menu, int fileIndex, int chunkIndex,
+ const ChunkSelection &selection);
bool chunkExists(int fileIndex, int chunkIndex) const;
Core::IDocument *document() const;
signals:
- void chunkActionsRequested(QMenu *menu, int fileIndex, int chunkIndex);
+ void chunkActionsRequested(QMenu *menu, int fileIndex, int chunkIndex,
+ const ChunkSelection &selection);
protected:
// reloadFinished() should be called