2 files changed, 8 insertions, 8 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 66f5eba4..5c44f8ad 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -289,7 +289,7 @@ void QWaylandCompositorPrivate::addPolishObject(QObject *object)
 void QWaylandCompositorPrivate::connectToExternalSockets()
 {
     // Clear out any backlog of user-supplied external socket descriptors
-    for (int fd : qAsConst(externally_added_socket_fds)) {
+    for (int fd : std::as_const(externally_added_socket_fds)) {
         if (wl_display_add_socket_fd(display, fd) != 0)
             qWarning() << "Failed to integrate user-supplied socket fd into the Wayland event loop";
     }
@@ -373,14 +373,14 @@ void QWaylandCompositorPrivate::initializeHardwareIntegration()
     loadClientBufferIntegration();
     loadServerBufferIntegration();
 
-    for (auto *integration : qAsConst(client_buffer_integrations))
+    for (auto *integration : std::as_const(client_buffer_integrations))
         integration->initializeHardware(display);
 #endif
 }
 
 void QWaylandCompositorPrivate::initializeSeats()
 {
-    for (QWaylandSeat *seat : qAsConst(seats))
+    for (QWaylandSeat *seat : std::as_const(seats))
         seat->initialize();
 }
 
@@ -410,7 +410,7 @@ void QWaylandCompositorPrivate::loadClientBufferIntegration()
 
     QString hwIntegrationName;
 
-    for (auto targetKey : qAsConst(targetKeys)) {
+    for (auto targetKey : std::as_const(targetKeys)) {
         auto *integration = QtWayland::ClientBufferIntegrationFactory::create(targetKey, QStringList());
         if (integration) {
             integration->setCompositor(q);
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 88147944..84fef3c0 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -101,9 +101,9 @@ QWaylandSurfacePrivate::~QWaylandSurfacePrivate()
 
     bufferRef = QWaylandBufferRef();
 
-    for (QtWayland::FrameCallback *c : qAsConst(pendingFrameCallbacks))
+    for (QtWayland::FrameCallback *c : std::as_const(pendingFrameCallbacks))
         c->destroy();
-    for (QtWayland::FrameCallback *c : qAsConst(frameCallbacks))
+    for (QtWayland::FrameCallback *c : std::as_const(frameCallbacks))
         c->destroy();
 }
 
@@ -276,7 +276,7 @@ void QWaylandSurfacePrivate::surface_commit(Resource *)
     // Notify buffers and views
     if (auto *buffer = bufferRef.buffer())
         buffer->setCommitted(damage);
-    for (auto *view : qAsConst(views))
+    for (auto *view : std::as_const(views))
         view->bufferCommitted(bufferRef, damage);
 
     // Now all double-buffered state has been applied so it's safe to emit general signals
@@ -705,7 +705,7 @@ QWaylandCompositor *QWaylandSurface::compositor() const
 void QWaylandSurface::frameStarted()
 {
     Q_D(QWaylandSurface);
-    for (QtWayland::FrameCallback *c : qAsConst(d->frameCallbacks))
+    for (QtWayland::FrameCallback *c : std::as_const(d->frameCallbacks))
         c->canSend = true;
 }