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/plugins/generic | |
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/plugins/generic')
-rw-r--r-- | src/plugins/generic/tuiotouch/qoscbundle_p.h | 14 | ||||
-rw-r--r-- | src/plugins/generic/tuiotouch/qoscmessage_p.h | 5 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/generic/tuiotouch/qoscbundle_p.h b/src/plugins/generic/tuiotouch/qoscbundle_p.h index cb3ec4d251..5aee310017 100644 --- a/src/plugins/generic/tuiotouch/qoscbundle_p.h +++ b/src/plugins/generic/tuiotouch/qoscbundle_p.h @@ -43,7 +43,7 @@ #include "qoscmessage_p.h" -#include <QtCore/QVector> +#include <QtCore/QList> QT_BEGIN_NAMESPACE @@ -51,22 +51,22 @@ class QByteArray; class QOscBundle { - QOscBundle(); // for QVector, don't use - friend class QVector<QOscBundle>; + QOscBundle(); // for QList, don't use + friend class QList<QOscBundle>; public: explicit QOscBundle(const QByteArray &data); bool isValid() const { return m_isValid; } - QVector<QOscBundle> bundles() const { return m_bundles; } - QVector<QOscMessage> messages() const { return m_messages; } + QList<QOscBundle> bundles() const { return m_bundles; } + QList<QOscMessage> messages() const { return m_messages; } private: bool m_isValid; bool m_immediate; quint32 m_timeEpoch; quint32 m_timePico; - QVector<QOscBundle> m_bundles; - QVector<QOscMessage> m_messages; + QList<QOscBundle> m_bundles; + QList<QOscMessage> m_messages; }; Q_DECLARE_TYPEINFO(QOscBundle, Q_MOVABLE_TYPE); diff --git a/src/plugins/generic/tuiotouch/qoscmessage_p.h b/src/plugins/generic/tuiotouch/qoscmessage_p.h index 76d40ceb18..46c6ca3918 100644 --- a/src/plugins/generic/tuiotouch/qoscmessage_p.h +++ b/src/plugins/generic/tuiotouch/qoscmessage_p.h @@ -43,7 +43,6 @@ #include <QtCore/QByteArray> #include <QtCore/QVariant> -#include <QtCore/QVector> #include <QtCore/QList> @@ -51,8 +50,8 @@ QT_BEGIN_NAMESPACE class QOscMessage { - QOscMessage(); // for QVector, don't use - friend class QVector<QOscMessage>; + QOscMessage(); // for QList, don't use + friend class QList<QOscMessage>; public: explicit QOscMessage(const QByteArray &data); |