From 1e25b81e0d6c1da4643c9cc48680f5cc4399d068 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 6 Jul 2020 12:34:58 +0200 Subject: Use QList instead of QVector in plugins Task-number: QTBUG-84469 Change-Id: Ic86f4a3000592a1c9ae62e4a83f4fe39832a6b24 Reviewed-by: Friedemann Kleint --- src/plugins/platforms/eglfs/api/qeglfscursor_p.h | 4 ++-- .../platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h | 4 ++-- .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp | 2 +- .../platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h | 2 +- .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp | 2 +- .../platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h | 4 ++-- .../eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp | 2 +- .../eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp | 4 ++-- .../eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h | 2 +- .../eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.cpp | 2 +- .../eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.h | 2 +- .../eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h | 2 +- .../eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.h | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/plugins/platforms/eglfs') diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h index 7a6044aca0..ea1212ace8 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h @@ -59,7 +59,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE @@ -145,7 +145,7 @@ private: int cursorsPerRow; int width, height; // width and height of the atlas int cursorWidth, cursorHeight; // width and height of cursors inside the atlas - QVector hotSpots; + QList hotSpots; QImage image; // valid until it's uploaded } m_cursorAtlas; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h index 5d2dfedba2..55420cef62 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h @@ -41,7 +41,7 @@ #define QEGLFSKMSGBMCURSOR_H #include -#include +#include #include #include @@ -112,7 +112,7 @@ private: int cursorsPerRow; int width, height; // width and height of the atlas int cursorWidth, cursorHeight; // width and height of cursors inside the atlas - QVector hotSpots; + QList hotSpots; QImage image; } m_cursorAtlas; }; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp index 503419cf91..d32e36b04d 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp @@ -150,7 +150,7 @@ QPlatformScreen *QEglFSKmsGbmDevice::createHeadlessScreen() void QEglFSKmsGbmDevice::registerScreenCloning(QPlatformScreen *screen, QPlatformScreen *screenThisScreenClones, - const QVector &screensCloningThisScreen) + const QList &screensCloningThisScreen) { if (!screenThisScreenClones && screensCloningThisScreen.isEmpty()) return; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h index f1476f8ffa..1964b30c5e 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h @@ -69,7 +69,7 @@ public: QPlatformScreen *createHeadlessScreen() override; void registerScreenCloning(QPlatformScreen *screen, QPlatformScreen *screenThisScreenClones, - const QVector &screensCloningThisScreen) override; + const QList &screensCloningThisScreen) override; void registerScreen(QPlatformScreen *screen, bool isPrimary, const QPoint &virtualPos, diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp index 6f5c3b6953..efb0b1b060 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp @@ -198,7 +198,7 @@ void QEglFSKmsGbmScreen::resetSurface() } void QEglFSKmsGbmScreen::initCloning(QPlatformScreen *screenThisScreenClones, - const QVector &screensCloningThisScreen) + const QList &screensCloningThisScreen) { // clone destinations need to know the clone source const bool clonesAnother = screenThisScreenClones != nullptr; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h index 69feeee703..2be1630e19 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h @@ -64,7 +64,7 @@ public: void resetSurface(); void initCloning(QPlatformScreen *screenThisScreenClones, - const QVector &screensCloningThisScreen); + const QList &screensCloningThisScreen); void waitForFlip() override; @@ -98,7 +98,7 @@ private: QEglFSKmsGbmScreen *screen = nullptr; bool cloneFlipPending = false; }; - QVector m_cloneDests; + QList m_cloneDests; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp index 3e78196227..a480a390d1 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp @@ -171,7 +171,7 @@ void QEglFSKmsEglDeviceWindow::resetSurface() qCDebug(qLcEglfsKmsDebug, "Output has %d layers", count); - QVector layers; + QList layers; layers.resize(count); EGLint actualCount; if (!m_integration->m_funcs->get_output_layers(display, nullptr, layers.data(), count, &actualCount)) { diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp index 959f17eba3..59d7ec104c 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp @@ -218,9 +218,9 @@ qreal QEglFSKmsScreen::refreshRate() const return refresh > 0 ? refresh : 60; } -QVector QEglFSKmsScreen::modes() const +QList QEglFSKmsScreen::modes() const { - QVector list; + QList list; list.reserve(m_output.modes.size()); for (const drmModeModeInfo &info : qAsConst(m_output.modes)) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h index 0f0b10a980..103476bc54 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h @@ -83,7 +83,7 @@ public: QList virtualSiblings() const override { return m_siblings; } void setVirtualSiblings(QList sl) { m_siblings = sl; } - QVector modes() const override; + QList modes() const override; int currentMode() const override; int preferredMode() const override; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.cpp index 44f855910c..62ad58c3f5 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.cpp @@ -122,7 +122,7 @@ QPlatformScreen *QEglFSKmsVsp2Device::createHeadlessScreen() void QEglFSKmsVsp2Device::registerScreenCloning(QPlatformScreen *screen, QPlatformScreen *screenThisScreenClones, - const QVector &screensCloningThisScreen) + const QList &screensCloningThisScreen) { Q_UNUSED(screen); qWarning() << Q_FUNC_INFO << "Not implemented yet"; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.h index c795fa4005..3926f809c4 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2device.h @@ -65,7 +65,7 @@ public: QPlatformScreen *createHeadlessScreen() override; void registerScreenCloning(QPlatformScreen *screen, QPlatformScreen *screenThisScreenClones, - const QVector &screensCloningThisScreen) override; + const QList &screensCloningThisScreen) override; private: Q_DISABLE_COPY(QEglFSKmsVsp2Device) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h index 378786643d..9aa23d90a6 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h @@ -97,7 +97,7 @@ private: std::array m_frameBuffers; uint m_backFb = 0; void initDumbFrameBuffer(FrameBuffer &fb); - QVector m_blendFinishedCallbacks; + QList m_blendFinishedCallbacks; struct DmaBuffer { //these are for qt buffers before blending with additional layers (gbm buffer data) int dmabufFd = -1; diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.h index ee34ae654a..ae157129df 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.h @@ -40,8 +40,8 @@ #ifndef QVSP2BLENDINGDEVICE_H #define QVSP2BLENDINGDEVICE_H +#include #include -#include #include #include "qlinuxmediadevice.h" @@ -86,7 +86,7 @@ private: struct media_pad *bruInputFormatPad = nullptr; // bru:x QLinuxMediaDevice::OutputSubDevice *rpfInput = nullptr; // rpf.x input }; - QVector m_inputs; + QList m_inputs; const QSize m_screenSize; bool m_dirty = true; }; -- cgit v1.2.3