diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2014-02-24 11:10:17 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-02-24 11:43:25 +0100 |
commit | 52e166c5ae6f36eb53404e03a566bc04d07a0310 (patch) | |
tree | ecaf30bbbd7925071203e49287564015c1fac4cd /src/plugins/diffeditor/diffeditor.h | |
parent | 167206f8fb5d6617b353c85f2b080bcb4c87f108 (diff) |
Move Gui stuff out of DiffEditorController
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>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
-rw-r--r-- | src/plugins/diffeditor/diffeditor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h index 0e9b3dfd00..39810c47ee 100644 --- a/src/plugins/diffeditor/diffeditor.h +++ b/src/plugins/diffeditor/diffeditor.h @@ -47,6 +47,7 @@ namespace TextEditor { class BaseTextEditorWidget; } namespace DiffEditor { class DiffEditorDocument; +class DiffEditorGuiController; class SideBySideDiffEditorWidget; class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor @@ -88,7 +89,8 @@ private: QSharedPointer<DiffEditorDocument> m_document; TextEditor::BaseTextEditorWidget *m_descriptionWidget; SideBySideDiffEditorWidget *m_diffWidget; - DiffEditorController *m_diffEditorController; + DiffEditorController *m_controller; + DiffEditorGuiController *m_guiController; QToolBar *m_toolBar; QComboBox *m_entriesComboBox; QAction *m_toggleDescriptionAction; |