Reviewed-by: mae
Merge-request: 133

Merge-request: 1949
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>

Task-number: QTCREATORBUG-66
Merge-request: 107
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>

QString: Use QChar where appropriate.

Reviewed-by: thorbjorn

template functions where treated as unfinished lines by the indenter and so
the result of:

template<typename T>
void myFunc()
{

}

was indented as:

template<typename T>
	void myFunc()
{

}

which is pretty ugly and non-standard.

Merge-request: 1615
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>

Reviewed-by: Trust Me

Conflicts:

	src/libs/cplusplus/CppBindings.cpp
	src/libs/cplusplus/CppBindings.h
	src/libs/cplusplus/FastPreprocessor.cpp
	src/libs/cplusplus/FastPreprocessor.h
	src/plugins/cpptools/cppcurrentdocumentfilter.cpp
	src/plugins/cpptools/cppcurrentdocumentfilter.h
	src/plugins/cpptools/cppsemanticsearch.cpp
	src/plugins/cpptools/cppsemanticsearch.h
	src/plugins/duieditor/parser/qmljs.g
	src/plugins/duieditor/parser/qmljsast.cpp
	src/plugins/duieditor/parser/qmljsast_p.h
	src/plugins/duieditor/parser/qmljsastfwd_p.h
	src/plugins/duieditor/parser/qmljsastvisitor.cpp
	src/plugins/duieditor/parser/qmljsastvisitor_p.h
	src/plugins/duieditor/parser/qmljsengine_p.cpp
	src/plugins/duieditor/parser/qmljsengine_p.h
	src/plugins/duieditor/parser/qmljsgrammar.cpp
	src/plugins/duieditor/parser/qmljsgrammar_p.h
	src/plugins/duieditor/parser/qmljslexer.cpp
	src/plugins/duieditor/parser/qmljslexer_p.h
	src/plugins/duieditor/parser/qmljsmemorypool_p.h
	src/plugins/duieditor/parser/qmljsnodepool_p.h
	src/plugins/duieditor/parser/qmljsparser.cpp
	src/plugins/duieditor/parser/qmljsparser_p.h
	src/plugins/duieditor/parser/qmljsprettypretty.cpp
	src/plugins/duieditor/parser/qmljsprettypretty_p.h
	src/plugins/duieditor/rewriter/rewriter.cpp
	src/plugins/duieditor/rewriter/rewriter_p.h
	src/plugins/duieditor/rewriter/textwriter.cpp
	src/plugins/duieditor/rewriter/textwriter_p.h
	src/shared/cplusplus/ASTClone.cpp
	tests/manual/cplusplus/main.cpp

Reviewed-by: Trust Me

The line would only get a reduced indent when the user actually typed
the }, but not when typing the {, even though the line should still be
unindented because of the } at the start.

Previously this code worked fine because lines didn't used to get
automatically reindented for anything else than the first character.

When starting a line with :, the indenter now no longer removes the
indentation. Usually you do this when you're typing the global scope
operator.

Reviewed-by: Roberto Raggi