Skip to content

Commit 70a29cf

Browse files
treefrogframeworktreefrogframework
committed
fix compilation errors.
1 parent 2dc99f2 commit 70a29cf

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

‎src/test/mailmessage/main.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,13 @@ void TestMailMessage::dateTime_data()
162162
.arg(qAbs(offset) / 60, 2, 10, QLatin1Char('0'))
163163
.arg(qAbs(offset) % 60, 2, 10, QLatin1Char('0'));
164164

165+
#if QT_VERSION >= 0x060700
165166
QTest::newRow("1") << QDateTime(QDate(2011,3,28), QTime(12,11,04), QTimeZone::LocalTime) << "Mon, 28 Mar 2011 12:11:04 " + offsetStr;
166167
QTest::newRow("2") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), QTimeZone::LocalTime) << "Mon, 31 Mar 2014 01:00:00 " + offsetStr;
168+
#else
169+
QTest::newRow("1") << QDateTime(QDate(2011,3,28), QTime(12,11,04), Qt::LocalTime) << "Mon, 28 Mar 2011 12:11:04 " + offsetStr;
170+
QTest::newRow("2") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), Qt::LocalTime) << "Mon, 31 Mar 2014 01:00:00 " + offsetStr;
171+
#endif
167172
QTest::newRow("3") << QDateTime(QDate(2011,3,28), QTime(12,11,04), QTimeZone::UTC) << "Mon, 28 Mar 2011 12:11:04 +0000";
168173
QTest::newRow("4") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), QTimeZone::UTC) << "Mon, 31 Mar 2014 01:00:00 +0000";
169174
}

‎tools/tmake/test/tmaketest.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -210,21 +210,21 @@ void TestTfpconverter::erbparse_data()
210210
QTest::newRow("7") << "<body>Hello <% QString s(\"%>\"); %></body>"
211211
<< " responsebody += QStringLiteral(\"<body>Hello \");\n QString s(\"%>\");\n responsebody += QStringLiteral(\"</body>\");\n";
212212
QTest::newRow("8") << "<body>Hello <%== vvv %></body>"
213-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += QVariant(vvv).toString();\n responsebody += QStringLiteral(\"</body>\");\n";
213+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n echo(vvv);\n responsebody += QStringLiteral(\"</body>\");\n";
214214
QTest::newRow("9") << "<body>Hello <%= vvv %> \n</body>"
215-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += QStringLiteral(\" \\n</body>\");\n";
215+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += QStringLiteral(\" \\n</body>\");\n";
216216
QTest::newRow("10") << "<body>Hello <%= vvv; -%> \n</body>"
217-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += QStringLiteral(\"</body>\");\n";
217+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += QStringLiteral(\"</body>\");\n";
218218
QTest::newRow("11") << "<body>Hello <% int i; -%> \r\n </body>"
219219
<< " responsebody += QStringLiteral(\"<body>Hello \");\n int i;\n responsebody += QStringLiteral(\" </body>\");\n";
220220
QTest::newRow("12") << "<body>Hello <% int i; %> \r\n</body>"
221221
<< " responsebody += QStringLiteral(\"<body>Hello \");\n int i;\n responsebody += QStringLiteral(\"</body>\");\n";
222222
QTest::newRow("13") << "<body>Hello ... \r\n</body>"
223223
<< " responsebody += QStringLiteral(\"<body>Hello ... \\r\\n</body>\");\n";
224224
QTest::newRow("14") << "<body>Hello <%= vvv; +%> \n</body>"
225-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += QStringLiteral(\" \\n</body>\");\n";
225+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += QStringLiteral(\" \\n</body>\");\n";
226226
QTest::newRow("15") << "<body>Hello <%= vvv; +%></body>\r\n"
227-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += QStringLiteral(\"</body>\\r\\n\");\n";
227+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += QStringLiteral(\"</body>\\r\\n\");\n";
228228
QTest::newRow("16") << "<body>Hello <% int i; +%> \r\n </body>"
229229
<< " responsebody += QStringLiteral(\"<body>Hello \");\n int i;\n responsebody += QStringLiteral(\" \\r\\n </body>\");\n";
230230

@@ -238,16 +238,16 @@ void TestTfpconverter::erbparse_data()
238238
QTest::newRow("19") << "<body><%# comment. %|% 33 %></body>"
239239
<< " responsebody += QStringLiteral(\"<body>\");\n /* comment. */\n responsebody += QStringLiteral(\"</body>\");\n";
240240
QTest::newRow("20") << "<body><%= number %|% 33 %></body>"
241-
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s = QVariant(number).toString(); responsebody += (___s.isEmpty()) ? THttpUtility::htmlEscape(33) : THttpUtility::htmlEscape(___s); }\n responsebody += QStringLiteral(\"</body>\");\n";
241+
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s(fromValue(number)); if (___s.isEmpty()) { eh(33); } else { eh(number); }}\n responsebody += QStringLiteral(\"</body>\");\n";
242242
QTest::newRow("21") << "<body><%== number %|% 33 %></body>"
243-
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s = QVariant(number).toString(); responsebody += (___s.isEmpty()) ? QVariant(33).toString() : ___s; }\n responsebody += QStringLiteral(\"</body>\");\n";
243+
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s(fromValue(number)); if (___s.isEmpty()) { echo(33); } else { echo(number); }}\n responsebody += QStringLiteral(\"</body>\");\n";
244244
QTest::newRow("22") << "<body><%=$number %|% 33 %></body>"
245245
<< " responsebody += QStringLiteral(\"<body>\");\n tehex2(number, (33));\n responsebody += QStringLiteral(\"</body>\");\n";
246246
// Irregular pattern
247247
QTest::newRow("23") << "<body><%==$number %|% 33 -%>\t\n</body>"
248248
<< " responsebody += QStringLiteral(\"<body>\");\n techoex2(number, (33));\n responsebody += QStringLiteral(\"</body>\");\n";
249249
QTest::newRow("24") << "<body><%== \" %|%\" %|% \"%|%\" -%> \t \n</body>"
250-
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s = QVariant(\" %|%\").toString(); responsebody += (___s.isEmpty()) ? QVariant(\"%|%\").toString() : ___s; }\n responsebody += QStringLiteral(\"</body>\");\n";
250+
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s(fromValue(\" %|%\")); if (___s.isEmpty()) { echo(\"%|%\"); } else { echo(\" %|%\"); }}\n responsebody += QStringLiteral(\"</body>\");\n";
251251

252252
QTest::newRow("25") << "<body><script>function() { return '\\n'; }</script></body>"
253253
<< " responsebody += QStringLiteral(\"<body><script>function() { return '\\\\n'; }</script></body>\");\n";
@@ -292,23 +292,23 @@ void TestTfpconverter::erbparseStrong_data()
292292
QTest::newRow("7") << "<body>Hello <% QString s(\"%>\"); %></body>"
293293
<< " responsebody += QStringLiteral(\"<body>Hello \");\n QString s(\"%>\");\n responsebody += QStringLiteral(\"</body>\");\n";
294294
QTest::newRow("8") << "<body>Hello <%== vvv %></body>"
295-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += QVariant(vvv).toString();\n responsebody += QStringLiteral(\"</body>\");\n";
296-
QTest::newRow("9") << "<body>Hello <%= vvv %> \n</body>"
297-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += QStringLiteral(\"\\n</body>\");\n";
295+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n echo(vvv);\n responsebody += QStringLiteral(\"</body>\");\n";
296+
QTest::newRow("9-1") << "<body>Hello <%= vvv %> \n</body>"
297+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += QStringLiteral(\"\\n</body>\");\n";
298298
QTest::newRow("9-2") << "<body>Hello <%= vvv %>　\n</body>"
299-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += tr(\"　\\n</body>\");\n";
299+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += tr(\"　\\n</body>\");\n";
300300
QTest::newRow("10") << "<body>Hello <%= vvv; -%> \n</body>"
301-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += QStringLiteral(\"</body>\");\n";
301+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += QStringLiteral(\"</body>\");\n";
302302
QTest::newRow("11") << " <body>Hello <% int i; -%> \r\n </body> "
303303
<< " responsebody += QStringLiteral(\"<body>Hello \");\n int i;\n responsebody += QStringLiteral(\"</body>\");\n";
304304
QTest::newRow("12") << "<body>Hello <% int i; %> \r\n</body>"
305305
<< " responsebody += QStringLiteral(\"<body>Hello \");\n int i;\n responsebody += QStringLiteral(\"</body>\");\n";
306306
QTest::newRow("13") << "<body>Hello ... \t\r\n\t</body>"
307307
<< " responsebody += QStringLiteral(\"<body>Hello ...\\n</body>\");\n";
308308
QTest::newRow("14") << "<body>Hello <%= vvv; +%> \n</body>"
309-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += QStringLiteral(\"\\n</body>\");\n";
309+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += QStringLiteral(\"\\n</body>\");\n";
310310
QTest::newRow("15") << "<body>Hello <%= vvv; +%></body>\t\r\n"
311-
<< " responsebody += QStringLiteral(\"<body>Hello \");\n responsebody += THttpUtility::htmlEscape(vvv);\n responsebody += QStringLiteral(\"</body>\");\n";
311+
<< " responsebody += QStringLiteral(\"<body>Hello \");\n eh(vvv);\n responsebody += QStringLiteral(\"</body>\");\n";
312312
QTest::newRow("16") << " \t<body>Hello <% int i; +%> \r\n </body>"
313313
<< " responsebody += QStringLiteral(\"<body>Hello \");\n int i;\n responsebody += QStringLiteral(\"\\n</body>\");\n";
314314

@@ -322,16 +322,16 @@ void TestTfpconverter::erbparseStrong_data()
322322
QTest::newRow("19") << "<body><%# comment. %|% 33 %></body>"
323323
<< " responsebody += QStringLiteral(\"<body>\");\n /* comment. */\n responsebody += QStringLiteral(\"</body>\");\n";
324324
QTest::newRow("20") << "<body><%= number %|% 33 %></body>"
325-
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s = QVariant(number).toString(); responsebody += (___s.isEmpty()) ? THttpUtility::htmlEscape(33) : THttpUtility::htmlEscape(___s); }\n responsebody += QStringLiteral(\"</body>\");\n";
325+
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s(fromValue(number)); if (___s.isEmpty()) { eh(33); } else { eh(number); }}\n responsebody += QStringLiteral(\"</body>\");\n";
326326
QTest::newRow("21") << "<body><%== number %|% 33 %></body>"
327-
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s = QVariant(number).toString(); responsebody += (___s.isEmpty()) ? QVariant(33).toString() : ___s; }\n responsebody += QStringLiteral(\"</body>\");\n";
327+
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s(fromValue(number)); if (___s.isEmpty()) { echo(33); } else { echo(number); }}\n responsebody += QStringLiteral(\"</body>\");\n";
328328
QTest::newRow("22") << "<body><%=$number %|% 33 %></body>"
329329
<< " responsebody += QStringLiteral(\"<body>\");\n tehex2(number, (33));\n responsebody += QStringLiteral(\"</body>\");\n";
330330
// Irregular pattern
331331
QTest::newRow("23") << "<body><%==$number %|% 33 -%>\t\n</body>"
332332
<< " responsebody += QStringLiteral(\"<body>\");\n techoex2(number, (33));\n responsebody += QStringLiteral(\"</body>\");\n";
333333
QTest::newRow("24") << "<body><%== \" %|%\" %|% \"%|%\" -%> \t \n</body>"
334-
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s = QVariant(\" %|%\").toString(); responsebody += (___s.isEmpty()) ? QVariant(\"%|%\").toString() : ___s; }\n responsebody += QStringLiteral(\"</body>\");\n";
334+
<< " responsebody += QStringLiteral(\"<body>\");\n { QString ___s(fromValue(\" %|%\")); if (___s.isEmpty()) { echo(\"%|%\"); } else { echo(\" %|%\"); }}\n responsebody += QStringLiteral(\"</body>\");\n";
335335

336336
QTest::newRow("25") << "<body><script>function() { return '\\n'; }</script></body>"
337337
<< " responsebody += QStringLiteral(\"<body><script>function() { return '\\\\n'; }</script></body>\");\n";

0 commit comments

Comments
 (0)