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

C++ indenter: Make continuations after ( consistent.

Browse Source 
Change-Id: Iae780127065e3fce274db10e173f5c0bde15bd92
Reviewed-on: http://codereview.qt.nokia.com/1229
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
This commit is contained in:
Christian Kamm
2011-07-06 12:51:04 +02:00
parent 8d8d9d4645
commit 1f9be179f0
2 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
View File

@@ -115,7 +115,8 @@ private Q_SLOTS:
void functionBodyAndBraces2();
void functionBodyAndBraces3();
void functionBodyAndBraces4();
void constructor();
void constructor1();
void constructor2();
void caseBody1();
void caseBody2();
void caseBody3();
@@ -1080,7 +1081,7 @@ void tst_CodeFormatter::memberInitializer()
<< Line(" Foo()")
<< Line(" ~ : baR(),")
<< Line(" ~ moodoo(barR + ")
<< Line(" ~ 42),")
<< Line(" ~ 42),")
<< Line(" ~ xyz()")
<< Line(" {}")
<< Line("};")
@@ -1764,7 +1765,7 @@ void tst_CodeFormatter::functionBodyAndBraces4()
checkIndent(data, codeStyle);
}
void tst_CodeFormatter::constructor()
void tst_CodeFormatter::constructor1()
{
QList<Line> data;
data << Line("class Foo {")
@@ -1782,6 +1783,42 @@ void tst_CodeFormatter::constructor()
checkIndent(data, codeStyle);
}
void tst_CodeFormatter::constructor2()
{
QList<Line> data;
data << Line("class Foo {")
<< Line(" Foo() : _a(0)")
<< Line(" {")
<< Line(" _b = 0")
<< Line(" }")
<< Line(" int _a;")
<< Line(" Foo()")
<< Line(" ~ : _foo(1),")
<< Line(" ~ _bar(2),")
<< Line(" ~ _carooooo(")
<< Line(" ~ foo() + 12),")
<< Line(" ~ _carooooo(foo(),")
<< Line(" ~ 12)")
<< Line(" {")
<< Line(" _b = 0")
<< Line(" }")
<< Line(" int _b;")
<< Line(" Foo()")
<< Line(" ~ : _foo(1)")
<< Line(" ~ , _bar(2)")
<< Line(" ~ , _carooooo(")
<< Line(" ~ foo() + 12)")
<< Line(" ~ , _carooooo(foo(),")
<< Line(" ~ 12)")
<< Line(" {")
<< Line(" _b = 0")
<< Line(" }")
<< Line("};")
;
CppCodeStyleSettings codeStyle;
checkIndent(data);
}
void tst_CodeFormatter::caseBody1()
{
QList<Line> data;