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

CppTools: Small refactoring

Browse Source 
Change-Id: I8975af5fe80724ead81a88a38289fe16fbb283fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
lemelisk
2014-10-14 19:32:24 +04:00
parent 11b30a22ed
commit 62ba2b76f5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
m_tokenIndex = 1;
}
for (; m_tokenIndex < m_tokens.size(); ) {
while (m_tokenIndex < m_tokens.size()) {
m_currentToken = tokenAt(m_tokenIndex);
const int kind = m_currentToken.kind();
@@ -460,7 +460,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
if (kind != T_CASE && kind != T_DEFAULT && tryStatement())
break;
switch (kind) {
case T_RBRACE: leave(); continue;
case T_RBRACE:
case T_DEFAULT:
case T_CASE: leave(); continue;
} break;
@@ -1601,8 +1601,6 @@ void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, i
} else if (type == case_cont) {
*indentDepth = state(i).savedIndentDepth;
break;
} else if (type == topmost_intro) {
break;
}
}
break;
@@ -1668,6 +1666,7 @@ void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, i
if (m_styleSettings.indentControlFlowRelativeToSwitchLabels)
*indentDepth += m_tabSettings.m_indentSize;
}
break;
}
// ensure padding and indent are >= 0
*indentDepth = qMax(0, *indentDepth);