diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2013-12-16 16:19:40 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-01-16 14:36:53 +0100 |
commit | a74b59ffd6f66ee3ad7faea31839236e73fe127f (patch) | |
tree | 1ae5fb3a0ae77de5358b43b5b8a48c783bb838f0 /src/plugins/diffeditor/diffeditor.h | |
parent | be2b75611dd183042855ca057fea6d70d6c14cab (diff) | |
download | qt-creator-a74b59ffd6f66ee3ad7faea31839236e73fe127f.tar.gz |
Add DiffEditorController
Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
-rw-r--r-- | src/plugins/diffeditor/diffeditor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h index daf0b07a67..1a89ceaa74 100644 --- a/src/plugins/diffeditor/diffeditor.h +++ b/src/plugins/diffeditor/diffeditor.h @@ -31,7 +31,7 @@ #define DIFFEDITOR_H #include "diffeditor_global.h" -#include "diffeditorwidget.h" +#include "diffeditorcontroller.h" #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/idocument.h> @@ -42,6 +42,7 @@ class QComboBox; QT_END_NAMESPACE namespace DiffEditor { +class DiffEditorWidget; namespace Internal { class DiffEditorFile; @@ -55,7 +56,7 @@ public: virtual ~DiffEditor(); public: - void setDiff(const QList<DiffEditorWidget::DiffFilesContents> &diffFileList, + void setDiff(const QList<DiffEditorController::DiffFilesContents> &diffFileList, const QString &workingDirectory = QString()); void clear(const QString &message); @@ -81,6 +82,7 @@ private: Internal::DiffEditorFile *m_file; DiffEditorWidget *m_editorWidget; + DiffEditorController *m_diffEditorController; QComboBox *m_entriesComboBox; }; |