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

C++: Replace non-absolute-critical asserts for soft ones

Browse Source 
Change-Id: I021074a78d90929b4e83b8aff9db1ae7995e8c6a
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Leandro Melo
2012-01-23 17:44:49 +01:00
committed by hjk
parent 918131b6e7
commit efe9bca20c
13 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cpptools/cppcodeformatter.cpp
View File

@@ -37,6 +37,7 @@
#include <texteditor/basetextdocumentlayout.h>
#include <texteditor/tabsettings.h>
#include <utils/qtcassert.h>
#include <QtCore/QDebug>
#include <QtCore/QMetaEnum>
@@ -319,14 +320,14 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
case else_clause:
// ### shouldn't happen
dump();
Q_ASSERT(false);
QTC_CHECK(false);
leave(true);
break;
case do_statement:
// ### shouldn't happen
dump();
Q_ASSERT(false);
QTC_CHECK(false);
leave(true);
break;
@@ -649,7 +650,7 @@ void CodeFormatter::enter(int newState)
void CodeFormatter::leave(bool statementDone)
{
Q_ASSERT(m_currentState.size() > 1);
QTC_ASSERT(m_currentState.size() > 1, return);
if (m_currentState.top().type == topmost_intro)
return;
@@ -688,7 +689,7 @@ void CodeFormatter::leave(bool statementDone)
void CodeFormatter::correctIndentation(const QTextBlock &block)
{
const int lexerState = tokenizeBlock(block);
Q_ASSERT(m_currentState.size() >= 1);
QTC_ASSERT(m_currentState.size() >= 1, return);
adjustIndent(m_tokens, lexerState, &m_indentDepth, &m_paddingDepth);
}
@@ -979,7 +980,7 @@ int CodeFormatter::tokenizeBlock(const QTextBlock &block, bool *endedJoined)
int startState = loadLexerState(block.previous());
if (block.blockNumber() == 0)
startState = 0;
Q_ASSERT(startState != -1);
QTC_ASSERT(startState != -1, return 0);
SimpleLexer tokenize;
tokenize.setQtMocRunEnabled(true);