diff options
author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-09-27 10:38:50 +0200 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-09-27 10:39:33 +0200 |
commit | 8215a1d0c04a7c69ee69ef95091fff8d401871b4 (patch) | |
tree | 45f249df0b246b9b9fc5c85265ae47089b3809a4 /src/plugins/cpptools/cppcodeformatter.cpp | |
parent | 0e0841dac917fd5b4b452d793664008619de9eda (diff) | |
download | qt-creator-8215a1d0c04a7c69ee69ef95091fff8d401871b4.tar.gz |
C++ indenter: Fix member initializer indent being hardcoded to 4.
Task-number: QTCREATORBUG-2456
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
-rw-r--r-- | src/plugins/cpptools/cppcodeformatter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index 744465f398..3a7462be9b 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -1282,7 +1282,7 @@ void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, i case T_COLON: // ### ok for constructor initializer lists - what about ? and bitfields? if (topState.type == expression && previousState.type == declaration_start) { - *paddingDepth = 4; + *paddingDepth = m_indentSize; } else if (topState.type == ternary_op) { *paddingDepth -= 2; } |