diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 11:55:39 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 20:35:05 +0200 |
| commit | 471e4fcb226c4523efe93b1bdaf0db026495da94 (patch) | |
| tree | bb963937b2446eb32d7632568433083a386f2c68 /src/gui/text/qstatictext.cpp | |
| parent | 7f400522c39f6a1abf083dc1af49ea3109635cc8 (diff) | |
Use QList instead of QVector in gui implementation
Task-number: QTBUG-84469
Change-Id: I366e845249203d80d640355a7780ac2f91a762f1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/text/qstatictext.cpp')
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index e588b44efd..a21eb95968 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -498,25 +498,25 @@ namespace { return User; } - QVector<QStaticTextItem> items() const + QList<QStaticTextItem> items() const { return m_items; } - QVector<QFixedPoint> positions() const + QList<QFixedPoint> positions() const { return m_positions; } - QVector<glyph_t> glyphs() const + QList<glyph_t> glyphs() const { return m_glyphs; } private: - QVector<QStaticTextItem> m_items; - QVector<QFixedPoint> m_positions; - QVector<glyph_t> m_glyphs; + QList<QStaticTextItem> m_items; + QList<QFixedPoint> m_positions; + QList<glyph_t> m_glyphs; bool m_dirtyPen; bool m_useBackendOptimizations; @@ -580,17 +580,17 @@ namespace { return m_paintEngine; } - QVector<glyph_t> glyphs() const + QList<glyph_t> glyphs() const { return m_paintEngine->glyphs(); } - QVector<QFixedPoint> positions() const + QList<QFixedPoint> positions() const { return m_paintEngine->positions(); } - QVector<QStaticTextItem> items() const + QList<QStaticTextItem> items() const { return m_paintEngine->items(); } @@ -684,9 +684,9 @@ void QStaticTextPrivate::init() paintText(QPointF(0, 0), &painter, QColor(0, 0, 0, 0)); } - QVector<QStaticTextItem> deviceItems = device.items(); - QVector<QFixedPoint> positions = device.positions(); - QVector<glyph_t> glyphs = device.glyphs(); + QList<QStaticTextItem> deviceItems = device.items(); + QList<QFixedPoint> positions = device.positions(); + QList<glyph_t> glyphs = device.glyphs(); itemCount = deviceItems.size(); items = new QStaticTextItem[itemCount]; |