diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-27 09:58:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-20 20:01:33 +0200 |
| commit | 03326a2fec416405b437089874f6439e937bbada (patch) | |
| tree | 48d7137c3cd5e6f537e06e97380d3c1e76a56af9 /src/gui/text/qtextengine_p.h | |
| parent | 1a9a4af388477efd9f7008d5c0bb74432c20279d (diff) | |
Move implementation of QVector/List back to qlist.h
And name the main class QList. That's also the one we document.
This gives less porting pain for our users, and a lot less churn
in our API, as we use QList in Qt 5 in 95% of our API.
In addition, it gives more consistent naming with QStringList and
QByteArrayList and disambiguates QList vs QVector(2|3|4)D.
Fixes: QTBUG-84468
Change-Id: I3cba9d1d3179969d8bf9320b31be2230d021d1a9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
| -rw-r--r-- | src/gui/text/qtextengine_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index dab69a8b89..4d8112c679 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -347,12 +347,12 @@ struct QScriptItem int glyph_data_offset; Q_DECL_CONSTEXPR QFixed height() const noexcept { return ascent + descent; } private: - friend class QVector<QScriptItem>; - QScriptItem() {} // for QVector, don't use + friend class QList<QScriptItem>; + QScriptItem() {} // for QList, don't use }; Q_DECLARE_TYPEINFO(QScriptItem, Q_PRIMITIVE_TYPE); -typedef QVector<QScriptItem> QScriptItemArray; +typedef QList<QScriptItem> QScriptItemArray; struct Q_AUTOTEST_EXPORT QScriptLine { |