summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodeformatter.cpp
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2010-07-28 12:37:54 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2010-07-28 12:39:27 +0200
commit27026af2e353d228d104125e540127bd64034699 (patch)
tree172dd6be973b59e6f27ecb4114bd51156edb483d /src/plugins/cpptools/cppcodeformatter.cpp
parent63f7abb03cefefee169feed0dbf96b5f3209f1e7 (diff)
downloadqt-creator-27026af2e353d228d104125e540127bd64034699.tar.gz
C++ indenter: Fix indent of block statements in substatement blocks.
Task-number: QTCREATORBUG-1919
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
-rw-r--r--src/plugins/cpptools/cppcodeformatter.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index d24f3d9563..481df9b6ac 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -1227,6 +1227,7 @@ void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, i
*indentDepth += m_indentSize;
} else if (topState.type != defun_open
&& topState.type != block_open
+ && topState.type != substatement_open
&& !topWasMaybeElse) {
*indentDepth = topState.savedIndentDepth;
}