2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
index 9aba996bb9..4bafe83156 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
@@ -208,7 +208,7 @@ void QXcbConnection::updateScreen(QXcbScreen *screen, const xcb_randr_output_cha
             const int idx = m_screens.indexOf(screen);
             if (idx > 0) {
                 qAsConst(m_screens).first()->setPrimary(false);
-                m_screens.swap(0, idx);
+                m_screens.swapItemsAt(0, idx);
             }
             screen->virtualDesktop()->setPrimaryScreen(screen);
             QXcbIntegration::instance()->setPrimaryScreen(screen);
@@ -260,7 +260,7 @@ void QXcbConnection::destroyScreen(QXcbScreen *screen)
             newPrimary->setPrimary(true);
             const int idx = m_screens.indexOf(newPrimary);
             if (idx > 0)
-                m_screens.swap(0, idx);
+                m_screens.swapItemsAt(0, idx);
             QXcbIntegration::instance()->setPrimaryScreen(newPrimary);
         }
 
diff --git a/src/plugins/platforms/xcb/qxcbeventqueue.cpp b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
index f6158d3127..527bca26a8 100644
--- a/src/plugins/platforms/xcb/qxcbeventqueue.cpp
+++ b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
@@ -260,7 +260,7 @@ qint32 QXcbEventQueue::generatePeekerId()
 
 bool QXcbEventQueue::removePeekerId(qint32 peekerId)
 {
-    const auto it = m_peekerToNode.find(peekerId);
+    const auto it = m_peekerToNode.constFind(peekerId);
     if (it == m_peekerToNode.constEnd()) {
         qCWarning(lcQpaXcb, "failed to remove unknown peeker id: %d", peekerId);
         return false;
@@ -279,7 +279,7 @@ bool QXcbEventQueue::peekEventQueue(PeekerCallback peeker, void *peekerData,
     const bool peekerIdProvided = peekerId != -1;
     auto peekerToNodeIt = m_peekerToNode.find(peekerId);
 
-    if (peekerIdProvided && peekerToNodeIt == m_peekerToNode.constEnd()) {
+    if (peekerIdProvided && peekerToNodeIt == m_peekerToNode.end()) {
         qCWarning(lcQpaXcb, "failed to find index for unknown peeker id: %d", peekerId);
         return false;
     }
@@ -339,7 +339,7 @@ bool QXcbEventQueue::peekEventQueue(PeekerCallback peeker, void *peekerData,
         // Before updating, make sure that a peeker callback did not remove
         // the peeker id.
         peekerToNodeIt = m_peekerToNode.find(peekerId);
-        if (peekerToNodeIt != m_peekerToNode.constEnd())
+        if (peekerToNodeIt != m_peekerToNode.end())
             *peekerToNodeIt = node; // id still in the cache, update node
     }