1 files changed, 13 insertions, 33 deletions

diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index f80d6e6d93..4b1e315e7f 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -43,9 +43,6 @@
 class tst_QChar : public QObject
 {
     Q_OBJECT
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void operators_data();
     void operators();
@@ -80,27 +77,8 @@ private slots:
     void normalization_manual();
     void normalizationCorrections();
     void unicodeVersion();
-#if defined(Q_OS_WINCE)
-private:
-    QCoreApplication* app;
-#endif
 };
 
-void tst_QChar::init()
-{
-#if defined(Q_OS_WINCE)
-    int argc = 0;
-    app = new QCoreApplication(argc, NULL);
-#endif
-}
-
-void tst_QChar::cleanup()
-{
-#if defined(Q_OS_WINCE)
-    delete app;
-#endif
-}
-
 void tst_QChar::operators_data()
 {
     QTest::addColumn<QChar>("lhs");
@@ -239,8 +217,8 @@ void tst_QChar::isDigit_data()
 
     for (ushort ucs = 0; ucs < 256; ++ucs) {
         bool isDigit = (ucs <= '9' && ucs >= '0');
-        QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
-        QTest::newRow(tag.toLatin1()) << ucs << isDigit;
+        const QByteArray tag = "0x" + QByteArray::number(ucs, 16);
+        QTest::newRow(tag.constData()) << ucs << isDigit;
     }
 }
 
@@ -266,8 +244,8 @@ void tst_QChar::isLetter_data()
     QTest::addColumn<bool>("expected");
 
     for (ushort ucs = 0; ucs < 256; ++ucs) {
-        QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
-        QTest::newRow(tag.toLatin1()) << ucs << isExpectedLetter(ucs);
+        const QByteArray tag = "0x" + QByteArray::number(ucs, 16);
+        QTest::newRow(tag.constData()) << ucs << isExpectedLetter(ucs);
     }
 }
 
@@ -288,8 +266,8 @@ void tst_QChar::isLetterOrNumber_data()
                 || (ucs >= '0' && ucs <= '9')
                 || ucs == 0xB2 || ucs == 0xB3 || ucs == 0xB9
                 || (ucs >= 0xBC && ucs <= 0xBE);
-        QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
-        QTest::newRow(tag.toLatin1()) << ucs << isLetterOrNumber;
+        const QByteArray tag = "0x" + QByteArray::number(ucs, 16);
+        QTest::newRow(tag.constData()) << ucs << isLetterOrNumber;
     }
 }
 
@@ -403,8 +381,8 @@ void tst_QChar::isSpace_data()
 
     for (ushort ucs = 0; ucs < 256; ++ucs) {
         bool isSpace = (ucs <= 0x0D && ucs >= 0x09) || ucs == 0x20 || ucs == 0xA0 || ucs == 0x85;
-        QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
-        QTest::newRow(tag.toLatin1()) << ucs << isSpace;
+        const QByteArray tag = "0x" + QByteArray::number(ucs, 16);
+        QTest::newRow(tag.constData()) << ucs << isSpace;
     }
 }
 
@@ -756,7 +734,7 @@ void tst_QChar::normalization_data()
         if (comment >= 0)
             line = line.left(comment);
 
-        if (line.startsWith("@")) {
+        if (line.startsWith('@')) {
             if (line.startsWith("@Part") && line.size() > 5 && QChar(line.at(5)).isDigit())
                 part = QChar(line.at(5)).digitValue();
             continue;
@@ -793,8 +771,10 @@ void tst_QChar::normalization_data()
             }
         }
 
-        QString nm = QString("line #%1 (part %2").arg(linenum).arg(part);
-        QTest::newRow(nm.toLatin1()) << columns << part;
+
+        const QByteArray nm = "line #" + QByteArray::number(linenum) + " (part "
+            + QByteArray::number(part);
+        QTest::newRow(nm.constData()) << columns << part;
     }
 }