forked from qt-creator/qt-creator
qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts. Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -218,7 +218,7 @@ EditorToolBar::~EditorToolBar()
|
||||
|
||||
void EditorToolBar::removeToolbarForEditor(IEditor *editor)
|
||||
{
|
||||
QTC_ASSERT(editor, return)
|
||||
QTC_ASSERT(editor, return);
|
||||
disconnect(editor, SIGNAL(changed()), this, SLOT(checkEditorStatus()));
|
||||
|
||||
QWidget *toolBar = editor->toolBar();
|
||||
@@ -259,7 +259,7 @@ void EditorToolBar::closeEditor()
|
||||
|
||||
void EditorToolBar::addEditor(IEditor *editor)
|
||||
{
|
||||
QTC_ASSERT(editor, return)
|
||||
QTC_ASSERT(editor, return);
|
||||
connect(editor, SIGNAL(changed()), this, SLOT(checkEditorStatus()));
|
||||
QWidget *toolBar = editor->toolBar();
|
||||
|
||||
@@ -271,7 +271,7 @@ void EditorToolBar::addEditor(IEditor *editor)
|
||||
|
||||
void EditorToolBar::addCenterToolBar(QWidget *toolBar)
|
||||
{
|
||||
QTC_ASSERT(toolBar, return)
|
||||
QTC_ASSERT(toolBar, return);
|
||||
toolBar->setVisible(false); // will be made visible in setCurrentEditor
|
||||
d->m_toolBarPlaceholder->layout()->addWidget(toolBar);
|
||||
|
||||
@@ -305,7 +305,7 @@ void EditorToolBar::setToolbarCreationFlags(ToolbarCreationFlags flags)
|
||||
|
||||
void EditorToolBar::setCurrentEditor(IEditor *editor)
|
||||
{
|
||||
QTC_ASSERT(editor, return)
|
||||
QTC_ASSERT(editor, return);
|
||||
d->m_editorList->setCurrentIndex(d->m_editorsListModel->indexOf(editor).row());
|
||||
|
||||
// If we never added the toolbar from the editor, we will never change
|
||||
|
||||
Reference in New Issue
Block a user