Skip to content

Commit 7cf2b31

Browse files
steveiresteveire
committed
Use C++11-style QVariantList local-initialization
1 parent d3ec433 commit 7cf2b31

File tree

9 files changed

+130
-163
lines changed

9 files changed

+130
-163
lines changed

‎templates/lib/metatype.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ QVariant Grantlee::MetaType::lookup(const QVariant &object,
146146
const auto end = iter.end();
147147
QVariantList list;
148148
for (; it != end; ++it) {
149-
list.push_back(QVariantList() << it.key() << it.value());
149+
list.push_back(QVariantList{it.key(), it.value()});
150150
}
151151
return list;
152152
}

‎templates/tests/benchmarks.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,9 @@ void Benchmarking::getData()
148148

149149
dict.insert(QStringLiteral("boo"), QStringLiteral("Far"));
150150
dict.insert(QStringLiteral("bat"), QStringLiteral("Cat"));
151-
dict.insert(QStringLiteral("booList"), QVariantList()
152-
<< QString::fromLatin1("Tom")
153-
<< QString::fromLatin1("Dick")
154-
<< QString::fromLatin1("Harry"));
151+
dict.insert(QStringLiteral("booList"),
152+
{QString::fromLatin1("Tom"), , QString::fromLatin1("Dick"),
153+
QString::fromLatin1("Harry")});
155154

156155
// Using Grantlee to create Grantlee templates. How recursive...
157156

‎templates/tests/testbuiltins.cpp

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -493,27 +493,23 @@ void TestBuiltinSyntax::testBasicSyntax_data()
493493

494494
dict.clear();
495495
hash.clear();
496-
QVariantList list;
497-
list << QStringLiteral("a") << QStringLiteral("b") << QStringLiteral("c")
498-
<< QStringLiteral("d");
496+
QVariantList list{QStringLiteral("a"), QStringLiteral("b"),
497+
QStringLiteral("c"), QStringLiteral("d")};
499498
hash.insert(QStringLiteral("2"), list);
500499
dict.insert(QStringLiteral("1"), hash);
501500
QTest::newRow("basic-syntax29") << QStringLiteral("{{ 1.2.3 }}") << dict
502501
<< QStringLiteral("d") << NoError;
503502

504503
dict.clear();
505504
list.clear();
506-
QVariantList innerList;
507-
innerList << QStringLiteral("x") << QStringLiteral("x") << QStringLiteral("x")
508-
<< QStringLiteral("x");
505+
QVariantList innerList{QStringLiteral("x"), QStringLiteral("x"),
506+
QStringLiteral("x"), QStringLiteral("x")};
509507
list.append(QVariant(innerList));
510-
innerList.clear();
511-
innerList << QStringLiteral("y") << QStringLiteral("y") << QStringLiteral("y")
512-
<< QStringLiteral("y");
508+
innerList = {QStringLiteral("y"), QStringLiteral("y"), QStringLiteral("y"),
509+
QStringLiteral("y")};
513510
list.append(QVariant(innerList));
514-
innerList.clear();
515-
innerList << QStringLiteral("a") << QStringLiteral("b") << QStringLiteral("c")
516-
<< QStringLiteral("d");
511+
innerList = {QStringLiteral("a"), QStringLiteral("b"), QStringLiteral("c"),
512+
QStringLiteral("d")};
517513
list.append(QVariant(innerList));
518514
dict.insert(QStringLiteral("1"), list);
519515

@@ -522,17 +518,14 @@ void TestBuiltinSyntax::testBasicSyntax_data()
522518

523519
dict.clear();
524520
list.clear();
525-
innerList.clear();
526-
innerList << QStringLiteral("x") << QStringLiteral("x") << QStringLiteral("x")
527-
<< QStringLiteral("x");
521+
innerList = {QStringLiteral("x"), QStringLiteral("x"), QStringLiteral("x"),
522+
QStringLiteral("x")};
528523
list.append(QVariant(innerList));
529-
innerList.clear();
530-
innerList << QStringLiteral("y") << QStringLiteral("y") << QStringLiteral("y")
531-
<< QStringLiteral("y");
524+
innerList = {QStringLiteral("y"), QStringLiteral("y"), QStringLiteral("y"),
525+
QStringLiteral("y")};
532526
list.append(QVariant(innerList));
533-
innerList.clear();
534-
innerList << QStringLiteral("a") << QStringLiteral("b") << QStringLiteral("c")
535-
<< QStringLiteral("d");
527+
innerList = {QStringLiteral("a"), QStringLiteral("b"), QStringLiteral("c"),
528+
QStringLiteral("d")};
536529
list.append(QVariant(innerList));
537530
dict.insert(QStringLiteral("1"), list);
538531

@@ -768,8 +761,7 @@ void TestBuiltinSyntax::testListIndex_data()
768761

769762
Dict dict;
770763

771-
QVariantList l;
772-
l << QStringLiteral("first item") << QStringLiteral("second item");
764+
QVariantList l{QStringLiteral("first item"), QStringLiteral("second item")};
773765

774766
dict.insert(QStringLiteral("var"), l);
775767

@@ -912,9 +904,9 @@ void TestBuiltinSyntax::testFilterSyntax_data()
912904
<< dict << "foo\\now" << NoError;
913905
// Empty strings can be passed as arguments to filters
914906
dict.clear();
915-
dict.insert(QStringLiteral("var"), QVariantList() << QStringLiteral("a")
916-
<< QStringLiteral("b")
917-
<< QStringLiteral("c"));
907+
dict.insert(QStringLiteral("var"),
908+
QVariantList{QStringLiteral("a"), QStringLiteral("b"),
909+
QStringLiteral("c")});
918910
QTest::newRow("filter-syntax17")
919911
<< "{{ var|join:\"\" }}" << dict << QStringLiteral("abc") << NoError;
920912

@@ -1022,8 +1014,8 @@ void TestBuiltinSyntax::testEscaping_data()
10221014
<< QStringLiteral("this that") << NoError;
10231015

10241016
dict.insert(QStringLiteral("varList"),
1025-
QVariantList() << QStringLiteral("Tom") << QStringLiteral("Dick")
1026-
<< QStringLiteral("Harry"));
1017+
QVariantList{QStringLiteral("Tom"), QStringLiteral("Dick"),
1018+
QStringLiteral("Harry")});
10271019
QTest::newRow("escape05") << "{{ varList|join:\" & \" }}" << dict
10281020
<< QStringLiteral("Tom & Dick & Harry") << NoError;
10291021

@@ -1039,8 +1031,8 @@ void TestBuiltinSyntax::testEscaping_data()
10391031

10401032
// Iterating outputs safe characters.
10411033
dict.clear();
1042-
QVariantList list;
1043-
list << QStringLiteral("K") << QStringLiteral("&") << QStringLiteral("R");
1034+
QVariantList list{QStringLiteral("K"), QStringLiteral("&"),
1035+
QStringLiteral("R")};
10441036
dict.insert(QStringLiteral("list"), list);
10451037
QTest::newRow("escape08")
10461038
<< QStringLiteral("{% for letter in list %}{{ letter }},{% endfor %}")

‎templates/tests/testdefaulttags.cpp

Lines changed: 41 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -521,25 +521,25 @@ void TestDefaultTags::testIfTag_data()
521521
// Contains
522522

523523
dict.clear();
524-
dict.insert(QStringLiteral("x"), QVariantList() << 1);
524+
dict.insert(QStringLiteral("x"), QVariantList{1});
525525
QTest::newRow("if-tag-in-01")
526526
<< QStringLiteral("{% if 1 in x %}yes{% else %}no{% endif %}") << dict
527527
<< QStringLiteral("yes") << NoError;
528528

529529
dict.clear();
530-
dict.insert(QStringLiteral("x"), QVariantList() << 1);
530+
dict.insert(QStringLiteral("x"), QVariantList{1});
531531
QTest::newRow("if-tag-in-02")
532532
<< QStringLiteral("{% if 2 in x %}yes{% else %}no{% endif %}") << dict
533533
<< QStringLiteral("no") << NoError;
534534

535535
dict.clear();
536-
dict.insert(QStringLiteral("x"), QVariantList() << 1);
536+
dict.insert(QStringLiteral("x"), QVariantList{1});
537537
QTest::newRow("if-tag-not-in-01")
538538
<< QStringLiteral("{% if 1 not in x %}yes{% else %}no{% endif %}") << dict
539539
<< QStringLiteral("no") << NoError;
540540

541541
dict.clear();
542-
dict.insert(QStringLiteral("x"), QVariantList() << 1);
542+
dict.insert(QStringLiteral("x"), QVariantList{1});
543543
QTest::newRow("if-tag-not-in-02")
544544
<< QStringLiteral("{% if 2 not in x %}yes{% else %}no{% endif %}") << dict
545545
<< QStringLiteral("yes") << NoError;
@@ -1093,8 +1093,7 @@ void TestDefaultTags::testForTag_data()
10931093

10941094
Dict dict;
10951095

1096-
QVariantList list;
1097-
list << 1 << 2 << 3;
1096+
QVariantList list{1, 2, 3};
10981097
dict.insert(QStringLiteral("values"), list);
10991098
QTest::newRow("for-tag01")
11001099
<< QStringLiteral("{% for val in values %}{{ val }}{% endfor %}") << dict
@@ -1165,8 +1164,7 @@ void TestDefaultTags::testForTag_data()
11651164

11661165
dict.clear();
11671166
list.clear();
1168-
QVariantList innerList;
1169-
innerList << QStringLiteral("one") << 1;
1167+
QVariantList innerList{QStringLiteral("one"), 1};
11701168
list.append(QVariant(innerList));
11711169
innerList.clear();
11721170
innerList << QStringLiteral("two") << 2;
@@ -1274,7 +1272,7 @@ void TestDefaultTags::testForTag_data()
12741272
// Empty tag:
12751273

12761274
dict.clear();
1277-
dict.insert(QStringLiteral("values"), QVariantList() << 1 << 2 << 3);
1275+
dict.insert(QStringLiteral("values"), QVariantList{1, 2, 3});
12781276
QTest::newRow("for-tag-empty01") << QStringLiteral(
12791277
"{% for val in values %}{{ val }}{% empty %}empty text{% endfor %}")
12801278
<< dict << QStringLiteral("123") << NoError;
@@ -1660,7 +1658,7 @@ void TestDefaultTags::testCycleTag_data()
16601658
"%}{{ foo }}") << dict
16611659
<< QStringLiteral("abbbcc") << NoError;
16621660

1663-
dict.insert(QStringLiteral("test"), QVariantList() << 0 << 1 << 2 << 3 << 4);
1661+
dict.insert(QStringLiteral("test"), QVariantList{0, 1, 2, 3, 4});
16641662
QTest::newRow("cycle09") << QStringLiteral(
16651663
"{% for i in test %}{% cycle a,b %}{{ i }},{% endfor %}")
16661664
<< dict << QStringLiteral("a0,b1,a2,b3,a4,")
@@ -1678,7 +1676,7 @@ void TestDefaultTags::testCycleTag_data()
16781676
"abc %}") << dict << QStringLiteral("abca")
16791677
<< NoError;
16801678

1681-
dict.insert(QStringLiteral("test"), QVariantList() << 0 << 1 << 2 << 3 << 4);
1679+
dict.insert(QStringLiteral("test"), QVariantList{0, 1, 2, 3, 4});
16821680
QTest::newRow("cycle13") << QStringLiteral(
16831681
"{% for i in test %}{% cycle 'a' 'b' %}{{ i }},{% endfor %}")
16841682
<< dict << QStringLiteral("a0,b1,a2,b3,a4,")
@@ -1692,7 +1690,7 @@ void TestDefaultTags::testCycleTag_data()
16921690
<< dict << QStringLiteral("12") << NoError;
16931691

16941692
dict.clear();
1695-
dict.insert(QStringLiteral("test"), QVariantList() << 0 << 1 << 2 << 3 << 4);
1693+
dict.insert(QStringLiteral("test"), QVariantList{0, 1, 2, 3, 4});
16961694
dict.insert(QStringLiteral("aye"), QStringLiteral("a"));
16971695
dict.insert(QStringLiteral("bee"), QStringLiteral("b"));
16981696
QTest::newRow("cycle15") << QStringLiteral(
@@ -2020,52 +2018,52 @@ void TestDefaultTags::testIfChangedTag_data()
20202018

20212019
Dict dict;
20222020

2023-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 2 << 3);
2021+
dict.insert(QStringLiteral("num"), QVariantList{1, 2, 3});
20242022
QTest::newRow("ifchanged01") << QStringLiteral(
20252023
"{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% endfor %}")
20262024
<< dict << QStringLiteral("123") << NoError;
20272025

20282026
dict.clear();
2029-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 1 << 3);
2027+
dict.insert(QStringLiteral("num"), QVariantList{1, 1, 3});
20302028
QTest::newRow("ifchanged02") << QStringLiteral(
20312029
"{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% endfor %}")
20322030
<< dict << QStringLiteral("13") << NoError;
20332031

20342032
dict.clear();
2035-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 1 << 1);
2033+
dict.insert(QStringLiteral("num"), QVariantList{1, 1, 1});
20362034
QTest::newRow("ifchanged03") << QStringLiteral(
20372035
"{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% endfor %}")
20382036
<< dict << QStringLiteral("1") << NoError;
20392037

20402038
dict.clear();
2041-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 2 << 3);
2042-
dict.insert(QStringLiteral("numx"), QVariantList() << 2 << 2 << 2);
2039+
dict.insert(QStringLiteral("num"), QVariantList{1, 2, 3});
2040+
dict.insert(QStringLiteral("numx"), QVariantList{2, 2, 2});
20432041
QTest::newRow("ifchanged04") << QStringLiteral(
20442042
"{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% for x in "
20452043
"numx %}{% ifchanged %}{{ x }}{% endifchanged %}{% endfor %}{% endfor %}")
20462044
<< dict << QStringLiteral("122232") << NoError;
20472045

20482046
dict.clear();
2049-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 1 << 1);
2050-
dict.insert(QStringLiteral("numx"), QVariantList() << 1 << 2 << 3);
2047+
dict.insert(QStringLiteral("num"), QVariantList{1, 1, 1});
2048+
dict.insert(QStringLiteral("numx"), QVariantList{1, 2, 3});
20512049
QTest::newRow("ifchanged05") << QStringLiteral(
20522050
"{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% for x in "
20532051
"numx %}{% ifchanged %}{{ x }}{% endifchanged %}{% endfor %}{% endfor %}")
20542052
<< dict << QStringLiteral("1123123123")
20552053
<< NoError;
20562054

20572055
dict.clear();
2058-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 1 << 1);
2059-
dict.insert(QStringLiteral("numx"), QVariantList() << 2 << 2 << 2);
2056+
dict.insert(QStringLiteral("num"), QVariantList{1, 1, 1});
2057+
dict.insert(QStringLiteral("numx"), QVariantList{2, 2, 2});
20602058
QTest::newRow("ifchanged06") << QStringLiteral(
20612059
"{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% for x in "
20622060
"numx %}{% ifchanged %}{{ x }}{% endifchanged %}{% endfor %}{% endfor %}")
20632061
<< dict << QStringLiteral("1222") << NoError;
20642062

20652063
dict.clear();
2066-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 1 << 1);
2067-
dict.insert(QStringLiteral("numx"), QVariantList() << 2 << 2 << 2);
2068-
dict.insert(QStringLiteral("numy"), QVariantList() << 3 << 3 << 3);
2064+
dict.insert(QStringLiteral("num"), QVariantList{1, 1, 1});
2065+
dict.insert(QStringLiteral("numx"), QVariantList{2, 2, 2});
2066+
dict.insert(QStringLiteral("numy"), QVariantList{3, 3, 3});
20692067
QTest::newRow("ifchanged07") << QStringLiteral(
20702068
"{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% for x in "
20712069
"numx %}{% ifchanged %}{{ x }}{% endifchanged %}{% for y in numy %}{% "
@@ -2082,37 +2080,27 @@ void TestDefaultTags::testIfChangedTag_data()
20822080
dict.clear();
20832081
QVariantList list;
20842082
QVariantList innerList;
2085-
QVariantList tuple;
2086-
tuple << 1 << QStringLiteral("a");
2083+
QVariantList tuple{1, QStringLiteral("a")};
20872084
innerList.append(QVariant(tuple));
2088-
tuple.clear();
2089-
tuple << 1 << QStringLiteral("a");
2085+
tuple = {1, QStringLiteral("a")};
20902086
innerList.append(QVariant(tuple));
2091-
tuple.clear();
2092-
tuple << 0 << QStringLiteral("b");
2087+
tuple = {0, QStringLiteral("b")};
20932088
innerList.append(QVariant(tuple));
2094-
tuple.clear();
2095-
tuple << 1 << QStringLiteral("c");
2089+
tuple = {1, QStringLiteral("c")};
20962090
innerList.append(QVariant(tuple));
2097-
tuple.clear();
20982091
list.append(QVariant(innerList));
20992092
innerList.clear();
21002093

2101-
tuple << 0 << QStringLiteral("a");
2094+
tuple = {0, QStringLiteral("a")};
21022095
innerList.append(QVariant(tuple));
2103-
tuple.clear();
2104-
tuple << 1 << QStringLiteral("c");
2096+
tuple = {1, QStringLiteral("c")};
21052097
innerList.append(QVariant(tuple));
2106-
tuple.clear();
2107-
tuple << 1 << QStringLiteral("d");
2098+
tuple = {1, QStringLiteral("d")};
21082099
innerList.append(QVariant(tuple));
2109-
tuple.clear();
2110-
tuple << 1 << QStringLiteral("d");
2100+
tuple = {1, QStringLiteral("d")};
21112101
innerList.append(QVariant(tuple));
2112-
tuple.clear();
2113-
tuple << 0 << QStringLiteral("e");
2102+
tuple = {0, QStringLiteral("e")};
21142103
innerList.append(QVariant(tuple));
2115-
tuple.clear();
21162104
list.append(QVariant(innerList));
21172105
innerList.clear();
21182106

@@ -2124,15 +2112,15 @@ void TestDefaultTags::testIfChangedTag_data()
21242112

21252113
// Test one parameter given to ifchanged.
21262114
dict.clear();
2127-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 2 << 3);
2115+
dict.insert(QStringLiteral("num"), QVariantList{1, 2, 3});
21282116
QTest::newRow("ifchanged-param01")
21292117
<< QStringLiteral("{% for n in num %}{% ifchanged n %}..{% endifchanged "
21302118
"%}{{ n }}{% endfor %}")
21312119
<< dict << QStringLiteral("..1..2..3") << NoError;
21322120

21332121
dict.clear();
2134-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 2 << 3);
2135-
dict.insert(QStringLiteral("numx"), QVariantList() << 5 << 6 << 7);
2122+
dict.insert(QStringLiteral("num"), QVariantList{1, 2, 3});
2123+
dict.insert(QStringLiteral("numx"), QVariantList{5, 6, 7});
21362124
QTest::newRow("ifchanged-param02")
21372125
<< QStringLiteral("{% for n in num %}{% for x in numx %}{% ifchanged n "
21382126
"%}..{% endifchanged %}{{ x }}{% endfor %}{% endfor %}")
@@ -2141,8 +2129,8 @@ void TestDefaultTags::testIfChangedTag_data()
21412129
// Test multiple parameters to ifchanged.
21422130

21432131
dict.clear();
2144-
dict.insert(QStringLiteral("num"), QVariantList() << 1 << 1 << 2);
2145-
dict.insert(QStringLiteral("numx"), QVariantList() << 5 << 6 << 6);
2132+
dict.insert(QStringLiteral("num"), QVariantList{1, 1, 2});
2133+
dict.insert(QStringLiteral("numx"), QVariantList{5, 6, 6});
21462134
QTest::newRow("ifchanged-param03")
21472135
<< QStringLiteral(
21482136
"{% for n in num %}{{ n }}{% for x in numx %}{% ifchanged x n "
@@ -2156,11 +2144,11 @@ void TestDefaultTags::testIfChangedTag_data()
21562144
QVariantList days;
21572145
QVariantHash hash;
21582146
hash.insert(QStringLiteral("day"), 1);
2159-
hash.insert(QStringLiteral("hours"), QVariantList() << 1 << 2 << 3);
2147+
hash.insert(QStringLiteral("hours"), QVariantList{1, 2, 3});
21602148
days << hash;
21612149
hash.clear();
21622150
hash.insert(QStringLiteral("day"), 2);
2163-
hash.insert(QStringLiteral("hours"), QVariantList() << 3);
2151+
hash.insert(QStringLiteral("hours"), QVariantList{3});
21642152
days << hash;
21652153
dict.insert(QStringLiteral("days"), days);
21662154
QTest::newRow("ifchanged-param04")
@@ -2180,8 +2168,7 @@ void TestDefaultTags::testIfChangedTag_data()
21802168

21812169
// Test the else clause of ifchanged.
21822170
dict.clear();
2183-
dict.insert(QStringLiteral("ids"), QVariantList()
2184-
<< 1 << 1 << 2 << 2 << 2 << 3);
2171+
dict.insert(QStringLiteral("ids"), QVariantList{1, 1, 2, 2, 2, 3});
21852172
QTest::newRow("ifchanged-else01")
21862173
<< QStringLiteral("{% for id in ids %}{{ id }}{% ifchanged id %}-first{% "
21872174
"else %}-other{% endifchanged %},{% endfor %}")
@@ -2201,8 +2188,7 @@ void TestDefaultTags::testIfChangedTag_data()
22012188
<< dict << QStringLiteral("1-red,1,2-blue,2,2,3-red,") << NoError;
22022189

22032190
dict.clear();
2204-
dict.insert(QStringLiteral("ids"), QVariantList()
2205-
<< 1 << 1 << 2 << 2 << 2 << 3 << 4);
2191+
dict.insert(QStringLiteral("ids"), QVariantList{1, 1, 2, 2, 2, 3, 4});
22062192
QTest::newRow("ifchanged-else04")
22072193
<< QStringLiteral(
22082194
"{% for id in ids %}{% ifchanged %}***{{ id }}*{% else %}...{% "
@@ -2386,8 +2372,7 @@ void TestDefaultTags::testRangeTag_data()
23862372
<< QStringLiteral("{% range 5 26 5 as i %}{{ i }};{% endrange %}") << dict
23872373
<< QStringLiteral("5;10;15;20;25;") << NoError;
23882374

2389-
QVariantList list;
2390-
list << 10 << 15 << 2;
2375+
QVariantList list{10, 15, 2};
23912376
dict.insert(QStringLiteral("values"), list);
23922377

23932378
QTest::newRow("range-tag04") << QStringLiteral(

0 commit comments

Comments
 (0)