Move text-related code out of corelib/tools/ to corelib/text/

This includes byte array, string, char, unicode, locale, collation and
regular expressions.

Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 0 insertions, 369 deletions

diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp
deleted file mode 100644
index ac7f439248..0000000000
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-
-#define LITERAL "some literal"
-#define LITERAL_LEN (sizeof(LITERAL)-1)
-#define LITERAL_EXTRA "some literal" "EXTRA"
-
-// "some literal", but replacing all vowels by their umlauted UTF-8 string :)
-#define UTF8_LITERAL "s\xc3\xb6m\xc3\xab l\xc3\xaft\xc3\xabr\xc3\xa4l"
-#define UTF8_LITERAL_LEN (sizeof(UTF8_LITERAL)-1)
-#define UTF8_LITERAL_EXTRA "s\xc3\xb6m\xc3\xab l\xc3\xaft\xc3\xabr\xc3\xa4l" "EXTRA"
-
-#ifdef Q_COMPILER_UNICODE_STRINGS
-// "some literal", but replacing all vocals by their umlauted UTF-8 string :)
-#define UNICODE_LITERAL u"s\u00f6m\u00eb l\u00eft\u00ebr\u00e4l"
-#define UNICODE_LITERAL_LEN ((sizeof(UNICODE_LITERAL) - 1) / 2)
-#define UNICODE_LITERAL_EXTRA u"s\u00f6m\u00eb l\u00eft\u00ebr\u00e4l" "EXTRA"
-#endif
-
-#ifndef P
-# error You need to define P
-# define P +
-#endif
-
-//fix for gcc4.0: if the operator+ does not exist without QT_USE_FAST_OPERATOR_PLUS
-#ifndef QT_USE_FAST_CONCATENATION
-#define Q %
-#else
-#define Q P
-#endif
-
-template <typename T> QString toQString(const T &t);
-
-template <> QString toQString(const QString &s) { return s; }
-template <> QString toQString(const QStringRef &r) { return r.toString(); }
-template <> QString toQString(const QStringView &v) { return v.toString(); }
-template <> QString toQString(const QLatin1String &l) { return l; }
-template <> QString toQString(const QLatin1Char &l) { return QChar(l); }
-template <> QString toQString(const QChar &c) { return c; }
-template <> QString toQString(const QChar::SpecialCharacter &c) { return QChar(c); }
-#ifdef Q_COMPILER_UNICODE_STRINGS
-template <> QString toQString(char16_t * const &p) { return QStringView(p).toString(); }
-template <size_t N> QString toQString(const char16_t (&a)[N]) { return QStringView(a).toString(); }
-template <> QString toQString(const char16_t &c) { return QChar(c); }
-#endif
-
-template <typename T> QByteArray toQByteArray(const T &t);
-
-template <> QByteArray toQByteArray(const QByteArray &b) { return b; }
-template <> QByteArray toQByteArray(char * const &p) { return p; }
-template <size_t N> QByteArray toQByteArray(const char (&a)[N]) { return a; }
-template <> QByteArray toQByteArray(const char &c) { return QByteArray(&c, 1); }
-
-void runScenario()
-{
-    // this code is latin1. TODO: replace it with the utf8 block below, once
-    // strings default to utf8.
-    QLatin1String l1string(LITERAL);
-    QString string(l1string);
-    QStringRef stringref(&string, 2, 10);
-    QStringView stringview(stringref);
-    QLatin1Char lchar('c');
-    QChar qchar(lchar);
-    QChar::SpecialCharacter special(QChar::Nbsp);
-#ifdef Q_COMPILER_UNICODE_STRINGS
-    char16_t u16char = UNICODE_LITERAL[0];
-    char16_t u16chararray[] = { u's', 0xF6, u'm', 0xEB, u' ', u'l', 0xEF, u't', 0xEB, u'r', 0xE4, u'l', 0x00 };
-    QCOMPARE(QStringView(u16chararray), QStringView(UNICODE_LITERAL));
-    char16_t *u16charstar = u16chararray;
-#endif
-
-#define CHECK(QorP, a1, a2) \
-    do { \
-        DO(QorP, a1, a2); \
-        DO(QorP, a2, a1); \
-    } while (0)
-
-#define DO(QorP, a1, a2) \
-    QCOMPARE(QString(a1 QorP a2), \
-             toQString(a1).append(toQString(a2))) \
-    /* end */
-
-    CHECK(P, l1string, l1string);
-    CHECK(P, l1string, string);
-    CHECK(P, l1string, stringref);
-    CHECK(Q, l1string, stringview);
-    CHECK(P, l1string, lchar);
-    CHECK(P, l1string, qchar);
-    CHECK(P, l1string, special);
-    CHECK(P, l1string, QStringLiteral(LITERAL));
-    CHECK(Q, l1string, u16char);
-    CHECK(Q, l1string, u16chararray);
-    CHECK(Q, l1string, u16charstar);
-
-    CHECK(P, string, string);
-    CHECK(P, string, stringref);
-    CHECK(Q, string, stringview);
-    CHECK(P, string, lchar);
-    CHECK(P, string, qchar);
-    CHECK(P, string, special);
-    CHECK(P, string, QStringLiteral(LITERAL));
-    CHECK(Q, string, u16char);
-    CHECK(Q, string, u16chararray);
-    CHECK(Q, string, u16charstar);
-
-    CHECK(P, stringref, stringref);
-    CHECK(Q, stringref, stringview);
-    CHECK(P, stringref, lchar);
-    CHECK(P, stringref, qchar);
-    CHECK(P, stringref, special);
-    CHECK(P, stringref, QStringLiteral(LITERAL));
-    CHECK(Q, stringref, u16char);
-    CHECK(Q, stringref, u16chararray);
-    CHECK(Q, stringref, u16charstar);
-
-    CHECK(Q, stringview, stringview);
-    CHECK(Q, stringview, lchar);
-    CHECK(Q, stringview, qchar);
-    CHECK(Q, stringview, special);
-    CHECK(P, stringview, QStringLiteral(LITERAL));
-    CHECK(Q, stringview, u16char);
-    CHECK(Q, stringview, u16chararray);
-    CHECK(Q, stringview, u16charstar);
-
-    CHECK(P, lchar, lchar);
-    CHECK(P, lchar, qchar);
-    CHECK(P, lchar, special);
-    CHECK(P, lchar, QStringLiteral(LITERAL));
-    CHECK(Q, lchar, u16char);
-    CHECK(Q, lchar, u16chararray);
-    CHECK(Q, lchar, u16charstar);
-
-    CHECK(P, qchar, qchar);
-    CHECK(P, qchar, special);
-    CHECK(P, qchar, QStringLiteral(LITERAL));
-    CHECK(Q, qchar, u16char);
-    CHECK(Q, qchar, u16chararray);
-    CHECK(Q, qchar, u16charstar);
-
-    CHECK(P, special, special);
-    CHECK(P, special, QStringLiteral(LITERAL));
-    CHECK(Q, special, u16char);
-    CHECK(Q, special, u16chararray);
-    CHECK(Q, special, u16charstar);
-
-    CHECK(P, QStringLiteral(LITERAL), QStringLiteral(LITERAL));
-    CHECK(Q, QStringLiteral(LITERAL), u16char);
-    CHECK(Q, QStringLiteral(LITERAL), u16chararray);
-    CHECK(Q, QStringLiteral(LITERAL), u16charstar);
-
-    // CHECK(Q, u16char, u16char);             // BUILTIN <-> BUILTIN cat't be overloaded
-    // CHECK(Q, u16char, u16chararray);
-    // CHECK(Q, u16char, u16charstar);
-
-    // CHECK(Q, u16chararray, u16chararray);   // BUILTIN <-> BUILTIN cat't be overloaded
-    // CHECK(Q, u16chararray, u16charstar);
-
-    // CHECK(Q, u16charstar, u16charstar);     // BUILTIN <-> BUILTIN cat't be overloaded
-
-#undef DO
-
-#define DO(QorP, a1, a2) \
-    QCOMPARE(QByteArray(a1 QorP a2), \
-             toQByteArray(a1).append(toQByteArray(a2))) \
-    /* end */
-
-    QByteArray bytearray = stringref.toUtf8();
-    char *charstar = bytearray.data();
-    char chararray[3] = { 'H', 'i', '\0' };
-    const char constchararray[3] = { 'H', 'i', '\0' };
-    char achar = 'a';
-
-    CHECK(P, bytearray, bytearray);
-    CHECK(P, bytearray, charstar);
-#ifndef Q_CC_MSVC // see QTBUG-65359
-    CHECK(P, bytearray, chararray);
-#else
-    Q_UNUSED(chararray);
-#endif
-    CHECK(P, bytearray, constchararray);
-    CHECK(P, bytearray, achar);
-
-    //CHECK(Q, charstar, charstar);     // BUILTIN <-> BUILTIN cat't be overloaded
-    //CHECK(Q, charstar, chararray);
-    //CHECK(Q, charstar, achar);
-
-    //CHECK(Q, chararray, chararray);   // BUILTIN <-> BUILTIN cat't be overloaded
-    //CHECK(Q, chararray, achar);
-
-    //CHECK(Q, achar, achar);           // BUILTIN <-> BUILTIN cat't be overloaded
-
-#undef DO
-#undef CHECK
-
-    QString r2(QLatin1String(LITERAL LITERAL));
-    QString r3 = QString::fromUtf8(UTF8_LITERAL UTF8_LITERAL);
-    QString r;
-
-    // self-assignment:
-    r = stringref.toString();
-    r = lchar + r;
-    QCOMPARE(r, QString(lchar P stringref));
-
-#ifdef Q_COMPILER_UNICODE_STRINGS
-    r = QStringLiteral(UNICODE_LITERAL);
-    r = r Q QStringLiteral(UNICODE_LITERAL);
-    QCOMPARE(r, r3);
-#endif
-
-#ifndef QT_NO_CAST_FROM_ASCII
-    r = string P LITERAL;
-    QCOMPARE(r, r2);
-    r = LITERAL P string;
-    QCOMPARE(r, r2);
-
-    QByteArray ba = QByteArray(LITERAL);
-    r = ba P string;
-    QCOMPARE(r, r2);
-    r = string P ba;
-    QCOMPARE(r, r2);
-
-    r = string P QByteArrayLiteral(LITERAL);
-    QCOMPARE(r, r2);
-    r = QByteArrayLiteral(LITERAL) P string;
-    QCOMPARE(r, r2);
-
-    static const char badata[] = LITERAL_EXTRA;
-    ba = QByteArray::fromRawData(badata, LITERAL_LEN);
-    r = ba P string;
-    QCOMPARE(r, r2);
-    r = string P ba;
-    QCOMPARE(r, r2);
-
-    string = QString::fromUtf8(UTF8_LITERAL);
-    ba = UTF8_LITERAL;
-
-    r = string P UTF8_LITERAL;
-    QCOMPARE(r.size(), r3.size());
-    QCOMPARE(r, r3);
-    r = UTF8_LITERAL P string;
-    QCOMPARE(r, r3);
-    r = ba P string;
-    QCOMPARE(r, r3);
-    r = string P ba;
-    QCOMPARE(r, r3);
-
-    ba = QByteArray::fromRawData(UTF8_LITERAL_EXTRA, UTF8_LITERAL_LEN);
-    r = ba P string;
-    QCOMPARE(r, r3);
-    r = string P ba;
-    QCOMPARE(r, r3);
-
-    ba = QByteArray(); // empty
-    r = ba P string;
-    QCOMPARE(r, string);
-    r = string P ba;
-    QCOMPARE(r, string);
-
-    const char *zero = 0;
-    r = string P zero;
-    QCOMPARE(r, string);
-    r = zero P string;
-    QCOMPARE(r, string);
-#endif
-
-    string = QString::fromLatin1(LITERAL);
-    QCOMPARE(QByteArray(qPrintable(string P string)), QByteArray(string.toLatin1() + string.toLatin1()));
-
-
-
-    //QByteArray
-    {
-        QByteArray ba = LITERAL;
-        QByteArray superba = ba P ba P LITERAL;
-        QCOMPARE(superba, QByteArray(LITERAL LITERAL LITERAL));
-
-        ba = QByteArrayLiteral(LITERAL);
-        QCOMPARE(ba, QByteArray(LITERAL));
-        superba = ba P QByteArrayLiteral(LITERAL) P LITERAL;
-        QCOMPARE(superba, QByteArray(LITERAL LITERAL LITERAL));
-
-        QByteArray testWith0 = ba P "test\0with\0zero" P ba;
-        QCOMPARE(testWith0, QByteArray(LITERAL "test" LITERAL));
-
-        QByteArray ba2 = ba P '\0' + LITERAL;
-        QCOMPARE(ba2, QByteArray(LITERAL "\0" LITERAL, ba.size()*2+1));
-
-        const char *mmh = "test\0foo";
-        QCOMPARE(QByteArray(ba P mmh P ba), testWith0);
-
-        QByteArray raw = QByteArray::fromRawData(UTF8_LITERAL_EXTRA, UTF8_LITERAL_LEN);
-        QByteArray r = "hello" P raw;
-        QByteArray r2 = "hello" UTF8_LITERAL;
-        QCOMPARE(r, r2);
-        r2 = QByteArray("hello\0") P UTF8_LITERAL;
-        QCOMPARE(r, r2);
-
-        const char *zero = 0;
-        r = ba P zero;
-        QCOMPARE(r, ba);
-        r = zero P ba;
-        QCOMPARE(r, ba);
-    }
-
-    //operator QString  +=
-    {
-        QString str = QString::fromUtf8(UTF8_LITERAL);
-        str +=  QLatin1String(LITERAL) P str;
-        QCOMPARE(str, QString::fromUtf8(UTF8_LITERAL LITERAL UTF8_LITERAL));
-#ifndef QT_NO_CAST_FROM_ASCII
-        str = (QString::fromUtf8(UTF8_LITERAL) += QLatin1String(LITERAL) P UTF8_LITERAL);
-        QCOMPARE(str, QString::fromUtf8(UTF8_LITERAL LITERAL UTF8_LITERAL));
-#endif
-
-        QString str2 = QString::fromUtf8(UTF8_LITERAL);
-        QString str2_e = QString::fromUtf8(UTF8_LITERAL);
-        const char * nullData = 0;
-        str2 += QLatin1String(nullData) P str2;
-        str2_e += QLatin1String("") P str2_e;
-        QCOMPARE(str2, str2_e);
-    }
-
-    //operator QByteArray  +=
-    {
-        QByteArray ba = UTF8_LITERAL;
-        ba +=  QByteArray(LITERAL) P UTF8_LITERAL;
-        QCOMPARE(ba, QByteArray(UTF8_LITERAL LITERAL UTF8_LITERAL));
-        ba += LITERAL P QByteArray::fromRawData(UTF8_LITERAL_EXTRA, UTF8_LITERAL_LEN);
-        QCOMPARE(ba, QByteArray(UTF8_LITERAL LITERAL UTF8_LITERAL LITERAL UTF8_LITERAL));
-        QByteArray withZero = QByteArray(LITERAL "\0" LITERAL, LITERAL_LEN*2+1);
-        QByteArray ba2 = withZero;
-        ba2 += ba2 P withZero;
-        QCOMPARE(ba2, QByteArray(withZero + withZero + withZero));
-#ifndef QT_NO_CAST_TO_ASCII
-        ba = UTF8_LITERAL;
-        ba2 = (ba += QLatin1String(LITERAL) + QString::fromUtf8(UTF8_LITERAL));
-        QCOMPARE(ba2, ba);
-        QCOMPARE(ba, QByteArray(UTF8_LITERAL LITERAL UTF8_LITERAL));
-#endif
-    }
-
-}