From afe5668bb6d181e7cd067439c86c84d9ae48400b Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Tue, 4 Jun 2019 20:11:32 +0200
Subject: [PATCH] QWaylandShmBackingStore: replace a QLinkedList with std::list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

...and mark the module QLinkedList-free.

QLinkedList is going to be deprecated.

Change-Id: Ieb9efef24cd8677edc1262f22b7c6d41b6376347
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
---
 .../platforms/wayland/qwaylandshmbackingstore.cpp  | 14 +++++++-------
 .../platforms/wayland/qwaylandshmbackingstore_p.h  |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
index d768e7fc236..9b5971a21e9 100644
--- a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
@@ -249,7 +249,7 @@ QWaylandShmBuffer *QWaylandShmBackingStore::getBuffer(const QSize &size)
             if (b->size() == size) {
                 return b;
             } else {
-                mBuffers.removeOne(b);
+                mBuffers.remove(b);
                 if (mBackBuffer == b)
                     mBackBuffer = nullptr;
                 delete b;
@@ -257,11 +257,11 @@ QWaylandShmBuffer *QWaylandShmBackingStore::getBuffer(const QSize &size)
         }
     }
 
-    static const int MAX_BUFFERS = 5;
-    if (mBuffers.count() < MAX_BUFFERS) {
+    static const size_t MAX_BUFFERS = 5;
+    if (mBuffers.size() < MAX_BUFFERS) {
         QImage::Format format = QPlatformScreen::platformScreenForWindow(window())->format();
         QWaylandShmBuffer *b = new QWaylandShmBuffer(mDisplay, size, format, waylandWindow()->scale());
-        mBuffers.prepend(b);
+        mBuffers.push_front(b);
         return b;
     }
     return nullptr;
@@ -300,9 +300,9 @@ void QWaylandShmBackingStore::resize(const QSize &size)
 
     // ensure the new buffer is at the beginning of the list so next time getBuffer() will pick
     // it if possible
-    if (mBuffers.first() != buffer) {
-        mBuffers.removeOne(buffer);
-        mBuffers.prepend(buffer);
+    if (mBuffers.front() != buffer) {
+        mBuffers.remove(buffer);
+        mBuffers.push_front(buffer);
     }
 
     if (windowDecoration() && window()->isVisible() && oldSizeInBytes != newSizeInBytes)
diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h b/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h
index 88ecfc5ece1..8a85cd7f34a 100644
--- a/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h
+++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h
@@ -57,7 +57,8 @@
 #include <QtGui/QImage>
 #include <qpa/qplatformwindow.h>
 #include <QMutex>
-#include <QLinkedList>
+
+#include <list>
 
 QT_BEGIN_NAMESPACE
 
@@ -116,7 +117,7 @@ private:
     QWaylandShmBuffer *getBuffer(const QSize &size);
 
     QWaylandDisplay *mDisplay = nullptr;
-    QLinkedList<QWaylandShmBuffer *> mBuffers;
+    std::list<QWaylandShmBuffer *> mBuffers;
     QWaylandShmBuffer *mFrontBuffer = nullptr;
     QWaylandShmBuffer *mBackBuffer = nullptr;
     bool mPainting = false;