Basic integration of diff editor inside git plugin

Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>

1 files changed, 10 insertions, 0 deletions

diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index b02ed7cffb3..003cf6b92cd 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -60,11 +60,16 @@ namespace Utils {
     struct SynchronousProcessResponse;
 }
 
+namespace DiffEditor {
+    class DiffEditorWidget;
+}
+
 namespace Git {
 namespace Internal {
 
 class GitPlugin;
 class GitOutputWindow;
+class GitDiffEditorWidget;
 class CommitData;
 struct GitSubmitEditorPanelData;
 class Stash;
@@ -128,6 +133,8 @@ public:
     QString findRepositoryForDirectory(const QString &dir);
     QString findGitDirForRepository(const QString &repositoryDir) const;
 
+    DiffEditor::DiffEditorWidget *diffEditorWidget(const Core::IEditor *editor) const;
+
     void diff(const QString &workingDirectory, const QStringList &diffArgs, const QString &fileName);
     void diff(const QString &workingDirectory, const QStringList &diffArgs,
               const QStringList &unstagedFileNames, const QStringList &stagedFileNames= QStringList());
@@ -319,6 +326,9 @@ private:
     QTextCodec *getSourceCodec(const QString &file) const;
     VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
                                                   const QString &dynamicPropertyValue) const;
+    DiffEditor::DiffEditorWidget *findExistingDiffEditor(const char *registerDynamicProperty,
+                                               const QString &dynamicPropertyValue) const;
+
     enum CodecType { CodecSource, CodecLogOutput, CodecNone };
     VcsBase::VcsBaseEditorWidget *createVcsEditor(const Core::Id &kind,
                                             QString title,