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

TextEditor: Move toolbar widgets from *Editor to *Widget

Browse Source 
Lifetime is coupled to the widgets, not the editor.

Change-Id: I01560bbdd6c399376d3a4184f0eb83e4153f830e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2014-08-01 16:41:18 +02:00
parent ac00146a94
commit a9b7045803
6 changed files with 68 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -614,7 +614,8 @@ QComboBox *VcsBaseEditorWidgetPrivate::entriesComboBox()
policy.setHorizontalPolicy(QSizePolicy::Expanding);
m_entriesComboBox->setSizePolicy(policy);
m_editor->insertExtraToolBarWidget(TextEditor::BaseTextEditor::Left, m_entriesComboBox);
m_editor->editorWidget()->insertExtraToolBarWidget
(TextEditor::BaseTextEditorWidget::Left, m_entriesComboBox);
return m_entriesComboBox;
}
@@ -1337,7 +1338,7 @@ bool VcsBaseEditorWidget::setConfigurationWidget(VcsBaseEditorParameterWidget *w
return false;
d->m_configurationWidget = w;
d->m_editor->insertExtraToolBarWidget(TextEditor::BaseTextEditor::Right, w);
d->m_editor->editorWidget()->insertExtraToolBarWidget(TextEditor::BaseTextEditorWidget::Right, w);
return true;
}