aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorjkobus <[email protected]>2013-05-23 13:36:27 +0200
committerJarek Kobus <[email protected]>2013-05-24 14:14:06 +0200
commit2ddb726dd537a1505b8d0208fe638cc759a68c38 (patch)
tree61e01f344c4d0ef588ab69adc2431e565ec2ee38 /src/plugins/git/gitclient.h
parent13504eec18274a7e4e74486b69506a7fa2422bc8 (diff)
Add file list combobox to diff editor
Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 003cf6b92cd..b1b81c89b0b 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 };