From 6fb0110f972b8d9de22c7c06246b68bd7b6ebe50 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Mon, 16 Apr 2012 13:16:11 -0700 Subject: Using QLatin1String instead of QLatin1Literal QLatin1Literal is just a typedef of QLatin1String. Change-Id: If20ca225e57a7fb45a7775f0fc81aedb6da88c96 Reviewed-by: Thiago Macieira Reviewed-by: Olivier Goffart --- .../corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp | 5 ----- tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp index 862789cc73..6e4636bae6 100644 --- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp +++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp @@ -68,7 +68,6 @@ void runScenario() { // this code is latin1. TODO: replace it with the utf8 block below, once // strings default to utf8. - QLatin1Literal l1literal(LITERAL); QLatin1String l1string(LITERAL); QString string(l1string); QStringRef stringref(&string, 2, 10); @@ -78,14 +77,10 @@ void runScenario() QString r3 = QString::fromUtf8(UTF8_LITERAL UTF8_LITERAL); QString r; - r = l1literal Q l1literal; - QCOMPARE(r, r2); r = string P string; QCOMPARE(r, r2); r = stringref Q stringref; QCOMPARE(r, QString(stringref.toString() + stringref.toString())); - r = string Q l1literal; - QCOMPARE(r, r2); r = string P l1string; QCOMPARE(r, r2); r = string Q QStringLiteral(LITERAL); diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 2715bfc5dc..1f531f387c 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -1153,7 +1153,7 @@ void tst_QLocalSocket::verifyListenWithDescriptor_data() QTest::addColumn("abstract"); QTest::addColumn("bound"); - QTest::newRow("normal") << QDir::tempPath() + QLatin1Literal("/testsocket") << false << true; + QTest::newRow("normal") << QDir::tempPath() + QLatin1String("/testsocket") << false << true; #ifdef Q_OS_LINUX QTest::newRow("absrtact") << QString::fromLatin1("abstractsocketname") << true << true; QTest::newRow("abstractwithslash") << QString::fromLatin1("abstractsocketwitha/inthename") << true << true; -- cgit v1.2.3