From d1612610e650ffd7f2fbdef535c431647f57f0ac Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 23 Jun 2020 10:04:16 +0200 Subject: Use QList instead of QVector in gui tests Task-number: QTBUG-84469 Change-Id: Ia86f39597de418dde6cd9ae3170ef919bd27416a Reviewed-by: Lars Knoll --- tests/auto/gui/text/qrawfont/tst_qrawfont.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/auto/gui/text/qrawfont/tst_qrawfont.cpp') diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp index a32fb1d25b..a443688d7e 100644 --- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp +++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp @@ -285,8 +285,8 @@ void tst_QRawFont::glyphIndices() QRawFont font(testFont, 10); QVERIFY(font.isValid()); - QVector glyphIndices = font.glyphIndexesForString(QLatin1String("Foobar")); - QVector expectedGlyphIndices; + QList glyphIndices = font.glyphIndexesForString(QLatin1String("Foobar")); + QList expectedGlyphIndices; expectedGlyphIndices << 44 << 83 << 83 << 70 << 69 << 86; QCOMPARE(glyphIndices, expectedGlyphIndices); @@ -330,11 +330,11 @@ void tst_QRawFont::advances() QRawFontPrivate *font_d = QRawFontPrivate::get(font); QVERIFY(font_d->fontEngine != 0); - QVector glyphIndices; + QList glyphIndices; glyphIndices << 44 << 83 << 83 << 70 << 69 << 86; // "Foobar" bool supportsSubPixelPositions = font_d->fontEngine->supportsSubPixelPositions(); - QVector advances = font.advancesForGlyphIndexes(glyphIndices); + QList advances = font.advancesForGlyphIndexes(glyphIndices); bool mayDiffer = font_d->fontEngine->type() == QFontEngine::Freetype && (hintingPreference == QFont::PreferFullHinting @@ -358,7 +358,7 @@ void tst_QRawFont::advances() QVERIFY(qFuzzyIsNull(advances.at(i).y())); } - advances = font.advancesForGlyphIndexes(QVector()); + advances = font.advancesForGlyphIndexes(QList()); QVERIFY(advances.isEmpty()); int numGlyphs = glyphIndices.size(); @@ -415,7 +415,7 @@ void tst_QRawFont::textLayout() QCOMPARE(rawFont.familyName(), familyName); QCOMPARE(rawFont.pixelSize(), 18.0); - QVector expectedGlyphIndices; + QList expectedGlyphIndices; expectedGlyphIndices << 44 << 83 << 83 << 70 << 69 << 86; QCOMPARE(glyphs.glyphIndexes(), expectedGlyphIndices); @@ -996,10 +996,10 @@ void tst_QRawFont::kernedAdvances() QRawFont font(testFont, pixelSize); QVERIFY(font.isValid()); - QVector glyphIndexes = font.glyphIndexesForString(QStringLiteral("__")); + QList glyphIndexes = font.glyphIndexesForString(QStringLiteral("__")); QCOMPARE(glyphIndexes.size(), 2); - QVector advances = font.advancesForGlyphIndexes(glyphIndexes, QRawFont::KernedAdvances); + QList advances = font.advancesForGlyphIndexes(glyphIndexes, QRawFont::KernedAdvances); QCOMPARE(advances.size(), 2); qreal expectedAdvanceWidth = pixelSize * underScoreAW / emSquareSize; -- cgit v1.2.3