diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 12:12:52 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 07:54:07 +0200 |
commit | dd71c43b9718be3523ed6b307a3402f88de070e1 (patch) | |
tree | 16d98b58843a729ad9153142121a5371ff305af5 | |
parent | 10669911b7beac620989d69653334fb6ee477744 (diff) |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: I4c3353c00a566023503fbc178ba8454391dc334c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | examples/qml/referenceexamples/properties/birthdayparty.h | 4 | ||||
-rw-r--r-- | examples/quick/quickwidgets/qquickviewcomparison/logo.h | 4 | ||||
-rw-r--r-- | examples/quick/scenegraph/shared/logorenderer.h | 6 | ||||
-rw-r--r-- | src/imports/wavefrontmesh/qwavefrontmesh.cpp | 2 | ||||
-rw-r--r-- | src/imports/wavefrontmesh/qwavefrontmesh.h | 2 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h | 1 | ||||
-rw-r--r-- | src/qml/qml/qqml.h | 30 | ||||
-rw-r--r-- | src/qml/qml/qqmlcontext.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlcontext.h | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitem.h | 2 | ||||
-rw-r--r-- | src/quick/items/qquickmultipointtoucharea.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickpincharea.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickshadereffectmesh.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 2 | ||||
-rw-r--r-- | tests/auto/quick/touchmouse/tst_touchmouse.cpp | 2 |
17 files changed, 34 insertions, 37 deletions
diff --git a/examples/qml/referenceexamples/properties/birthdayparty.h b/examples/qml/referenceexamples/properties/birthdayparty.h index a5704972cc..9da5158de2 100644 --- a/examples/qml/referenceexamples/properties/birthdayparty.h +++ b/examples/qml/referenceexamples/properties/birthdayparty.h @@ -51,7 +51,7 @@ #define BIRTHDAYPARTY_H #include <QObject> -#include <QVector> +#include <QList> #include <QQmlListProperty> #include "person.h" @@ -91,7 +91,7 @@ private: static void removeLastGuest(QQmlListProperty<Person>*); Person *m_host; - QVector<Person *> m_guests; + QList<Person *> m_guests; }; // ![3] diff --git a/examples/quick/quickwidgets/qquickviewcomparison/logo.h b/examples/quick/quickwidgets/qquickviewcomparison/logo.h index 6cb35a28c4..7e58bbb7b7 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/logo.h +++ b/examples/quick/quickwidgets/qquickviewcomparison/logo.h @@ -52,7 +52,7 @@ #define LOGO_H #include <qopengl.h> -#include <QVector> +#include <QList> #include <QVector3D> class Logo @@ -68,7 +68,7 @@ private: void extrude(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); void add(const QVector3D &v, const QVector3D &n); - QVector<GLfloat> m_data; + QList<GLfloat> m_data; int m_count; }; diff --git a/examples/quick/scenegraph/shared/logorenderer.h b/examples/quick/scenegraph/shared/logorenderer.h index 03821919a9..e39a2db57d 100644 --- a/examples/quick/scenegraph/shared/logorenderer.h +++ b/examples/quick/scenegraph/shared/logorenderer.h @@ -57,7 +57,7 @@ #include <qopenglfunctions.h> #include <QTime> -#include <QVector> +#include <QList> class LogoRenderer : protected QOpenGLFunctions { @@ -78,8 +78,8 @@ private: void quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4); void extrude(qreal x1, qreal y1, qreal x2, qreal y2); - QVector<QVector3D> vertices; - QVector<QVector3D> normals; + QList<QVector3D> vertices; + QList<QVector3D> normals; QOpenGLShaderProgram program1; int vertexAttr1; int normalAttr1; diff --git a/src/imports/wavefrontmesh/qwavefrontmesh.cpp b/src/imports/wavefrontmesh/qwavefrontmesh.cpp index 5d1affbdab..36cc4d4079 100644 --- a/src/imports/wavefrontmesh/qwavefrontmesh.cpp +++ b/src/imports/wavefrontmesh/qwavefrontmesh.cpp @@ -454,7 +454,7 @@ QString QWavefrontMesh::log() const }; } -bool QWavefrontMesh::validateAttributes(const QVector<QByteArray> &attributes, int *posIndex) +bool QWavefrontMesh::validateAttributes(const QList<QByteArray> &attributes, int *posIndex) { Q_D(QWavefrontMesh); const int attrCount = attributes.count(); diff --git a/src/imports/wavefrontmesh/qwavefrontmesh.h b/src/imports/wavefrontmesh/qwavefrontmesh.h index 67e0527e5d..adcf9d6052 100644 --- a/src/imports/wavefrontmesh/qwavefrontmesh.h +++ b/src/imports/wavefrontmesh/qwavefrontmesh.h @@ -83,7 +83,7 @@ public: Error lastError() const; void setLastError(Error lastError); - bool validateAttributes(const QVector<QByteArray> &attributes, int *posIndex) override; + bool validateAttributes(const QList<QByteArray> &attributes, int *posIndex) override; QSGGeometry *updateGeometry(QSGGeometry *geometry, int attrCount, int posIndex, const QRectF &srcRect, const QRectF &rect) override; QString log() const override; diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h index 00b9749472..725193186f 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h @@ -59,7 +59,6 @@ #include <QJsonDocument> #include <QJsonObject> #include <QJsonValue> -#include <QVector> #include <QPointer> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index ae72d90875..3c9c996a9c 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -90,7 +90,7 @@ enum class QmlIsSingleton {yes = true}; \ template<typename, typename> friend struct QML_PRIVATE_NAMESPACE::QmlSingleton; \ template<typename T, typename... Args> \ - friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor, QVector<int> *); + friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor, QList<int> *); #define QML_ADDED_IN_MINOR_VERSION(VERSION) \ Q_CLASSINFO("QML.AddedInVersion", Q_REVISION(VERSION)) @@ -115,21 +115,21 @@ using QmlExtendedType = EXTENDED_TYPE; \ template<class, class> friend struct QML_PRIVATE_NAMESPACE::QmlExtended; \ template<typename T, typename... Args> \ - friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor, QVector<int> *); + friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor, QList<int> *); #define QML_FOREIGN(FOREIGN_TYPE) \ Q_CLASSINFO("QML.Foreign", #FOREIGN_TYPE) \ using QmlForeignType = FOREIGN_TYPE; \ template<class, class> friend struct QML_PRIVATE_NAMESPACE::QmlResolved; \ template<typename T, typename... Args> \ - friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor, QVector<int> *); + friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor, QList<int> *); #define QML_INTERFACE \ Q_CLASSINFO("QML.Element", "anonymous") \ enum class QmlIsInterface {yes = true}; \ template<typename, typename> friend struct QML_PRIVATE_NAMESPACE::QmlInterface; \ template<typename T, typename... Args> \ - friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor, QVector<int> *); + friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor, QList<int> *); #define QML_UNAVAILABLE \ QML_FOREIGN(QQmlTypeNotAvailable) @@ -816,8 +816,7 @@ struct QmlTypeAndRevisionsRegistration; template<class T, class Resolved, class Extended> struct QmlTypeAndRevisionsRegistration<T, Resolved, Extended, false, false> { - static void registerTypeAndRevisions(const char *uri, int versionMajor, - QVector<int> *qmlTypeIds) + static void registerTypeAndRevisions(const char *uri, int versionMajor, QList<int> *qmlTypeIds) { QQmlPrivate::qmlRegisterTypeAndRevisions<Resolved, Extended>( uri, versionMajor, &T::staticMetaObject, qmlTypeIds); @@ -826,8 +825,7 @@ struct QmlTypeAndRevisionsRegistration<T, Resolved, Extended, false, false> { template<class T, class Resolved> struct QmlTypeAndRevisionsRegistration<T, Resolved, void, true, false> { - static void registerTypeAndRevisions(const char *uri, int versionMajor, - QVector<int> *qmlTypeIds) + static void registerTypeAndRevisions(const char *uri, int versionMajor, QList<int> *qmlTypeIds) { QQmlPrivate::qmlRegisterSingletonAndRevisions<Resolved>( uri, versionMajor, &T::staticMetaObject, qmlTypeIds); @@ -836,8 +834,7 @@ struct QmlTypeAndRevisionsRegistration<T, Resolved, void, true, false> { template<class T, class Resolved> struct QmlTypeAndRevisionsRegistration<T, Resolved, void, false, true> { - static void registerTypeAndRevisions(const char *uri, int versionMajor, - QVector<int> *qmlTypeIds) + static void registerTypeAndRevisions(const char *uri, int versionMajor, QList<int> *qmlTypeIds) { const int id = qmlRegisterInterface<Resolved>(uri, versionMajor); if (qmlTypeIds) @@ -847,10 +844,10 @@ struct QmlTypeAndRevisionsRegistration<T, Resolved, void, false, true> { template<typename T = void, typename... Args> void qmlRegisterTypesAndRevisions(const char *uri, int versionMajor, - QVector<int> *qmlTypeIds = nullptr); + QList<int> *qmlTypeIds = nullptr); template<typename T, typename... Args> -void qmlRegisterTypesAndRevisions(const char *uri, int versionMajor, QVector<int> *qmlTypeIds) +void qmlRegisterTypesAndRevisions(const char *uri, int versionMajor, QList<int> *qmlTypeIds) { QmlTypeAndRevisionsRegistration< T, typename QQmlPrivate::QmlResolved<T>::Type, @@ -862,11 +859,12 @@ void qmlRegisterTypesAndRevisions(const char *uri, int versionMajor, QVector<int } template<> -inline void qmlRegisterTypesAndRevisions<>(const char *, int, QVector<int> *) {} +inline void qmlRegisterTypesAndRevisions<>(const char *, int, QList<int> *) +{ +} -inline void qmlRegisterNamespaceAndRevisions(const QMetaObject *metaObject, - const char *uri, int versionMajor, - QVector<int> *qmlTypeIds = nullptr) +inline void qmlRegisterNamespaceAndRevisions(const QMetaObject *metaObject, const char *uri, + int versionMajor, QList<int> *qmlTypeIds = nullptr) { QQmlPrivate::RegisterTypeAndRevisions type = { 0, diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp index 493a4ee70d..65cf6b3686 100644 --- a/src/qml/qml/qqmlcontext.cpp +++ b/src/qml/qml/qqmlcontext.cpp @@ -326,7 +326,7 @@ void QQmlContext::setContextProperty(const QString &name, QObject *value) \sa QQmlContext::setContextProperty() */ -void QQmlContext::setContextProperties(const QVector<PropertyPair> &properties) +void QQmlContext::setContextProperties(const QList<PropertyPair> &properties) { Q_D(const QQmlContext); diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h index 7eddfe1abb..bb0b85afee 100644 --- a/src/qml/qml/qqmlcontext.h +++ b/src/qml/qml/qqmlcontext.h @@ -81,7 +81,7 @@ public: QVariant contextProperty(const QString &) const; void setContextProperty(const QString &, QObject *); void setContextProperty(const QString &, const QVariant &); - void setContextProperties(const QVector<PropertyPair> &properties); + void setContextProperties(const QList<PropertyPair> &properties); QString nameForObject(const QObject *) const; diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 9598fb1c8e..a709ea18be 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -7702,7 +7702,7 @@ void QQuickItem::setKeepMouseGrab(bool keep) \sa ungrabTouchPoints(), setKeepTouchGrab() */ -void QQuickItem::grabTouchPoints(const QVector<int> &ids) +void QQuickItem::grabTouchPoints(const QList<int> &ids) { Q_D(QQuickItem); if (!d->window) diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 813a6244dd..3f75eca5e1 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -317,7 +317,7 @@ public: bool filtersChildMouseEvents() const; void setFiltersChildMouseEvents(bool filter); - void grabTouchPoints(const QVector<int> &ids); + void grabTouchPoints(const QList<int> &ids); void ungrabTouchPoints(); bool keepTouchGrab() const; void setKeepTouchGrab(bool); diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 9570ab873e..635f54c857 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -559,7 +559,7 @@ void QQuickMultiPointTouchArea::grabGesture() grabMouse(); setKeepMouseGrab(true); - QVector<int> ids; + QList<int> ids; ids.reserve(_touchPoints.size()); for (auto it = _touchPoints.keyBegin(), end = _touchPoints.keyEnd(); it != end; ++it) { if (*it != -1) // -1 might be the mouse-point, but we already grabbed the mouse above. diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp index 9ba0c54b6e..3051e4b788 100644 --- a/src/quick/items/qquickpincharea.cpp +++ b/src/quick/items/qquickpincharea.cpp @@ -552,7 +552,7 @@ void QQuickPinchArea::updatePinch() if (win && win->mouseGrabberItem() != this) grabMouse(); setKeepMouseGrab(true); - grabTouchPoints(QVector<int>() << touchPoint1.id() << touchPoint2.id()); + grabTouchPoints(QList<int>() << touchPoint1.id() << touchPoint2.id()); d->inPinch = true; d->stealMouse = true; if (d->pinch && d->pinch->target()) { diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp index 804f548d21..e16fee42fe 100644 --- a/src/quick/items/qquickshadereffectmesh.cpp +++ b/src/quick/items/qquickshadereffectmesh.cpp @@ -88,7 +88,7 @@ QQuickGridMesh::QQuickGridMesh(QObject *parent) { } -bool QQuickGridMesh::validateAttributes(const QVector<QByteArray> &attributes, int *posIndex) +bool QQuickGridMesh::validateAttributes(const QList<QByteArray> &attributes, int *posIndex) { const int attrCount = attributes.count(); int positionIndex = attributes.indexOf(qtPositionAttributeName()); @@ -310,7 +310,7 @@ QQuickBorderImageMesh::QQuickBorderImageMesh(QObject *parent) { } -bool QQuickBorderImageMesh::validateAttributes(const QVector<QByteArray> &attributes, int *posIndex) +bool QQuickBorderImageMesh::validateAttributes(const QList<QByteArray> &attributes, int *posIndex) { Q_UNUSED(attributes); Q_UNUSED(posIndex); diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp index 7b62469003..855487e295 100644 --- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp +++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp @@ -382,7 +382,7 @@ void tst_qqmlcontext::setContextProperties() TestObject obj2; obj2.setA(-19); - QVector<QQmlContext::PropertyPair> properties; + QList<QQmlContext::PropertyPair> properties; properties.append({QString("a"), QVariant(10)}); properties.append({QString("b"), QVariant(19)}); diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index dcf5a0b09e..a3340c0e3a 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -104,7 +104,7 @@ protected: QVERIFY(!m_active); m_active = true; emit activeChanged(); - grabTouchPoints(QVector<int>() << touchpoint.id()); + grabTouchPoints(QList<int>() << touchpoint.id()); break; case Qt::TouchPointMoved: ++touchUpdates; diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp index 9117df812a..5b201541fe 100644 --- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp +++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp @@ -1348,7 +1348,7 @@ void tst_TouchMouse::touchGrabCausesMouseUngrab() rightItem->acceptTouch = true; { - QVector<int> ids; + QList<int> ids; ids.append(leftItem->point0); rightItem->grabTouchPoints(ids); } |