diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-05 14:49:44 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-08 08:12:48 +0200 |
commit | 14abe90c9fb7e31972b2991f6778233f0e71779e (patch) | |
tree | 32dab433a3b6aefae3428df5f3fcd0762f2f7806 /tests/auto/client/shared/coreprotocol.h | |
parent | 9bf6eb92858c05455221e8b6925485e65c4f4b50 (diff) |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: I4bc7b2eb2913fc828f09f96e21480b76cabf8656
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/client/shared/coreprotocol.h')
-rw-r--r-- | tests/auto/client/shared/coreprotocol.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/client/shared/coreprotocol.h b/tests/auto/client/shared/coreprotocol.h index 8d5e2d66d..8bc8deece 100644 --- a/tests/auto/client/shared/coreprotocol.h +++ b/tests/auto/client/shared/coreprotocol.h @@ -120,9 +120,9 @@ public: uint configureSerial = 0; int bufferScale = 1; } m_pending, m_committed; - QVector<DoubleBufferedState *> m_commits; - QVector<Callback *> m_waitingFrameCallbacks; - QVector<Output *> m_outputs; + QList<DoubleBufferedState *> m_commits; + QList<Callback *> m_waitingFrameCallbacks; + QList<Output *> m_outputs; SurfaceRole *m_role = nullptr; signals: @@ -149,7 +149,7 @@ public: {} bool isClean() override; QString dirtyMessage() override; - QVector<Surface *> m_surfaces; + QList<Surface *> m_surfaces; CoreCompositor *m_compositor = nullptr; signals: @@ -181,7 +181,7 @@ public: explicit SubCompositor(CoreCompositor *compositor, int version = 1) : QtWaylandServer::wl_subcompositor(compositor->m_display, version) {} - QVector<Subsurface *> m_subsurfaces; + QList<Subsurface *> m_subsurfaces; signals: void subsurfaceCreated(Subsurface *subsurface); @@ -270,13 +270,13 @@ public: CoreCompositor *m_compositor = nullptr; Pointer* m_pointer = nullptr; - QVector<Pointer *> m_oldPointers; + QList<Pointer *> m_oldPointers; Touch* m_touch = nullptr; - QVector<Touch *> m_oldTouchs; + QList<Touch *> m_oldTouchs; Keyboard* m_keyboard = nullptr; - QVector<Keyboard *> m_oldKeyboards; + QList<Keyboard *> m_oldKeyboards; uint m_capabilities = 0; @@ -313,7 +313,7 @@ public: void sendFrame(wl_client *client); Seat *m_seat = nullptr; - QVector<uint> m_enterSerials; + QList<uint> m_enterSerials; QPoint m_hotspot; signals: @@ -365,11 +365,11 @@ class Shm : public Global, public QtWaylandServer::wl_shm { Q_OBJECT public: - explicit Shm(CoreCompositor *compositor, QVector<format> formats = {format_argb8888, format_xrgb8888, format_rgb888}, int version = 1); + explicit Shm(CoreCompositor *compositor, QList<format> formats = {format_argb8888, format_xrgb8888, format_rgb888}, int version = 1); bool isClean() override; CoreCompositor *m_compositor = nullptr; - QVector<ShmPool *> m_pools; - const QVector<format> m_formats; + QList<ShmPool *> m_pools; + const QList<format> m_formats; protected: void shm_create_pool(Resource *resource, uint32_t id, int32_t fd, int32_t size) override; @@ -386,7 +386,7 @@ class ShmPool : QObject, public QtWaylandServer::wl_shm_pool public: explicit ShmPool(Shm *shm, wl_client *client, int id, int version = 1); Shm *m_shm = nullptr; - QVector<ShmBuffer *> m_buffers; + QList<ShmBuffer *> m_buffers; protected: void shm_pool_create_buffer(Resource *resource, uint32_t id, int32_t offset, int32_t width, int32_t height, int32_t stride, uint32_t format) override; |