diff options
68 files changed, 177 insertions, 181 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 83a56556e..12e3f413e 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -51,10 +51,10 @@ // We mean it. // +#include <QtCore/QList> #include <QtCore/QObject> -#include <QtCore/QRect> #include <QtCore/QPointer> -#include <QtCore/QVector> +#include <QtCore/QRect> #include <QtCore/QWaitCondition> #include <QtCore/QLoggingCategory> @@ -280,7 +280,7 @@ private: QWaylandInputDevice *mLastInputDevice = nullptr; QPointer<QWaylandWindow> mLastInputWindow; QPointer<QWaylandWindow> mLastKeyboardFocus; - QVector<QWaylandWindow *> mActiveWindows; + QList<QWaylandWindow *> mActiveWindows; struct wl_callback *mSyncCallback = nullptr; static const wl_callback_listener syncCallbackListener; diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h index 10132dfe1..d3bf5a785 100644 --- a/src/client/qwaylandinputcontext_p.h +++ b/src/client/qwaylandinputcontext_p.h @@ -54,10 +54,10 @@ #include <qpa/qplatforminputcontext.h> +#include <QList> #include <QLoggingCategory> #include <QPointer> #include <QRectF> -#include <QVector> #include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h> #include <qwaylandinputmethodeventbuilder_p.h> @@ -113,7 +113,7 @@ private: QWaylandDisplay *m_display = nullptr; QWaylandInputMethodEventBuilder m_builder; - QVector<Qt::KeyboardModifier> m_modifiersMap; + QList<Qt::KeyboardModifier> m_modifiersMap; uint32_t m_serial = 0; struct ::wl_surface *m_surface = nullptr; diff --git a/src/client/qwaylandshm_p.h b/src/client/qwaylandshm_p.h index 639effa16..bf2bbce4e 100644 --- a/src/client/qwaylandshm_p.h +++ b/src/client/qwaylandshm_p.h @@ -51,8 +51,8 @@ // We mean it. // -#include <QVector> #include <QImage> +#include <QList> #include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtWaylandClient/private/qwayland-wayland.h> @@ -81,7 +81,7 @@ protected: void shm_format(uint32_t format) override; private: - QVector<uint32_t> m_formats; + QList<uint32_t> m_formats; }; diff --git a/src/client/qwaylandshmwindow.cpp b/src/client/qwaylandshmwindow.cpp index e305d028d..9214665e4 100644 --- a/src/client/qwaylandshmwindow.cpp +++ b/src/client/qwaylandshmwindow.cpp @@ -41,8 +41,6 @@ #include "qwaylandbuffer_p.h" -#include <QtCore/QVector> - #include <QtCore/QDebug> QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandsurface_p.h b/src/client/qwaylandsurface_p.h index 541010934..930a137ac 100644 --- a/src/client/qwaylandsurface_p.h +++ b/src/client/qwaylandsurface_p.h @@ -84,7 +84,7 @@ protected: void surface_enter(struct ::wl_output *output) override; void surface_leave(struct ::wl_output *output) override; - QVector<QWaylandScreen *> m_screens; //As seen by wl_surface.enter/leave events. Chronological order. + QList<QWaylandScreen *> m_screens; //As seen by wl_surface.enter/leave events. Chronological order. QWaylandWindow *m_window = nullptr; friend class QWaylandWindow; // TODO: shouldn't need to be friends diff --git a/src/client/qwaylandtabletv2_p.h b/src/client/qwaylandtabletv2_p.h index b4daaf5db..36dd42689 100644 --- a/src/client/qwaylandtabletv2_p.h +++ b/src/client/qwaylandtabletv2_p.h @@ -55,10 +55,10 @@ #include <QtWaylandClient/private/qtwaylandclientglobal_p.h> -#include <QtGui/QTabletEvent> #include <QtCore/QObject> #include <QtCore/QPointer> #include <QtCore/QPointF> +#include <QtGui/QTabletEvent> QT_BEGIN_NAMESPACE @@ -93,9 +93,9 @@ protected: void zwp_tablet_seat_v2_pad_added(struct ::zwp_tablet_pad_v2 *id) override; private: - QVector<QWaylandTabletV2 *> m_tablets; - QVector<QWaylandTabletToolV2 *> m_tools; - QVector<QWaylandTabletPadV2 *> m_pads; + QList<QWaylandTabletV2 *> m_tablets; + QList<QWaylandTabletToolV2 *> m_tools; + QList<QWaylandTabletPadV2 *> m_pads; }; class Q_WAYLAND_CLIENT_EXPORT QWaylandTabletV2 : public QObject, public QtWayland::zwp_tablet_v2 diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 7a186b326..fa2a5b740 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -386,7 +386,7 @@ void QWaylandWindow::sendExposeEvent(const QRect &rect) } -static QVector<QPointer<QWaylandWindow>> activePopups; +static QList<QPointer<QWaylandWindow>> activePopups; void QWaylandWindow::closePopups(QWaylandWindow *parent) { diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index be06e435f..93015dece 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -217,7 +217,7 @@ protected: QScopedPointer<QWaylandSurface> mSurface; QWaylandShellSurface *mShellSurface = nullptr; QWaylandSubSurface *mSubSurfaceWindow = nullptr; - QVector<QWaylandSubSurface *> mChildren; + QList<QWaylandSubSurface *> mChildren; QWaylandAbstractDecoration *mWindowDecoration = nullptr; bool mMouseEventsInContentArea = false; diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 2247141d9..ee38c628d 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -199,7 +199,7 @@ void QWaylandCompositorPrivate::init() buffer_manager = new QtWayland::BufferManager(q); wl_display_init_shm(display); - const QVector<wl_shm_format> formats = QWaylandSharedMemoryFormatHelper::supportedWaylandFormats(); + const QList<wl_shm_format> formats = QWaylandSharedMemoryFormatHelper::supportedWaylandFormats(); for (wl_shm_format format : formats) wl_display_add_shm_format(display, format); diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h index 96d174310..47d7843f2 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard_p.h +++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h @@ -51,7 +51,7 @@ #include <QtCore/private/qobject_p.h> #include <QtWaylandCompositor/private/qwayland-server-wayland.h> -#include <QtCore/QVector> +#include <QtCore/QList> #if QT_CONFIG(xkbcommon) #include <xkbcommon/xkbcommon.h> @@ -113,7 +113,7 @@ private: Resource *focusResource = nullptr; QWaylandDestroyListener focusDestroyListener; - QVector<uint32_t> keys; + QList<uint32_t> keys; uint32_t modsDepressed = 0; uint32_t modsLatched = 0; uint32_t modsLocked = 0; diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h index d06d14178..ac62b0102 100644 --- a/src/compositor/compositor_api/qwaylandoutput_p.h +++ b/src/compositor/compositor_api/qwaylandoutput_p.h @@ -51,8 +51,8 @@ #include <QtWaylandCompositor/private/qwayland-server-wayland.h> +#include <QtCore/QList> #include <QtCore/QRect> -#include <QtCore/QVector> #include <QtCore/private/qobject_p.h> @@ -78,7 +78,7 @@ struct QWaylandSurfaceViewMapper } QWaylandSurface *surface = nullptr; - QVector<QWaylandView *> views; + QList<QWaylandView *> views; bool has_entered = false; }; @@ -115,11 +115,11 @@ private: QString manufacturer; QString model; QPoint position; - QVector<QWaylandOutputMode> modes; + QList<QWaylandOutputMode> modes; int currentMode = -1; int preferredMode = -1; QRect availableGeometry; - QVector<QWaylandSurfaceViewMapper> surfaceViews; + QList<QWaylandSurfaceViewMapper> surfaceViews; QSize physicalSize; QWaylandOutput::Subpixel subpixel = QWaylandOutput::SubpixelUnknown; QWaylandOutput::Transform transform = QWaylandOutput::TransformNormal; diff --git a/src/compositor/compositor_api/qwaylandquickchildren.h b/src/compositor/compositor_api/qwaylandquickchildren.h index ecf382d01..e6592718c 100644 --- a/src/compositor/compositor_api/qwaylandquickchildren.h +++ b/src/compositor/compositor_api/qwaylandquickchildren.h @@ -44,7 +44,7 @@ #include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #if QT_CONFIG(wayland_compositor_quick) #include <QtQml/QQmlListProperty> -#include <QtCore/QVector> +#include <QtCore/QList> #endif QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE static_cast<className *>(list->data)->m_children.clear(); \ } \ private: \ - QVector<QObject *> m_children; + QList<QObject *> m_children; #else #define Q_WAYLAND_COMPOSITOR_DECLARE_QUICK_CHILDREN(className) #endif diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h index 8ab82d728..ce2edf183 100644 --- a/src/compositor/compositor_api/qwaylandquickitem_p.h +++ b/src/compositor/compositor_api/qwaylandquickitem_p.h @@ -169,7 +169,7 @@ public: QWaylandOutput *connectedOutput = nullptr; QWaylandSurface::Origin origin = QWaylandSurface::OriginTopLeft; QPointer<QObject> subsurfaceHandler; - QVector<QWaylandSeat *> touchingSeats; + QList<QWaylandSeat *> touchingSeats; }; QT_END_NAMESPACE diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h index db0df8d1a..3f657c9d0 100644 --- a/src/compositor/compositor_api/qwaylandsurface_p.h +++ b/src/compositor/compositor_api/qwaylandsurface_p.h @@ -51,7 +51,7 @@ #include <QtWaylandCompositor/private/qwlregion_p.h> -#include <QtCore/QVector> +#include <QtCore/QList> #include <QtCore/QRect> #include <QtGui/QRegion> #include <QtGui/QImage> @@ -158,7 +158,7 @@ public: //member variables QList<QPointer<QWaylandSurface>> subsurfaceChildren; - QVector<QWaylandIdleInhibitManagerV1Private::Inhibitor *> idleInhibitors; + QList<QWaylandIdleInhibitManagerV1Private::Inhibitor *> idleInhibitors; QRegion inputRegion; QRegion opaqueRegion; diff --git a/src/compositor/extensions/qwaylandtextinput_p.h b/src/compositor/extensions/qwaylandtextinput_p.h index dba0c2bf5..d510f56f3 100644 --- a/src/compositor/extensions/qwaylandtextinput_p.h +++ b/src/compositor/extensions/qwaylandtextinput_p.h @@ -37,7 +37,6 @@ #include <QtCore/QObject> #include <QtCore/QMap> #include <QtCore/QRect> -#include <QtCore/QVector> #include <QtGui/QInputMethod> #include <QtWaylandCompositor/QWaylandSurface> diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp index 6b7e86003..895d00c87 100644 --- a/src/compositor/extensions/qwaylandxdgshell.cpp +++ b/src/compositor/extensions/qwaylandxdgshell.cpp @@ -740,7 +740,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurface::createIntegration(QWaylandQui QWaylandXdgToplevel::QWaylandXdgToplevel(QWaylandXdgSurface *xdgSurface, QWaylandResource &resource) : QObject(*new QWaylandXdgToplevelPrivate(xdgSurface, resource)) { - QVector<QWaylandXdgToplevel::State> states; + QList<QWaylandXdgToplevel::State> states; sendConfigure({0, 0}, states); } @@ -870,7 +870,7 @@ QSize QWaylandXdgToplevel::minSize() const * * This property holds the last states the client acknowledged for this QWaylandToplevel. */ -QVector<QWaylandXdgToplevel::State> QWaylandXdgToplevel::states() const +QList<QWaylandXdgToplevel::State> QWaylandXdgToplevel::states() const { Q_D(const QWaylandXdgToplevel); return d->m_lastAckedConfigure.states; @@ -1018,7 +1018,7 @@ QSize QWaylandXdgToplevel::sizeForResize(const QSizeF &size, const QPointF &delt * of the surface. A size of zero means the client is free to decide the size. * Known \a states are enumerated in QWaylandXdgToplevel::State. */ -uint QWaylandXdgToplevel::sendConfigure(const QSize &size, const QVector<QWaylandXdgToplevel::State> &states) +uint QWaylandXdgToplevel::sendConfigure(const QSize &size, const QList<QWaylandXdgToplevel::State> &states) { if (!size.isValid()) { qWarning() << "Can't configure xdg_toplevel with an invalid size" << size; @@ -1041,9 +1041,9 @@ uint QWaylandXdgToplevel::sendConfigure(const QSize &size, const QVector<QWaylan * A size of zero means the client is free to decide the size. * Known \a states are enumerated in XdgToplevel::State. */ -uint QWaylandXdgToplevel::sendConfigure(const QSize &size, const QVector<int> &states) +uint QWaylandXdgToplevel::sendConfigure(const QSize &size, const QList<int> &states) { - QVector<State> s; + QList<State> s; for (auto state : states) s << State(state); return sendConfigure(size, s); @@ -1312,7 +1312,7 @@ void QWaylandXdgToplevelPrivate::handleAckConfigure(uint serial) break; } - QVector<uint> changedStates; + QList<uint> changedStates; std::set_symmetric_difference( m_lastAckedConfigure.states.begin(), m_lastAckedConfigure.states.end(), config.states.begin(), config.states.end(), diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h index 7b471b969..4e3a59d55 100644 --- a/src/compositor/extensions/qwaylandxdgshell.h +++ b/src/compositor/extensions/qwaylandxdgshell.h @@ -185,7 +185,7 @@ public: QString appId() const; QSize maxSize() const; QSize minSize() const; - QVector<QWaylandXdgToplevel::State> states() const; + QList<QWaylandXdgToplevel::State> states() const; bool maximized() const; bool fullscreen() const; bool resizing() const; @@ -193,8 +193,8 @@ public: DecorationMode decorationMode() const; Q_INVOKABLE QSize sizeForResize(const QSizeF &size, const QPointF &delta, Qt::Edges edges) const; - uint sendConfigure(const QSize &size, const QVector<State> &states); - Q_INVOKABLE uint sendConfigure(const QSize &size, const QVector<int> &states); + uint sendConfigure(const QSize &size, const QList<State> &states); + Q_INVOKABLE uint sendConfigure(const QSize &size, const QList<int> &states); Q_INVOKABLE void sendClose(); Q_INVOKABLE uint sendMaximized(const QSize &size); Q_INVOKABLE uint sendUnmaximized(const QSize &size = QSize(0, 0)); diff --git a/src/compositor/extensions/qwaylandxdgshell_p.h b/src/compositor/extensions/qwaylandxdgshell_p.h index de48f481d..42b1881e3 100644 --- a/src/compositor/extensions/qwaylandxdgshell_p.h +++ b/src/compositor/extensions/qwaylandxdgshell_p.h @@ -138,12 +138,12 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgToplevelPrivate : public QObjectPri public: struct ConfigureEvent { ConfigureEvent() = default; - ConfigureEvent(const QVector<QWaylandXdgToplevel::State> + ConfigureEvent(const QList<QWaylandXdgToplevel::State> &incomingStates, const QSize &incomingSize, uint incomingSerial) : states(incomingStates), size(incomingSize), serial(incomingSerial) { } - QVector<QWaylandXdgToplevel::State> states; + QList<QWaylandXdgToplevel::State> states; QSize size = {0, 0}; uint serial = 0; }; diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp index 0aa160544..9534ec942 100644 --- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp +++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp @@ -151,7 +151,7 @@ void XdgToplevelIntegration::handleSetMaximized() if (!m_item->view()->isPrimary()) return; - QVector<QWaylandXdgToplevel::State> states = m_toplevel->states(); + QList<QWaylandXdgToplevel::State> states = m_toplevel->states(); if (!states.contains(QWaylandXdgToplevel::State::FullscreenState) && !states.contains(QWaylandXdgToplevel::State::MaximizedState)) { windowedGeometry.initialWindowSize = m_xdgSurface->windowGeometry().size(); @@ -207,7 +207,7 @@ void XdgToplevelIntegration::handleSetFullscreen() if (!m_item->view()->isPrimary()) return; - QVector<QWaylandXdgToplevel::State> states = m_toplevel->states(); + QList<QWaylandXdgToplevel::State> states = m_toplevel->states(); if (!states.contains(QWaylandXdgToplevel::State::FullscreenState) && !states.contains(QWaylandXdgToplevel::State::MaximizedState)) { windowedGeometry.initialWindowSize = m_xdgSurface->windowGeometry().size(); diff --git a/src/compositor/extensions/qwaylandxdgshellv5.cpp b/src/compositor/extensions/qwaylandxdgshellv5.cpp index c6ef34e7b..6d0d269db 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv5.cpp @@ -1165,7 +1165,7 @@ QRect QWaylandXdgSurfaceV5::windowGeometry() const * * This property holds the last states the client acknowledged for this QWaylandXdgSurfaceV5. */ -QVector<uint> QWaylandXdgSurfaceV5::states() const +QList<uint> QWaylandXdgSurfaceV5::states() const { Q_D(const QWaylandXdgSurfaceV5); return d->m_lastAckedConfigure.states; @@ -1256,7 +1256,7 @@ QSize QWaylandXdgSurfaceV5::sizeForResize(const QSizeF &size, const QPointF &del * Sends a configure event to the client. Parameter \a size contains the pixel size * of the surface. Known \a states are enumerated in QWaylandXdgSurfaceV5::State. */ -uint QWaylandXdgSurfaceV5::sendConfigure(const QSize &size, const QVector<uint> &states) +uint QWaylandXdgSurfaceV5::sendConfigure(const QSize &size, const QList<uint> &states) { if (!size.isValid()) { qWarning() << "Can't configure xdg surface (v5) with an invalid size" << size; @@ -1274,9 +1274,9 @@ uint QWaylandXdgSurfaceV5::sendConfigure(const QSize &size, const QVector<uint> return serial; } -uint QWaylandXdgSurfaceV5::sendConfigure(const QSize &size, const QVector<QWaylandXdgSurfaceV5::State> &states) +uint QWaylandXdgSurfaceV5::sendConfigure(const QSize &size, const QList<QWaylandXdgSurfaceV5::State> &states) { - QVector<uint> asUints; + QList<uint> asUints; asUints.reserve(states.size()); for (QWaylandXdgSurfaceV5::State state : states) { asUints << state; diff --git a/src/compositor/extensions/qwaylandxdgshellv5.h b/src/compositor/extensions/qwaylandxdgshellv5.h index 84cae6230..3c85c2ced 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.h +++ b/src/compositor/extensions/qwaylandxdgshellv5.h @@ -138,7 +138,7 @@ public: QString title() const; QString appId() const; QRect windowGeometry() const; - QVector<uint> states() const; + QList<uint> states() const; bool maximized() const; bool fullscreen() const; bool resizing() const; @@ -155,8 +155,8 @@ public: static QWaylandXdgSurfaceV5 *fromResource(::wl_resource *resource); Q_INVOKABLE QSize sizeForResize(const QSizeF &size, const QPointF &delta, ResizeEdge edge); - Q_INVOKABLE uint sendConfigure(const QSize &size, const QVector<uint> &states); - Q_INVOKABLE uint sendConfigure(const QSize &size, const QVector<State> &states); + Q_INVOKABLE uint sendConfigure(const QSize &size, const QList<uint> &states); + Q_INVOKABLE uint sendConfigure(const QSize &size, const QList<State> &states); Q_INVOKABLE void sendClose(); Q_INVOKABLE uint sendMaximized(const QSize &size); diff --git a/src/compositor/extensions/qwaylandxdgshellv5_p.h b/src/compositor/extensions/qwaylandxdgshellv5_p.h index 5356d979c..e223aa719 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv5_p.h @@ -96,7 +96,7 @@ public: static QWaylandXdgSurfaceV5Private *get(QWaylandXdgSurfaceV5 *xdgSurface) { return xdgSurface->d_func(); } struct ConfigureEvent { - QVector<uint> states; + QList<uint> states; QSize size; uint serial; }; diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp index 6a2431594..1dbd00065 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp @@ -753,7 +753,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV6::createIntegration(QWaylandQ QWaylandXdgToplevelV6::QWaylandXdgToplevelV6(QWaylandXdgSurfaceV6 *xdgSurface, QWaylandResource &resource) : QObject(*new QWaylandXdgToplevelV6Private(xdgSurface, resource)) { - QVector<QWaylandXdgToplevelV6::State> states; + QList<QWaylandXdgToplevelV6::State> states; sendConfigure({0, 0}, states); } @@ -856,7 +856,7 @@ QSize QWaylandXdgToplevelV6::minSize() const * * This property holds the last states the client acknowledged for this QWaylandToplevelV6. */ -QVector<QWaylandXdgToplevelV6::State> QWaylandXdgToplevelV6::states() const +QList<QWaylandXdgToplevelV6::State> QWaylandXdgToplevelV6::states() const { Q_D(const QWaylandXdgToplevelV6); return d->m_lastAckedConfigure.states; @@ -970,7 +970,7 @@ QSize QWaylandXdgToplevelV6::sizeForResize(const QSizeF &size, const QPointF &de * of the surface. A size of zero means the client is free to decide the size. * Known \a states are enumerated in QWaylandXdgToplevelV6::State. */ -uint QWaylandXdgToplevelV6::sendConfigure(const QSize &size, const QVector<QWaylandXdgToplevelV6::State> &states) +uint QWaylandXdgToplevelV6::sendConfigure(const QSize &size, const QList<QWaylandXdgToplevelV6::State> &states) { if (!size.isValid()) { qWarning() << "Can't configure zxdg_toplevel_v6 with an invalid size" << size; @@ -993,9 +993,9 @@ uint QWaylandXdgToplevelV6::sendConfigure(const QSize &size, const QVector<QWayl * A size of zero means the client is free to decide the size. * Known \a states are enumerated in XdgToplevelV6::State. */ -uint QWaylandXdgToplevelV6::sendConfigure(const QSize &size, const QVector<int> &states) +uint QWaylandXdgToplevelV6::sendConfigure(const QSize &size, const QList<int> &states) { - QVector<State> s; + QList<State> s; for (auto state : states) s << State(state); return sendConfigure(size, s); @@ -1255,7 +1255,7 @@ void QWaylandXdgToplevelV6Private::handleAckConfigure(uint serial) break; } - QVector<uint> changedStates; + QList<uint> changedStates; std::set_symmetric_difference( m_lastAckedConfigure.states.begin(), m_lastAckedConfigure.states.end(), config.states.begin(), config.states.end(), diff --git a/src/compositor/extensions/qwaylandxdgshellv6.h b/src/compositor/extensions/qwaylandxdgshellv6.h index 2a55e109d..5f355937d 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6.h +++ b/src/compositor/extensions/qwaylandxdgshellv6.h @@ -172,15 +172,15 @@ public: QString appId() const; QSize maxSize() const; QSize minSize() const; - QVector<QWaylandXdgToplevelV6::State> states() const; + QList<QWaylandXdgToplevelV6::State> states() const; bool maximized() const; bool fullscreen() const; bool resizing() const; bool activated() const; Q_INVOKABLE QSize sizeForResize(const QSizeF &size, const QPointF &delta, Qt::Edges edges) const; - uint sendConfigure(const QSize &size, const QVector<State> &states); - Q_INVOKABLE uint sendConfigure(const QSize &size, const QVector<int> &states); + uint sendConfigure(const QSize &size, const QList<State> &states); + Q_INVOKABLE uint sendConfigure(const QSize &size, const QList<int> &states); Q_INVOKABLE void sendClose(); Q_INVOKABLE uint sendMaximized(const QSize &size); Q_INVOKABLE uint sendUnmaximized(const QSize &size = QSize(0, 0)); diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h index 902224155..b7c96db69 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h @@ -139,12 +139,12 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgToplevelV6Private : public QObjectP public: struct ConfigureEvent { ConfigureEvent() = default; - ConfigureEvent(const QVector<QWaylandXdgToplevelV6::State> + ConfigureEvent(const QList<QWaylandXdgToplevelV6::State> &incomingStates, const QSize &incomingSize, uint incomingSerial) : states(incomingStates), size(incomingSize), serial(incomingSerial) { } - QVector<QWaylandXdgToplevelV6::State> states; + QList<QWaylandXdgToplevelV6::State> states; QSize size = {0, 0}; uint serial = 0; }; diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp index 98b748986..a86151dad 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp @@ -153,7 +153,7 @@ void XdgToplevelV6Integration::handleSetMaximized() if (!m_item->view()->isPrimary()) return; - QVector<QWaylandXdgToplevelV6::State> states = m_toplevel->states(); + QList<QWaylandXdgToplevelV6::State> states = m_toplevel->states(); if (!states.contains(QWaylandXdgToplevelV6::State::FullscreenState) && !states.contains(QWaylandXdgToplevelV6::State::MaximizedState)) { windowedGeometry.initialWindowSize = m_xdgSurface->windowGeometry().size(); @@ -205,7 +205,7 @@ void XdgToplevelV6Integration::handleSetFullscreen() if (!m_item->view()->isPrimary()) return; - QVector<QWaylandXdgToplevelV6::State> states = m_toplevel->states(); + QList<QWaylandXdgToplevelV6::State> states = m_toplevel->states(); if (!states.contains(QWaylandXdgToplevelV6::State::FullscreenState) && !states.contains(QWaylandXdgToplevelV6::State::MaximizedState)) { windowedGeometry.initialWindowSize = m_xdgSurface->windowGeometry().size(); diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp index 0eb7f3bfc..f9d1a368f 100644 --- a/src/compositor/extensions/qwlqttouch.cpp +++ b/src/compositor/extensions/qwlqttouch.cpp @@ -102,11 +102,11 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandSurface *s uint32_t pressure = uint32_t(tp.pressure() * 255); QByteArray rawData; - QVector<QPointF> rawPosList = tp.rawScreenPositions(); + QList<QPointF> rawPosList = tp.rawScreenPositions(); int rawPosCount = rawPosList.count(); if (rawPosCount) { rawPosCount = qMin(maxRawPos, rawPosCount); - QVector<float>::iterator iter = m_posData.begin(); + QList<float>::iterator iter = m_posData.begin(); for (int rpi = 0; rpi < rawPosCount; ++rpi) { const QPointF &rawPos(rawPosList.at(rpi)); // This will stay in screen coordinates for performance diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h index 76087151c..0db977bee 100644 --- a/src/compositor/extensions/qwlqttouch_p.h +++ b/src/compositor/extensions/qwlqttouch_p.h @@ -86,7 +86,7 @@ private: QWaylandCompositor *m_compositor = nullptr; BehaviorFlags m_flags = BehaviorFlag::None; QList<Resource *> m_resources; - QVector<float> m_posData; + QList<float> m_posData; }; Q_DECLARE_OPERATORS_FOR_FLAGS(TouchExtensionGlobal::BehaviorFlags) diff --git a/src/compositor/extensions/qwltexturesharingextension_p.h b/src/compositor/extensions/qwltexturesharingextension_p.h index bd0cd66ba..6c7de27a6 100644 --- a/src/compositor/extensions/qwltexturesharingextension_p.h +++ b/src/compositor/extensions/qwltexturesharingextension_p.h @@ -77,7 +77,7 @@ public: void setExtensionReady(QWaylandTextureSharingExtension *extension); private: - QVector<SharedTextureImageResponse*> m_pendingResponses; + QList<SharedTextureImageResponse*> m_pendingResponses; }; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextureSharingExtension diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h index c1553ffa3..d520dac06 100644 --- a/src/compositor/global/qwaylandcompositorextension.h +++ b/src/compositor/global/qwaylandcompositorextension.h @@ -33,7 +33,6 @@ #include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QtCore/QObject> -#include <QtCore/QVector> struct wl_interface; diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp index 5c585746c..7c115e431 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp @@ -66,7 +66,7 @@ QWaylandBrcmGLContext::QWaylandBrcmGLContext(EGLDisplay eglDisplay, const QSurfa eglBindAPI(EGL_OPENGL_ES_API); - QVector<EGLint> eglContextAttrs; + QList<EGLint> eglContextAttrs; eglContextAttrs.append(EGL_CONTEXT_CLIENT_VERSION); eglContextAttrs.append(format.majorVersion() == 1 ? 1 : 2); eglContextAttrs.append(EGL_NONE); diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h index 588366aa7..e57a40339 100644 --- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -44,8 +44,8 @@ #include "qwayland-libhybris-egl-server-buffer.h" #include <QtWaylandClient/private/qwaylandserverbufferintegration_p.h> #include <QtWaylandClient/private/qwaylanddisplay_p.h> +#include <QtCore/QList> #include <QtCore/QTextStream> -#include <QtCore/QVector> #include <EGL/egl.h> #include <EGL/eglext.h> @@ -85,8 +85,8 @@ private: EGLImageKHR m_image; QOpenGLTexture *m_texture = nullptr; int m_numFds; - QVector<int32_t> m_ints; - QVector<int32_t> m_fds; + QList<int32_t> m_ints; + QList<int32_t> m_fds; int32_t m_stride; int32_t m_hybrisFormat; }; diff --git a/src/hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h b/src/hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h index 7add74269..44fd69973 100644 --- a/src/hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h +++ b/src/hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.h @@ -92,7 +92,7 @@ private: static void wlDisplayHandleGlobal(void *data, struct ::wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); QWaylandDisplay *m_display = nullptr; - QVector<QOpenGLTexture *> orphanedTextures; + QList<QOpenGLTexture *> orphanedTextures; }; } diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp index bb903cf1f..8059701d3 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp @@ -240,7 +240,7 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis m_format = q_glFormatFromConfig(m_eglDisplay, m_config, fmt); m_shareEGLContext = share ? static_cast<QWaylandGLContext *>(share)->eglContext() : EGL_NO_CONTEXT; - QVector<EGLint> eglContextAttrs; + QList<EGLint> eglContextAttrs; eglContextAttrs.append(EGL_CONTEXT_CLIENT_VERSION); eglContextAttrs.append(format.majorVersion()); const bool hasKHRCreateContext = q_hasEglExtension(m_eglDisplay, "EGL_KHR_create_context"); @@ -312,7 +312,7 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis // Create an EGL context for the decorations blitter. By using a dedicated context we don't need to make sure to not // change the context state and we also use OpenGL ES 2 API independently to what the app is using to draw. - QVector<EGLint> eglDecorationsContextAttrs = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; + QList<EGLint> eglDecorationsContextAttrs = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; m_decorationsContext = eglCreateContext(m_eglDisplay, m_config, m_context, eglDecorationsContextAttrs.constData()); if (m_decorationsContext == EGL_NO_CONTEXT) qWarning("QWaylandGLContext: Failed to create the decorations EGLContext. Decorations will not be drawn."); diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h index 7350961a2..fe453bae0 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h +++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h @@ -33,8 +33,8 @@ #include <QtWaylandCompositor/private/qwayland-server-wayland.h> #include <QtWaylandCompositor/private/qwaylandutils_p.h> +#include <QtCore/QList> #include <QtCore/QSize> -#include <QtCore/QVector> #include <EGL/egl.h> @@ -60,7 +60,7 @@ protected: void buffer_destroy(Resource *resource) override; private: - QVector<EGLint> m_handle; + QList<EGLint> m_handle; bool m_invertedY = false; QSize m_size; }; diff --git a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h index 64b562d8e..263c50260 100644 --- a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h +++ b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h @@ -56,7 +56,7 @@ public: void remove(QWaylandQuickHardwareLayer *layer) override; void sendFrameCallbacks(); - QVector<QSharedPointer<Vsp2Layer>> m_layers; + QList<QSharedPointer<Vsp2Layer>> m_layers; private: void enableVspLayers(); void disableVspLayers(); diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h index addbb71f5..0867cded7 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -83,8 +83,8 @@ private: int32_t m_stride; QOpenGLTexture *m_texture = nullptr; QtWaylandServer::qt_libhybris_egl_server_buffer::format m_hybris_format; - QVector<int32_t> m_ints; - QVector<int32_t> m_fds; + QList<int32_t> m_ints; + QList<int32_t> m_fds; }; class LibHybrisEglServerBufferIntegration : diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp index 28015d35b..777f7eea1 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp @@ -44,7 +44,7 @@ LinuxDmabuf::LinuxDmabuf(wl_display *display, LinuxDmabufClientBufferIntegration { } -void LinuxDmabuf::setSupportedModifiers(const QHash<uint32_t, QVector<uint64_t>> &modifiers) +void LinuxDmabuf::setSupportedModifiers(const QHash<uint32_t, QList<uint64_t>> &modifiers) { Q_ASSERT(resourceMap().isEmpty()); m_modifiers = modifiers; diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h index d9d2349ac..aaf803148 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h @@ -83,14 +83,14 @@ class LinuxDmabuf : public QtWaylandServer::zwp_linux_dmabuf_v1 public: explicit LinuxDmabuf(wl_display *display, LinuxDmabufClientBufferIntegration *clientBufferIntegration); - void setSupportedModifiers(const QHash<uint32_t, QVector<uint64_t>> &modifiers); + void setSupportedModifiers(const QHash<uint32_t, QList<uint64_t>> &modifiers); protected: void zwp_linux_dmabuf_v1_bind_resource(Resource *resource) override; void zwp_linux_dmabuf_v1_create_params(Resource *resource, uint32_t params_id) override; private: - QHash<uint32_t, QVector<uint64_t>> m_modifiers; // key=DRM format, value=supported DRM modifiers for format + QHash<uint32_t, QList<uint64_t>> m_modifiers; // key=DRM format, value=supported DRM modifiers for format LinuxDmabufClientBufferIntegration *m_clientBufferIntegration; }; diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp index bf00a5283..9010e740b 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp @@ -337,48 +337,48 @@ void LinuxDmabufClientBufferIntegration::initializeHardware(struct ::wl_display } // request and sent formats/modifiers only after egl_display is bound - QHash<uint32_t, QVector<uint64_t>> modifiers; + QHash<uint32_t, QList<uint64_t>> modifiers; for (const auto &format : supportedDrmFormats()) { modifiers[format] = supportedDrmModifiers(format); } m_linuxDmabuf->setSupportedModifiers(modifiers); } -QVector<uint32_t> LinuxDmabufClientBufferIntegration::supportedDrmFormats() +QList<uint32_t> LinuxDmabufClientBufferIntegration::supportedDrmFormats() { if (!egl_query_dmabuf_formats_ext) - return QVector<uint32_t>(); + return QList<uint32_t>(); // request total number of formats EGLint count = 0; EGLBoolean success = egl_query_dmabuf_formats_ext(m_eglDisplay, 0, nullptr, &count); if (success && count > 0) { - QVector<uint32_t> drmFormats(count); + QList<uint32_t> drmFormats(count); if (egl_query_dmabuf_formats_ext(m_eglDisplay, count, (EGLint *) drmFormats.data(), &count)) return drmFormats; } - return QVector<uint32_t>(); + return QList<uint32_t>(); } -QVector<uint64_t> LinuxDmabufClientBufferIntegration::supportedDrmModifiers(uint32_t format) +QList<uint64_t> LinuxDmabufClientBufferIntegration::supportedDrmModifiers(uint32_t format) { if (!egl_query_dmabuf_modifiers_ext) - return QVector<uint64_t>(); + return QList<uint64_t>(); // request total number of formats EGLint count = 0; EGLBoolean success = egl_query_dmabuf_modifiers_ext(m_eglDisplay, format, 0, nullptr, nullptr, &count); if (success && count > 0) { - QVector<uint64_t> modifiers(count); + QList<uint64_t> modifiers(count); if (egl_query_dmabuf_modifiers_ext(m_eglDisplay, format, count, modifiers.data(), nullptr, &count)) { return modifiers; } } - return QVector<uint64_t>(); + return QList<uint64_t>(); } void LinuxDmabufClientBufferIntegration::deleteOrphanedTextures() diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h index cbbd4d9ba..35417d796 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h @@ -88,12 +88,12 @@ private: bool initSimpleTexture(LinuxDmabufWlBuffer *dmabufBuffer); bool initYuvTexture(LinuxDmabufWlBuffer *dmabufBuffer); - QVector<uint32_t> supportedDrmFormats(); - QVector<uint64_t> supportedDrmModifiers(uint32_t format); + QList<uint32_t> supportedDrmFormats(); + QList<uint64_t> supportedDrmModifiers(uint32_t format); EGLDisplay m_eglDisplay = EGL_NO_DISPLAY; bool m_displayBound = false; - QVector<QOpenGLTexture *> m_orphanedTextures; + QList<QOpenGLTexture *> m_orphanedTextures; QHash<EGLint, YuvFormatConversion> m_yuvFormats; bool m_supportsDmabufModifiers = false; QHash<struct ::wl_resource *, LinuxDmabufWlBuffer *> m_importedBuffers; diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp index 8bacd38cc..18caed84d 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp @@ -178,7 +178,7 @@ public: ::wl_display *wlDisplay = nullptr; QOffscreenSurface *offscreenSurface = nullptr; QOpenGLContext *localContext = nullptr; - QVector<QOpenGLTexture *> orphanedTextures; + QList<QOpenGLTexture *> orphanedTextures; PFNEGLBINDWAYLANDDISPLAYWL egl_bind_wayland_display = nullptr; PFNEGLUNBINDWAYLANDDISPLAYWL egl_unbind_wayland_display = nullptr; diff --git a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp index a97391ba4..0299ebdcd 100644 --- a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp @@ -157,7 +157,7 @@ public: bool display_bound = false; QOffscreenSurface *offscreenSurface = nullptr; QOpenGLContext *localContext = nullptr; - QVector<QOpenGLTexture *> orphanedTextures; + QList<QOpenGLTexture *> orphanedTextures; WaylandEglStreamController *eglStreamController = nullptr; diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp index 563b9afaa..d1c470690 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp @@ -45,9 +45,9 @@ QT_BEGIN_NAMESPACE -QVector<EGLint> eglbuildSpec() +QList<EGLint> eglbuildSpec() { - QVector<EGLint> spec; + QList<EGLint> spec; spec.append(EGL_SURFACE_TYPE); spec.append(EGL_WINDOW_BIT | EGL_PIXMAP_BIT); spec.append(EGL_RENDERABLE_TYPE); spec.append(EGL_OPENGL_ES2_BIT); @@ -98,7 +98,7 @@ QOpenGLTexture *XCompositeEglClientBuffer::toOpenGlTexture(int plane) XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(m_buffer); Pixmap pixmap = XCompositeNameWindowPixmap(m_integration->xDisplay(), compositorBuffer->window()); - QVector<EGLint> eglConfigSpec = eglbuildSpec(); + QList<EGLint> eglConfigSpec = eglbuildSpec(); EGLint matching = 0; EGLConfig config; @@ -108,7 +108,7 @@ QOpenGLTexture *XCompositeEglClientBuffer::toOpenGlTexture(int plane) return nullptr; } - QVector<EGLint> attribList; + QList<EGLint> attribList; attribList.append(EGL_TEXTURE_FORMAT); attribList.append(EGL_TEXTURE_RGBA); diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp index c21374395..8b7a9c9d7 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp @@ -44,9 +44,9 @@ QT_BEGIN_NAMESPACE -QVector<int> qglx_buildSpec() +QList<int> qglx_buildSpec() { - QVector<int> spec(48); + QList<int> spec(48); int i = 0; spec[i++] = GLX_LEVEL; @@ -120,11 +120,11 @@ QOpenGLTexture *XCompositeGLXClientBuffer::toOpenGlTexture(int plane) XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(m_buffer); Pixmap pixmap = XCompositeNameWindowPixmap(m_integration->xDisplay(), compositorBuffer->window()); - QVector<int> glxConfigSpec = qglx_buildSpec(); + QList<int> glxConfigSpec = qglx_buildSpec(); int numberOfConfigs; GLXFBConfig *configs = glXChooseFBConfig(m_integration->xDisplay(),m_integration->xScreen(),glxConfigSpec.constData(),&numberOfConfigs); - QVector<int> attribList; + QList<int> attribList; attribList.append(GLX_TEXTURE_FORMAT_EXT); attribList.append(GLX_TEXTURE_FORMAT_RGB_EXT); attribList.append(GLX_TEXTURE_TARGET_EXT); diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes index d05cf3c13..c96e24836 100644 --- a/src/imports/compositor/plugins.qmltypes +++ b/src/imports/compositor/plugins.qmltypes @@ -1045,13 +1045,13 @@ Module { name: "sendConfigure" type: "uint" Parameter { name: "size"; type: "QSize" } - Parameter { name: "states"; type: "QVector<uint>" } + Parameter { name: "states"; type: "QList<uint>" } } Method { name: "sendConfigure" type: "uint" Parameter { name: "size"; type: "QSize" } - Parameter { name: "states"; type: "QVector<State>" } + Parameter { name: "states"; type: "QList<State>" } } Method { name: "sendClose" } Method { @@ -1169,7 +1169,7 @@ Module { name: "sendConfigure" type: "uint" Parameter { name: "size"; type: "QSize" } - Parameter { name: "states"; type: "QVector<int>" } + Parameter { name: "states"; type: "QList<int>" } } Method { name: "sendClose" } Method { @@ -1257,7 +1257,7 @@ Module { name: "sendConfigure" type: "uint" Parameter { name: "size"; type: "QSize" } - Parameter { name: "states"; type: "QVector<int>" } + Parameter { name: "states"; type: "QList<int>" } } Method { name: "sendClose" } Method { diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5_p.h index 2b0a59f17..d0bdc8bc6 100644 --- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5_p.h +++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5_p.h @@ -54,7 +54,7 @@ #include "qwayland-xdg-shell-unstable-v5_p.h" #include <QtCore/QSize> -#include <QtCore/QVector> +#include <QtCore/QList> #include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtWaylandClient/private/qwaylandshellsurface_p.h> @@ -82,7 +82,7 @@ public: private: void xdg_shell_ping(uint32_t serial) override; - QVector<QWaylandWindow *> m_popups; + QList<QWaylandWindow *> m_popups; uint m_popupSerial = 0; }; diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index 3cecb5bcf..130a71554 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/qtwaylandscanner/qtwaylandscanner.cpp @@ -123,13 +123,13 @@ private: QByteArray m_scannerName; QByteArray m_headerPath; QByteArray m_prefix; - QVector <QByteArray> m_includes; + QList <QByteArray> m_includes; QXmlStreamReader *m_xml = nullptr; }; bool Scanner::parseArguments(int argc, char **argv) { - QVector<QByteArray> args; + QList<QByteArray> args; args.reserve(argc); for (int i = 0; i < argc; ++i) args << QByteArray(argv[i]); diff --git a/src/shared/qwaylandsharedmemoryformathelper_p.h b/src/shared/qwaylandsharedmemoryformathelper_p.h index 72cc8401c..ac4428dfd 100644 --- a/src/shared/qwaylandsharedmemoryformathelper_p.h +++ b/src/shared/qwaylandsharedmemoryformathelper_p.h @@ -71,7 +71,7 @@ public: default: return QImage::Format_Invalid; } } - static inline QVector<wl_shm_format> supportedWaylandFormats(); + static inline QList<wl_shm_format> supportedWaylandFormats(); private: //IMPLEMENTATION (which has to be inline in the header because of the include trick) @@ -127,9 +127,9 @@ wl_shm_format QWaylandSharedMemoryFormatHelper::fromQImageFormat(QImage::Format return array.data[format]; } -QVector<wl_shm_format> QWaylandSharedMemoryFormatHelper::supportedWaylandFormats() +QList<wl_shm_format> QWaylandSharedMemoryFormatHelper::supportedWaylandFormats() { - QVector<wl_shm_format> retFormats; + QList<wl_shm_format> retFormats; Array array = getData(); for (size_t i = 0; i < array.size; i++) { if (int(array.data[i]) != INT_MIN diff --git a/tests/auto/client/inputcontext/tst_inputcontext.cpp b/tests/auto/client/inputcontext/tst_inputcontext.cpp index 1f07eb520..d421b0d22 100644 --- a/tests/auto/client/inputcontext/tst_inputcontext.cpp +++ b/tests/auto/client/inputcontext/tst_inputcontext.cpp @@ -85,7 +85,7 @@ QByteArray tst_inputcontext::inputContextName() const void tst_inputcontext::ensureTextInputPresentOnCompositor() { exec([&] { - QVector<TextInputManager *> extensions = getAll<TextInputManager>(); + QList<TextInputManager *> extensions = getAll<TextInputManager>(); if (extensions.length() > 1) QFAIL("TextInputManager is a singleton, hence there should not be more then one object returned"); if (extensions.length() == 0) @@ -96,7 +96,7 @@ void tst_inputcontext::ensureTextInputPresentOnCompositor() void tst_inputcontext::ensureTextInputNotPresentOnCompositor() { exec([&] { - QVector<TextInputManager *> extensions = getAll<TextInputManager>(); + QList<TextInputManager *> extensions = getAll<TextInputManager>(); if (extensions.length() > 1) QFAIL("TextInputManager is a singleton, hence there should not be more then one object returned"); if (extensions.length() == 1) diff --git a/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp b/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp index 660d1f83e..f7a63d13e 100644 --- a/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp +++ b/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp @@ -140,7 +140,7 @@ public: PrimarySelectionDeviceManagerV1 *m_manager = nullptr; Seat *m_seat = nullptr; - QVector<PrimarySelectionOfferV1 *> m_sentSelectionOffers; + QList<PrimarySelectionOfferV1 *> m_sentSelectionOffers; PrimarySelectionSourceV1 *m_selectionSource = nullptr; uint m_serial = 0; @@ -194,7 +194,7 @@ public: int m_version = 1; // TODO: Remove on libwayland upgrade QMap<Seat *, PrimarySelectionDeviceV1 *> m_devices; - QVector<PrimarySelectionSourceV1 *> m_sources; + QList<PrimarySelectionSourceV1 *> m_sources; protected: void zwp_primary_selection_device_manager_v1_destroy(Resource *resource) override { @@ -459,7 +459,7 @@ void tst_primaryselectionv1::copy() window.show(); QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial); - QVector<uint> mouseSerials; + QList<uint> mouseSerials; exec([&] { auto *surface = xdgSurface()->m_surface; keyboard()->sendEnter(surface); // Need to set keyboard focus according to protocol diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp index 46d91e028..1c1e7a02b 100644 --- a/tests/auto/client/seatv4/tst_seatv4.cpp +++ b/tests/auto/client/seatv4/tst_seatv4.cpp @@ -292,7 +292,7 @@ void tst_seatv4::simpleAxis() QPoint pixelDelta; QPoint angleDelta; // eights of a degree, positive is upwards, left }; - QVector<Event> m_events; + QList<Event> m_events; }; WheelWindow window; @@ -351,7 +351,7 @@ static bool supportsCursorSize(uint size, wl_shm *shm) return false; } -static bool supportsCursorSizes(const QVector<uint> &sizes) +static bool supportsCursorSizes(const QList<uint> &sizes) { auto *waylandIntegration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration()); wl_shm *shm = waylandIntegration->display()->shm()->object(); diff --git a/tests/auto/client/seatv5/tst_seatv5.cpp b/tests/auto/client/seatv5/tst_seatv5.cpp index 081a0aa70..2f7e70dc9 100644 --- a/tests/auto/client/seatv5/tst_seatv5.cpp +++ b/tests/auto/client/seatv5/tst_seatv5.cpp @@ -161,7 +161,7 @@ public: QPoint angleDelta; // eights of a degree, positive is upwards, left Qt::MouseEventSource source{}; }; - QVector<Event> m_events; + QList<Event> m_events; }; void tst_seatv5::simpleAxis_data() @@ -401,7 +401,7 @@ public: Qt::TouchPointStates touchPointStates{}; QList<QTouchEvent::TouchPoint> touchPoints; }; - QVector<Event> m_events; + QList<Event> m_events; }; void tst_seatv5::singleTap() diff --git a/tests/auto/client/shared/corecompositor.h b/tests/auto/client/shared/corecompositor.h index 254465ee6..1b43fd703 100644 --- a/tests/auto/client/shared/corecompositor.h +++ b/tests/auto/client/shared/corecompositor.h @@ -145,10 +145,10 @@ public: * \brief Returns all globals with the given type, if any */ template<typename global_type> - QVector<global_type *> getAll() + QList<global_type *> getAll() { warnIfNotLockedByThread(Q_FUNC_INFO); - QVector<global_type *> matching; + QList<global_type *> matching; for (auto *global : qAsConst(m_globals)) { if (auto *casted = qobject_cast<global_type *>(global)) matching.append(casted); @@ -199,7 +199,7 @@ protected: QByteArray m_socketName; wl_event_loop *m_eventLoop = nullptr; bool m_running = true; - QVector<Global *> m_globals; + QList<Global *> m_globals; QElapsedTimer m_timer; private: diff --git a/tests/auto/client/shared/coreprotocol.cpp b/tests/auto/client/shared/coreprotocol.cpp index 0d9885216..c4181cb94 100644 --- a/tests/auto/client/shared/coreprotocol.cpp +++ b/tests/auto/client/shared/coreprotocol.cpp @@ -485,7 +485,7 @@ uint Keyboard::sendKey(wl_client *client, uint key, uint state) } // Shm implementation -Shm::Shm(CoreCompositor *compositor, QVector<format> formats, int version) +Shm::Shm(CoreCompositor *compositor, QList<format> formats, int version) : QtWaylandServer::wl_shm(compositor->m_display, version) , m_compositor(compositor) , m_formats(formats) 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; diff --git a/tests/auto/client/shared/datadevice.h b/tests/auto/client/shared/datadevice.h index 98e780b22..a8c30f8f2 100644 --- a/tests/auto/client/shared/datadevice.h +++ b/tests/auto/client/shared/datadevice.h @@ -71,7 +71,7 @@ public: DataDeviceManager *m_manager = nullptr; Seat *m_seat = nullptr; - QVector<DataOffer *> m_sentSelectionOffers; + QList<DataOffer *> m_sentSelectionOffers; protected: void data_device_release(Resource *resource) override diff --git a/tests/auto/client/shared/xdgshell.cpp b/tests/auto/client/shared/xdgshell.cpp index 72582f48d..79d5ea382 100644 --- a/tests/auto/client/shared/xdgshell.cpp +++ b/tests/auto/client/shared/xdgshell.cpp @@ -168,12 +168,12 @@ XdgToplevel::XdgToplevel(XdgSurface *xdgSurface, int id, int version) connect(surface(), &Surface::commit, this, [this] { m_committed = m_pending; }); } -void XdgToplevel::sendConfigure(const QSize &size, const QVector<uint> &states) +void XdgToplevel::sendConfigure(const QSize &size, const QList<uint> &states) { send_configure(size.width(), size.height(), toByteArray(states)); } -uint XdgToplevel::sendCompleteConfigure(const QSize &size, const QVector<uint> &states) +uint XdgToplevel::sendCompleteConfigure(const QSize &size, const QList<uint> &states) { sendConfigure(size, states); return m_xdgSurface->sendConfigure(); diff --git a/tests/auto/client/shared/xdgshell.h b/tests/auto/client/shared/xdgshell.h index 618babde7..485da9d9f 100644 --- a/tests/auto/client/shared/xdgshell.h +++ b/tests/auto/client/shared/xdgshell.h @@ -48,7 +48,7 @@ public: void send_ping(uint32_t) = delete; // It's a global, use resource specific instead bool isClean() override { return m_xdgSurfaces.empty(); } QString dirtyMessage() override { return m_xdgSurfaces.empty() ? "clean" : "remaining xdg surfaces"; } - QVector<XdgSurface *> m_xdgSurfaces; + QList<XdgSurface *> m_xdgSurfaces; XdgToplevel *toplevel(int i = 0); XdgPopup *popup(int i = 0); XdgPopup *m_topmostGrabbingPopup = nullptr; @@ -86,13 +86,13 @@ public: XdgWmBase *m_xdgWmBase = nullptr; Surface *m_surface = nullptr; bool m_configureSent = false; - QVector<uint> m_pendingConfigureSerials; + QList<uint> m_pendingConfigureSerials; uint m_ackedConfigureSerial = 0; uint m_committedConfigureSerial = 0; struct DoubleBufferedState { QRect windowGeometry = {0, 0, 0, 0}; } m_pending, m_committed; - QVector<XdgPopup *> m_popups; + QList<XdgPopup *> m_popups; public slots: void verifyConfigured() { QVERIFY(m_configureSent); } @@ -115,8 +115,8 @@ class XdgToplevel : public QObject, public QtWaylandServer::xdg_toplevel Q_OBJECT public: explicit XdgToplevel(XdgSurface *xdgSurface, int id, int version = 1); - void sendConfigure(const QSize &size = {0, 0}, const QVector<uint> &states = {}); - uint sendCompleteConfigure(const QSize &size = {0, 0}, const QVector<uint> &states = {}); + void sendConfigure(const QSize &size = {0, 0}, const QList<uint> &states = {}); + uint sendCompleteConfigure(const QSize &size = {0, 0}, const QList<uint> &states = {}); Surface *surface() { return m_xdgSurface->m_surface; } XdgSurface *m_xdgSurface = nullptr; diff --git a/tests/auto/client/shared_old/mockcompositor.cpp b/tests/auto/client/shared_old/mockcompositor.cpp index 9553076dd..43b9ec839 100644 --- a/tests/auto/client/shared_old/mockcompositor.cpp +++ b/tests/auto/client/shared_old/mockcompositor.cpp @@ -199,7 +199,7 @@ void MockCompositor::sendIviSurfaceConfigure(const QSharedPointer<MockIviSurface processCommand(command); } -void MockCompositor::sendXdgToplevelV6Configure(const QSharedPointer<MockXdgToplevelV6> toplevel, const QSize &size, const QVector<uint> &states) +void MockCompositor::sendXdgToplevelV6Configure(const QSharedPointer<MockXdgToplevelV6> toplevel, const QSize &size, const QList<uint> &states) { Command command = makeCommand(Impl::Compositor::sendXdgToplevelV6Configure, m_compositor); command.parameters << QVariant::fromValue(toplevel); @@ -221,7 +221,7 @@ QSharedPointer<MockSurface> MockCompositor::surface() QSharedPointer<MockSurface> result; lock(); { - const QVector<Impl::Surface *> surfaces = m_compositor->surfaces(); + const QList<Impl::Surface *> surfaces = m_compositor->surfaces(); for (Impl::Surface *surface : surfaces) { // we don't want to mistake the cursor surface for a window surface if (surface->isMapped()) { @@ -415,12 +415,12 @@ void registerResource(wl_list *list, wl_resource *resource) wl_resource_add_destroy_listener(resource, listener); } -QVector<Surface *> Compositor::surfaces() const +QList<Surface *> Compositor::surfaces() const { return m_surfaces; } -QVector<Output *> Compositor::outputs() const +QList<Output *> Compositor::outputs() const { return m_outputs; } diff --git a/tests/auto/client/shared_old/mockcompositor.h b/tests/auto/client/shared_old/mockcompositor.h index 2433ac005..323803996 100644 --- a/tests/auto/client/shared_old/mockcompositor.h +++ b/tests/auto/client/shared_old/mockcompositor.h @@ -38,11 +38,11 @@ #include <wayland-server-core.h> #include <QImage> +#include <QList> #include <QMutex> #include <QRect> #include <QSharedPointer> #include <QVariant> -#include <QVector> #include <QWaitCondition> class MockCompositor; @@ -74,8 +74,8 @@ public: uint32_t nextSerial(); uint32_t time() { return ++m_time; } - QVector<Surface *> surfaces() const; - QVector<Output *> outputs() const; + QList<Surface *> surfaces() const; + QList<Output *> outputs() const; IviApplication *iviApplication() const; XdgShellV6 *xdgShellV6() const; @@ -130,8 +130,8 @@ private: Keyboard *m_keyboard = nullptr; Touch *m_touch = nullptr; QScopedPointer<DataDeviceManager> m_data_device_manager; - QVector<Surface *> m_surfaces; - QVector<Output *> m_outputs; + QList<Surface *> m_surfaces; + QList<Output *> m_outputs; QScopedPointer<IviApplication> m_iviApplication; QScopedPointer<WlShell> m_wlShell; QScopedPointer<XdgShellV6> m_xdgShellV6; @@ -242,7 +242,7 @@ public: void sendShellSurfaceConfigure(const QSharedPointer<MockSurface> surface, const QSize &size = QSize(0, 0)); void sendIviSurfaceConfigure(const QSharedPointer<MockIviSurface> iviSurface, const QSize &size); void sendXdgToplevelV6Configure(const QSharedPointer<MockXdgToplevelV6> toplevel, const QSize &size = QSize(0, 0), - const QVector<uint> &states = { ZXDG_TOPLEVEL_V6_STATE_ACTIVATED }); + const QList<uint> &states = { ZXDG_TOPLEVEL_V6_STATE_ACTIVATED }); void waitForStartDrag(); QSharedPointer<MockSurface> surface(); diff --git a/tests/auto/client/shared_old/mockfullscreenshellv1.h b/tests/auto/client/shared_old/mockfullscreenshellv1.h index 819bbc186..c932d4f4d 100644 --- a/tests/auto/client/shared_old/mockfullscreenshellv1.h +++ b/tests/auto/client/shared_old/mockfullscreenshellv1.h @@ -31,7 +31,7 @@ #include <qwayland-server-fullscreen-shell-unstable-v1.h> -#include <QVector> +#include <QList> namespace Impl { @@ -43,14 +43,14 @@ class FullScreenShellV1 : public QtWaylandServer::zwp_fullscreen_shell_v1 public: explicit FullScreenShellV1(::wl_display *display) : zwp_fullscreen_shell_v1(display, 1) {} - QVector<Surface *> surfaces() const { return m_surfaces; } + QList<Surface *> surfaces() const { return m_surfaces; } void removeSurface(Surface *surface) { m_surfaces.removeOne(surface); } protected: void zwp_fullscreen_shell_v1_present_surface(Resource *resource, struct ::wl_resource *surface, uint32_t method, struct ::wl_resource *output) override; private: - QVector<Surface *> m_surfaces; + QList<Surface *> m_surfaces; }; } // namespace Impl diff --git a/tests/auto/client/shared_old/mockiviapplication.h b/tests/auto/client/shared_old/mockiviapplication.h index 4d65eeaba..e2e3cb465 100644 --- a/tests/auto/client/shared_old/mockiviapplication.h +++ b/tests/auto/client/shared_old/mockiviapplication.h @@ -31,8 +31,8 @@ #include <qwayland-server-ivi-application.h> +#include <QList> #include <QSharedPointer> -#include <QVector> class MockIviSurface; @@ -67,7 +67,7 @@ class IviApplication : public QtWaylandServer::ivi_application { public: explicit IviApplication(::wl_display *display) : ivi_application(display, 1) {} - QVector<IviSurface *> iviSurfaces() const { return m_iviSurfaces; } + QList<IviSurface *> iviSurfaces() const { return m_iviSurfaces; } protected: void ivi_application_surface_create(Resource *resource, uint32_t ivi_id, ::wl_resource *surface, uint32_t id) override; @@ -75,7 +75,7 @@ protected: private: void addIviSurface(IviSurface *iviSurface) { m_iviSurfaces.append(iviSurface); } void removeIviSurface(IviSurface *iviSurface) { m_iviSurfaces.removeOne(iviSurface); } - QVector<IviSurface *> m_iviSurfaces; + QList<IviSurface *> m_iviSurfaces; friend class IviSurface; }; diff --git a/tests/auto/client/shared_old/mocksurface.cpp b/tests/auto/client/shared_old/mocksurface.cpp index e9df5f907..8ad45ae45 100644 --- a/tests/auto/client/shared_old/mocksurface.cpp +++ b/tests/auto/client/shared_old/mocksurface.cpp @@ -42,7 +42,7 @@ void Compositor::sendShellSurfaceConfigure(void *data, const QList<QVariant> &pa QSize size = parameters.at(1).toSize(); Q_ASSERT(size.isValid()); if (auto toplevel = surface->xdgToplevelV6()) { - QVector<uint> states = { ZXDG_TOPLEVEL_V6_STATE_ACTIVATED }; + QList<uint> states = { ZXDG_TOPLEVEL_V6_STATE_ACTIVATED }; auto statesBytes = QByteArray::fromRawData(reinterpret_cast<const char *>(states.data()), states.size() * static_cast<int>(sizeof(uint))); toplevel->send_configure(size.width(), size.height(), statesBytes); diff --git a/tests/auto/client/shared_old/mockxdgshellv6.h b/tests/auto/client/shared_old/mockxdgshellv6.h index a238fa562..4528dd1b4 100644 --- a/tests/auto/client/shared_old/mockxdgshellv6.h +++ b/tests/auto/client/shared_old/mockxdgshellv6.h @@ -28,8 +28,8 @@ #include <qwayland-server-xdg-shell-unstable-v6.h> +#include <QList> #include <QSharedPointer> -#include <QVector> #ifndef MOCKXDGSHELLV6_H #define MOCKXDGSHELLV6_H @@ -96,7 +96,7 @@ class XdgShellV6 : public QtWaylandServer::zxdg_shell_v6 { public: explicit XdgShellV6(::wl_display *display) : zxdg_shell_v6(display, 1) {} - QVector<XdgToplevelV6 *> toplevels() const { return m_toplevels; } + QList<XdgToplevelV6 *> toplevels() const { return m_toplevels; } protected: void zxdg_shell_v6_get_xdg_surface(Resource *resource, uint32_t id, ::wl_resource *surface) override; @@ -104,7 +104,7 @@ protected: private: void addToplevel(XdgToplevelV6 *toplevel) { m_toplevels.append(toplevel); } void removeToplevel(XdgToplevelV6 *toplevel) { m_toplevels.removeOne(toplevel); } - QVector<XdgToplevelV6 *> m_toplevels; + QList<XdgToplevelV6 *> m_toplevels; friend class XdgToplevelV6; }; diff --git a/tests/auto/client/tabletv2/tst_tabletv2.cpp b/tests/auto/client/tabletv2/tst_tabletv2.cpp index 03fb2933d..1c48a77f9 100644 --- a/tests/auto/client/tabletv2/tst_tabletv2.cpp +++ b/tests/auto/client/tabletv2/tst_tabletv2.cpp @@ -208,12 +208,12 @@ public: TabletManagerV2 *m_manager = nullptr; Seat *m_seat = nullptr; - QVector<TabletV2 *> m_tablets; - QVector<TabletV2 *> m_tabletsWaitingForDestroy; - QVector<TabletToolV2 *> m_tools; - QVector<TabletToolV2 *> m_toolsWaitingForDestroy; - QVector<TabletPadV2 *> m_pads; - QVector<TabletPadV2 *> m_padsWaitingForDestroy; + QList<TabletV2 *> m_tablets; + QList<TabletV2 *> m_tabletsWaitingForDestroy; + QList<TabletToolV2 *> m_tools; + QList<TabletToolV2 *> m_toolsWaitingForDestroy; + QList<TabletPadV2 *> m_pads; + QList<TabletPadV2 *> m_padsWaitingForDestroy; protected: void zwp_tablet_seat_v2_bind_resource(Resource *resource) @@ -445,7 +445,7 @@ class ProximityFilter : public QObject { public: ProximityFilter() { qApp->installEventFilter(this); } ~ProximityFilter() override { qDeleteAll(m_events); } - QVector<QTabletEvent *> m_events; + QList<QTabletEvent *> m_events; int nextEventIndex = 0; int numEvents() const { return m_events.size() - nextEventIndex; } @@ -621,7 +621,7 @@ signals: void tabletEventReceived(QTabletEvent *event); private: - QVector<QTabletEvent *> m_events; + QList<QTabletEvent *> m_events; }; void tst_tabletv2::moveEvent() diff --git a/tests/auto/client/xdgshell/tst_xdgshell.cpp b/tests/auto/client/xdgshell/tst_xdgshell.cpp index eabf29b7e..3007fb326 100644 --- a/tests/auto/client/xdgshell/tst_xdgshell.cpp +++ b/tests/auto/client/xdgshell/tst_xdgshell.cpp @@ -370,7 +370,7 @@ void tst_xdgshell::switchPopups() m_popups << new Popup(this); } ~Window() override { qDeleteAll(m_popups); } - QVector<Popup *> m_popups; + QList<Popup *> m_popups; }; Window window; diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 1397414af..0904a499d 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -1107,7 +1107,7 @@ void tst_WaylandCompositor::sendsXdgConfigure() QTRY_VERIFY(!toplevel->fullscreen()); QTRY_VERIFY(!toplevel->resizing()); - toplevel->sendConfigure(QSize(10, 20), QVector<QWaylandXdgToplevel::State>{QWaylandXdgToplevel::State::ActivatedState}); + toplevel->sendConfigure(QSize(10, 20), QList<QWaylandXdgToplevel::State>{QWaylandXdgToplevel::State::ActivatedState}); compositor.flushClients(); QTRY_COMPARE(mockToplevel.configureStates, QList<uint>{QWaylandXdgToplevel::State::ActivatedState}); QTRY_COMPARE(mockToplevel.configureSize, QSize(10, 20)); @@ -1154,7 +1154,7 @@ void tst_WaylandCompositor::sendsXdgConfigure() QTRY_VERIFY(mockToplevel.configureStates.contains(QWaylandXdgToplevel::State::ActivatedState)); QTRY_VERIFY(!mockToplevel.configureStates.contains(QWaylandXdgToplevel::State::FullscreenState)); - toplevel->sendConfigure(QSize(0, 0), QVector<QWaylandXdgToplevel::State>{}); + toplevel->sendConfigure(QSize(0, 0), QList<QWaylandXdgToplevel::State>{}); compositor.flushClients(); QTRY_VERIFY(!mockToplevel.configureStates.contains(QWaylandXdgToplevel::State::ActivatedState)); |