summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodeformatter.h
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2010-07-15 16:14:22 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2010-07-15 16:15:09 +0200
commit1a61ae01cb4ac0eaa175cd6d7859e0a3b49c6a05 (patch)
tree4379c5e3156c8c9ac5beadd462022460728cb11e /src/plugins/cpptools/cppcodeformatter.h
parent9b24e0ae2af9523691f99a30bca9e83200bfd6d9 (diff)
downloadqt-creator-1a61ae01cb4ac0eaa175cd6d7859e0a3b49c6a05.tar.gz
C++ indenter: Respect user indent with stream operators.
Reviewed-by: Erik Verbruggen
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.h')
-rw-r--r--src/plugins/cpptools/cppcodeformatter.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h
index fb3db4997f..6508ad8f6d 100644
--- a/src/plugins/cpptools/cppcodeformatter.h
+++ b/src/plugins/cpptools/cppcodeformatter.h
@@ -149,7 +149,8 @@ protected:
substatement_open, // The brace that opens a substatement block.
arglist_open, // after the lparen. TODO: check if this is enough.
- stream_op, // Lines continuing a stream operator (C++ only).
+ stream_op, // After a '<<' or '>>' in a context where it's likely a stream operator.
+ stream_op_cont, // When finding another stream operator in stream_op
ternary_op, // The ? : operator
condition_open, // Start of a condition in 'if', 'while', entered after opening paren