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/qrawfont/tst_qrawfont.cpp | |
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/qrawfont/tst_qrawfont.cpp')
-rw-r--r-- | tests/auto/gui/text/qrawfont/tst_qrawfont.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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<quint32> glyphIndices = font.glyphIndexesForString(QLatin1String("Foobar")); - QVector<quint32> expectedGlyphIndices; + QList<quint32> glyphIndices = font.glyphIndexesForString(QLatin1String("Foobar")); + QList<quint32> 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<quint32> glyphIndices; + QList<quint32> glyphIndices; glyphIndices << 44 << 83 << 83 << 70 << 69 << 86; // "Foobar" bool supportsSubPixelPositions = font_d->fontEngine->supportsSubPixelPositions(); - QVector<QPointF> advances = font.advancesForGlyphIndexes(glyphIndices); + QList<QPointF> 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<quint32>()); + advances = font.advancesForGlyphIndexes(QList<quint32>()); 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<quint32> expectedGlyphIndices; + QList<quint32> 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<quint32> glyphIndexes = font.glyphIndexesForString(QStringLiteral("__")); + QList<quint32> glyphIndexes = font.glyphIndexesForString(QStringLiteral("__")); QCOMPARE(glyphIndexes.size(), 2); - QVector<QPointF> advances = font.advancesForGlyphIndexes(glyphIndexes, QRawFont::KernedAdvances); + QList<QPointF> advances = font.advancesForGlyphIndexes(glyphIndexes, QRawFont::KernedAdvances); QCOMPARE(advances.size(), 2); qreal expectedAdvanceWidth = pixelSize * underScoreAW / emSquareSize; |