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

Merge commit 'origin/1.3'

Browse Source
This commit is contained in:
con
2009-11-24 16:22:17 +01:00
parent 65e11062bb 585f8f3149
commit cf949a948c
7 changed files with 69 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cppeditor/cpphighlighter.cpp
View File

@@ -48,8 +48,6 @@ CppHighlighter::CppHighlighter(QTextDocument *document) :
void CppHighlighter::highlightBlock(const QString &text)
{
QTextCharFormat emptyFormat;
const int previousState = previousBlockState();
int state = 0, initialBraceDepth = 0;
if (previousState != -1) {
@@ -226,7 +224,7 @@ void CppHighlighter::highlightBlock(const QString &text)
if (oldState == tokenize.state() && oldBraceDepth != braceDepth) {
int delta = braceDepth - oldBraceDepth;
QTextBlock block = currentBlock().next();
while (block.isValid()) {
while (block.isValid() && block.userState() != -1) {
TextEditDocumentLayout::changeBraceDepth(block, delta);
block = block.next();
}