diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 11:44:14 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-29 19:19:47 +0200 |
| commit | 9fa3cf15c8500fba5bbb861f1925160815ae2afd (patch) | |
| tree | f779e08446bf302803b27130cf4c92fe46ba68b6 /src/gui/text/qrawfont.h | |
| parent | c70c4e42665eb34e677fc51a49552c9af3f58d7a (diff) | |
Use QList instead of QVector in gui
Applied to headers only. Source file to be changed separately.
Task-number: QTBUG-84469
Change-Id: Ic08a899321eaffc46b8461aaee3dbaa4d2c727a9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/text/qrawfont.h')
| -rw-r--r-- | src/gui/text/qrawfont.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h index 823c92b050..e7e12df040 100644 --- a/src/gui/text/qrawfont.h +++ b/src/gui/text/qrawfont.h @@ -97,9 +97,10 @@ public: QFont::Style style() const; int weight() const; - QVector<quint32> glyphIndexesForString(const QString &text) const; - inline QVector<QPointF> advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes) const; - inline QVector<QPointF> advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes, LayoutFlags layoutFlags) const; + QList<quint32> glyphIndexesForString(const QString &text) const; + inline QList<QPointF> advancesForGlyphIndexes(const QList<quint32> &glyphIndexes) const; + inline QList<QPointF> advancesForGlyphIndexes(const QList<quint32> &glyphIndexes, + LayoutFlags layoutFlags) const; bool glyphIndexesForChars(const QChar *chars, int numChars, quint32 *glyphIndexes, int *numGlyphs) const; bool advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs) const; bool advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs, LayoutFlags layoutFlags) const; @@ -158,15 +159,16 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QRawFont::LayoutFlags) Q_GUI_EXPORT size_t qHash(const QRawFont &font, size_t seed = 0) noexcept; -inline QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes, QRawFont::LayoutFlags layoutFlags) const +inline QList<QPointF> QRawFont::advancesForGlyphIndexes(const QList<quint32> &glyphIndexes, + QRawFont::LayoutFlags layoutFlags) const { - QVector<QPointF> advances(glyphIndexes.size()); + QList<QPointF> advances(glyphIndexes.size()); if (advancesForGlyphIndexes(glyphIndexes.constData(), advances.data(), glyphIndexes.size(), layoutFlags)) return advances; - return QVector<QPointF>(); + return QList<QPointF>(); } -inline QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes) const +inline QList<QPointF> QRawFont::advancesForGlyphIndexes(const QList<quint32> &glyphIndexes) const { return advancesForGlyphIndexes(glyphIndexes, QRawFont::SeparateAdvances); } |