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

Move Gui stuff out of DiffEditorController

Browse Source 
Place it in DiffEditorGuiController, will be needed for
sharing gui settings between unified and sidebyside versions.

Change-Id: I8a858d0549ff84e21f7c909288ca07c5a2ef4e5b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
jkobus
2014-02-24 11:10:17 +01:00
committed by Jarek Kobus
parent 167206f8fb
commit 52e166c5ae
10 changed files with 290 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ QT_END_NAMESPACE
namespace DiffEditor {
class DiffEditorGuiController;
class SideDiffEditorWidget;
class ChunkData;
class FileData;
@@ -58,8 +59,8 @@ public:
SideBySideDiffEditorWidget(QWidget *parent = 0);
~SideBySideDiffEditorWidget();
void setDiffEditorController(DiffEditorController *controller);
DiffEditorController *diffEditorController() const;
void setDiffEditorGuiController(DiffEditorGuiController *controller);
DiffEditorGuiController *diffEditorGuiController() const;
#ifdef WITH_TESTS
static void testAssemblyRows();
@@ -106,6 +107,7 @@ private:
void synchronizeFoldings(SideDiffEditorWidget *source, SideDiffEditorWidget *destination);
void jumpToOriginalFile(const QString &fileName, int lineNumber, int columnNumber);
DiffEditorGuiController *m_guiController;
DiffEditorController *m_controller;
SideDiffEditorWidget *m_leftEditor;
SideDiffEditorWidget *m_rightEditor;