feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Add DiffEditorController

Browse Source 
Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
jkobus
2013-12-16 16:19:40 +01:00
committed by Jarek Kobus
parent be2b75611d
commit a74b59ffd6
13 changed files with 436 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/diffeditor/diffeditor.h
View File

@@ -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;
};