diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-23 10:04:16 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 10:13:12 +0200 |
commit | d1612610e650ffd7f2fbdef535c431647f57f0ac (patch) | |
tree | 6545a46b6aa7e5f89d7b2abcb959a78fa4c114ed /tests/auto/gui/text/qtextscriptengine | |
parent | 8cd3ec4ee43365425be584a48ff2871bd0090ef8 (diff) |
Use QList instead of QVector in gui tests
Task-number: QTBUG-84469
Change-Id: Ia86f39597de418dde6cd9ae3170ef919bd27416a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/gui/text/qtextscriptengine')
-rw-r--r-- | tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index cea1dc6dd3..9a55b16af9 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -117,7 +117,7 @@ static void prepareShapingTest(const QFont &font, const ShapeTable *shape_table) string.append(QChar(*u)); testName.append(" 0x" + QByteArray::number(*u, 16)); } - QVector<ushort> glyphs; + QList<ushort> glyphs; for (const ushort *g = s->glyphs; *g; ++g) glyphs.append(*g); @@ -129,7 +129,7 @@ static void doShapingTests() { QFETCH(QFont, font); QFETCH(QString, string); - QFETCH(QVector<ushort>, glyphs); + QFETCH(QList<ushort>, glyphs); QVERIFY(!string.isEmpty()); @@ -176,7 +176,7 @@ void tst_QTextScriptEngine::devanagari_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -283,7 +283,7 @@ void tst_QTextScriptEngine::bengali_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -521,7 +521,7 @@ void tst_QTextScriptEngine::gurmukhi_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -549,7 +549,7 @@ void tst_QTextScriptEngine::oriya_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -590,7 +590,7 @@ void tst_QTextScriptEngine::tamil_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -667,7 +667,7 @@ void tst_QTextScriptEngine::telugu_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -716,7 +716,7 @@ void tst_QTextScriptEngine::kannada_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -787,7 +787,7 @@ void tst_QTextScriptEngine::malayalam_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -868,7 +868,7 @@ void tst_QTextScriptEngine::sinhala_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -906,7 +906,7 @@ void tst_QTextScriptEngine::khmer_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -950,7 +950,7 @@ void tst_QTextScriptEngine::linearB_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -978,7 +978,7 @@ void tst_QTextScriptEngine::greek_data() { QTest::addColumn<QFont>("font"); QTest::addColumn<QString>("string"); - QTest::addColumn<QVector<ushort> >("glyphs"); + QTest::addColumn<QList<ushort>>("glyphs"); if (!haveTestFonts) QSKIP("Test fonts are not available"); @@ -990,7 +990,7 @@ void tst_QTextScriptEngine::greek_data() QString string; string.append(QChar(uc)); QByteArray testName = f.family().toLatin1() + ": 0x" + QByteArray::number(uc, 16); - QTest::newRow(testName.constData()) << f << string << QVector<ushort>(); + QTest::newRow(testName.constData()) << f << string << QList<ushort>(); } } else QSKIP("couldn't find DejaVu Sans"); @@ -1003,7 +1003,7 @@ void tst_QTextScriptEngine::greek_data() QString string; string.append(QChar(uc)); QByteArray testName = f.family().toLatin1() + ": 0x" + QByteArray::number(uc, 16); - QTest::newRow(testName.constData()) << f << string << QVector<ushort>(); + QTest::newRow(testName.constData()) << f << string << QList<ushort>(); } const ShapeTable shape_table [] = { |