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>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 5dac850ce8..0d4412c1ac 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -322,12 +322,12 @@ QWidget *DiffEditor::toolBar()
     whitespaceButton->setText(tr("Ignore Whitespace"));
     whitespaceButton->setCheckable(true);
     whitespaceButton->setChecked(m_controller->isIgnoreWhitespace());
-    m_toolBar->addWidget(whitespaceButton);
+    m_whitespaceButtonAction = m_toolBar->addWidget(whitespaceButton);
 
     QLabel *contextLabel = new QLabel(m_toolBar);
     contextLabel->setText(tr("Context Lines:"));
     contextLabel->setContentsMargins(6, 0, 6, 0);
-    m_toolBar->addWidget(contextLabel);
+    m_contextLabelAction = m_toolBar->addWidget(contextLabel);
 
     QSpinBox *contextSpinBox = new QSpinBox(m_toolBar);
     contextSpinBox->setRange(1, 100);
@@ -335,7 +335,7 @@ QWidget *DiffEditor::toolBar()
     contextSpinBox->setFrame(false);
     contextSpinBox->setSizePolicy(QSizePolicy::Minimum,
                                   QSizePolicy::Expanding); // Mac Qt5
-    m_toolBar->addWidget(contextSpinBox);
+    m_contextSpinBoxAction = m_toolBar->addWidget(contextSpinBox);
 
     QToolButton *toggleDescription = new QToolButton(m_toolBar);
     toggleDescription->setIcon(
@@ -497,6 +497,9 @@ void DiffEditor::slotDescriptionVisibilityChanged()
 
 void DiffEditor::slotReloaderChanged(DiffEditorReloader *reloader)
 {
+    m_whitespaceButtonAction->setVisible(reloader);
+    m_contextLabelAction->setVisible(reloader);
+    m_contextSpinBoxAction->setVisible(reloader);
     m_reloadAction->setVisible(reloader);
 }