From 3ea4e7b90d9019bd334583493717cd371673f6f2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 2 May 2012 16:32:26 +0200 Subject: Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtTest] This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I6f3fa6a06ed037f3a98387958ba7ab18c3e04977 Reviewed-by: Rohan McGovern --- src/testlib/qplaintestlogger.cpp | 4 ++-- src/testlib/qtestmouse.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/testlib') diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 2f87e08c3c..8fd9e8b215 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -191,7 +191,7 @@ namespace QTest { int formatResult(char * buffer, int bufferSize, T number, int significantDigits) { QString result = formatResult(number, significantDigits); - qstrncpy(buffer, result.toAscii().constData(), bufferSize); + qstrncpy(buffer, result.toLatin1().constData(), bufferSize); int size = result.count(); return size; } @@ -260,7 +260,7 @@ void QPlainTestLogger::printBenchmarkResult(const QBenchmarkResult &result) buf1, sizeof(buf1), "%s: %s::%s", bmtag, QTestResult::currentTestObjectName(), - result.context.slotName.toAscii().data()); + result.context.slotName.toLatin1().data()); char bufTag[1024]; bufTag[0] = 0; diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index 47a74d7389..3dd39f96bd 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -205,7 +205,7 @@ namespace QTest static const char *mouseActionNames[] = { "MousePress", "MouseRelease", "MouseClick", "MouseDClick", "MouseMove" }; QString warning = QString::fromLatin1("Mouse event \"%1\" not accepted by receiving widget"); - QTest::qWarn(warning.arg(QString::fromLatin1(mouseActionNames[static_cast(action)])).toAscii().data()); + QTest::qWarn(warning.arg(QString::fromLatin1(mouseActionNames[static_cast(action)])).toLatin1().data()); } } -- cgit v1.2.3