diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2014-10-24 14:11:12 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-11-05 14:38:51 +0100 |
commit | 2a9c9f2d707d37e9cac8712aeac049c35fd820e7 (patch) | |
tree | 957fc569a50bace03e71b21c426bb591ef146717 /src/plugins/diffeditor/diffeditor.h | |
parent | f406a38ca75ea56fe71cec7d10dfb2746444017d (diff) |
Hide some diff editor controls when diff editor is bound to a file.
Remove unnecessary anymore "ignoreWhitespace" argument
from functions which read a patch file.
Transfer the ownership of reloader into controller.
Task-number: QTCREATORBUG-13250
Change-Id: I68183005b845d6ece9ea2be9888abc8597310426
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
-rw-r--r-- | src/plugins/diffeditor/diffeditor.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h index c843fd3326..74ebb4bf1f 100644 --- a/src/plugins/diffeditor/diffeditor.h +++ b/src/plugins/diffeditor/diffeditor.h @@ -104,6 +104,9 @@ private: DiffEditorGuiController *m_guiController; QToolBar *m_toolBar; QComboBox *m_entriesComboBox; + QAction *m_whitespaceButtonAction; + QAction *m_contextLabelAction; + QAction *m_contextSpinBoxAction; QAction *m_toggleDescriptionAction; QAction *m_reloadAction; QToolButton *m_diffEditorSwitcher; |