diff options
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r-- | src/plugins/git/gitclient.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 003cf6b92c..b1b81c89b0 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -61,7 +61,7 @@ namespace Utils { } namespace DiffEditor { - class DiffEditorWidget; + class DiffEditorEditable; } namespace Git { @@ -69,7 +69,6 @@ namespace Internal { class GitPlugin; class GitOutputWindow; -class GitDiffEditorWidget; class CommitData; struct GitSubmitEditorPanelData; class Stash; @@ -133,8 +132,6 @@ 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()); @@ -326,7 +323,7 @@ private: QTextCodec *getSourceCodec(const QString &file) const; VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty, const QString &dynamicPropertyValue) const; - DiffEditor::DiffEditorWidget *findExistingDiffEditor(const char *registerDynamicProperty, + DiffEditor::DiffEditorEditable *findExistingDiffEditor(const char *registerDynamicProperty, const QString &dynamicPropertyValue) const; enum CodecType { CodecSource, CodecLogOutput, CodecNone }; |