Port from qAsConst() to std::as_const()

We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.

Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.

Task-number: QTBUG-99313
Change-Id: Ia64c6615ee81f7ad5d0658449b0ee347c3db8c29
Reviewed-by: David Edmundson <davidedmundson@kde.org>

5 files changed, 20 insertions, 20 deletions

diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 48331c5a..ca5669ad 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -455,7 +455,7 @@ void QWaylandDisplay::checkTextInputProtocol()
 
 QWaylandScreen *QWaylandDisplay::screenForOutput(struct wl_output *output) const
 {
-    for (auto screen : qAsConst(mScreens)) {
+    for (auto screen : std::as_const(mScreens)) {
         if (screen->output() == output)
             return screen;
     }
@@ -519,12 +519,12 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
 #if QT_WAYLAND_TEXT_INPUT_V4_WIP
             mTextInputManagerv4.reset();
 #endif // QT_WAYLAND_TEXT_INPUT_V4_WIP
-            for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+            for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
                 inputDevice->setTextInput(nullptr);
         }
 
         mTextInputMethodManager.reset(new QtWayland::qt_text_input_method_manager_v1(registry, id, 1));
-        for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+        for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
             inputDevice->setTextInputMethod(new QWaylandTextInputMethod(this, mTextInputMethodManager->get_text_input_method(inputDevice->wl_seat())));
         mWaylandIntegration->reconfigureInputContext();
         mTextInputManagerIndex = mTextInputManagerList.indexOf(interface);
@@ -537,12 +537,12 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
 #if QT_WAYLAND_TEXT_INPUT_V4_WIP
             mTextInputManagerv4.reset();
 #endif // QT_WAYLAND_TEXT_INPUT_V4_WIP
-            for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+            for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
                 inputDevice->setTextInputMethod(nullptr);
         }
 
         mTextInputManagerv1.reset(new QtWayland::zwp_text_input_manager_v1(registry, id, 1));
-        for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices)) {
+        for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices)) {
             auto textInput = new QWaylandTextInputv1(this, mTextInputManagerv1->create_text_input());
             textInput->setSeat(inputDevice->wl_seat());
             inputDevice->setTextInput(textInput);
@@ -559,12 +559,12 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
 #if QT_WAYLAND_TEXT_INPUT_V4_WIP
             mTextInputManagerv4.reset();
 #endif // QT_WAYLAND_TEXT_INPUT_V4_WIP
-            for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+            for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
                 inputDevice->setTextInputMethod(nullptr);
         }
 
         mTextInputManagerv2.reset(new QtWayland::zwp_text_input_manager_v2(registry, id, 1));
-        for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+        for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
             inputDevice->setTextInput(new QWaylandTextInputv2(this, mTextInputManagerv2->get_text_input(inputDevice->wl_seat())));
         mWaylandIntegration->reconfigureInputContext();
         mTextInputManagerIndex = mTextInputManagerList.indexOf(interface);
@@ -575,12 +575,12 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
         if (mTextInputManagerIndex < INT_MAX) {
             mTextInputMethodManager.reset();
             mTextInputManagerv2.reset();
-            for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+            for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
                 inputDevice->setTextInputMethod(nullptr);
         }
 
         mTextInputManagerv4.reset(new QtWayland::zwp_text_input_manager_v4(registry, id, 1));
-        for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+        for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
             inputDevice->setTextInput(new QWaylandTextInputv4(this, mTextInputManagerv4->get_text_input(inputDevice->wl_seat())));
         mWaylandIntegration->reconfigureInputContext();
         mTextInputManagerIndex = mTextInputManagerList.indexOf(interface);
@@ -595,7 +595,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
         }
     } else if (interface == QLatin1String(QWaylandXdgOutputManagerV1::interface()->name)) {
         mXdgOutputManager.reset(new QWaylandXdgOutputManagerV1(this, id, version));
-        for (auto *screen : qAsConst(mWaitingScreens))
+        for (auto *screen : std::as_const(mWaitingScreens))
             screen->initXdgOutput(xdgOutputManager());
         forceRoundTrip();
     }
@@ -622,7 +622,7 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
                     }
                 }
 
-                for (QWaylandScreen *screen : qAsConst(mScreens)) {
+                for (QWaylandScreen *screen : std::as_const(mScreens)) {
                     if (screen->outputId() == id) {
                         mScreens.removeOne(screen);
                         // If this is the last screen, we have to add a fake screen, or Qt will break.
@@ -634,27 +634,27 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
             }
             if (global.interface == QLatin1String(QtWayland::zwp_text_input_manager_v1::interface()->name)) {
                 mTextInputManagerv1.reset();
-                for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+                for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
                     inputDevice->setTextInput(nullptr);
                 mWaylandIntegration->reconfigureInputContext();
             }
             if (global.interface == QLatin1String(QtWayland::zwp_text_input_manager_v2::interface()->name)) {
                 mTextInputManagerv2.reset();
-                for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+                for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
                     inputDevice->setTextInput(nullptr);
                 mWaylandIntegration->reconfigureInputContext();
             }
 #if QT_WAYLAND_TEXT_INPUT_V4_WIP
             if (global.interface == QLatin1String(QtWayland::zwp_text_input_manager_v4::interface()->name)) {
                 mTextInputManagerv4.reset();
-                for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+                for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
                     inputDevice->setTextInput(nullptr);
                 mWaylandIntegration->reconfigureInputContext();
             }
 #endif // QT_WAYLAND_TEXT_INPUT_V4_WIP
             if (global.interface == QLatin1String(QtWayland::qt_text_input_method_manager_v1::interface()->name)) {
                 mTextInputMethodManager.reset();
-                for (QWaylandInputDevice *inputDevice : qAsConst(mInputDevices))
+                for (QWaylandInputDevice *inputDevice : std::as_const(mInputDevices))
                     inputDevice->setTextInputMethod(nullptr);
                 mWaylandIntegration->reconfigureInputContext();
             }
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index 9ff63b3b..56c89688 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -1465,7 +1465,7 @@ void QWaylandInputDevice::handleTouchPoint(int id, QEventPoint::State state, con
 
 bool QWaylandInputDevice::Touch::allTouchPointsReleased()
 {
-    for (const auto &tp : qAsConst(mPendingTouchPoints)) {
+    for (const auto &tp : std::as_const(mPendingTouchPoints)) {
         if (tp.state != QEventPoint::Released)
             return false;
     }
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index 6d74de13..9ee38118 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -422,7 +422,7 @@ void QWaylandIntegration::initializeShellIntegration()
         preferredShells << QLatin1String("qt-shell");
     }
 
-    for (const QString &preferredShell : qAsConst(preferredShells)) {
+    for (const QString &preferredShell : std::as_const(preferredShells)) {
         mShellIntegration.reset(createShellIntegration(preferredShell));
         if (mShellIntegration) {
             qCDebug(lcQpaWayland, "Using the '%s' shell integration", qPrintable(preferredShell));
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp
index fd56a252..4f75d205 100644
--- a/src/client/qwaylandscreen.cpp
+++ b/src/client/qwaylandscreen.cpp
@@ -150,7 +150,7 @@ QList<QPlatformScreen *> QWaylandScreen::virtualSiblings() const
 
     list.reserve(screens.size() + (placeholder ? 1 : 0));
 
-    for (QWaylandScreen *screen : qAsConst(screens)) {
+    for (QWaylandScreen *screen : std::as_const(screens)) {
         if (screen->screen())
             list << screen;
     }
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 73a14b89..4fd012de 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -559,7 +559,7 @@ void QWaylandWindow::sendRecursiveExposeEvent()
         return;
     sendExposeEvent(QRect(QPoint(), geometry().size()));
 
-    for (QWaylandSubSurface *subSurface : qAsConst(mChildren)) {
+    for (QWaylandSubSurface *subSurface : std::as_const(mChildren)) {
         auto subWindow = subSurface->window();
         subWindow->sendRecursiveExposeEvent();
     }
@@ -924,7 +924,7 @@ bool QWaylandWindow::createDecoration()
     }
 
     if (hadDecoration != mWindowDecorationEnabled) {
-        for (QWaylandSubSurface *subsurf : qAsConst(mChildren)) {
+        for (QWaylandSubSurface *subsurf : std::as_const(mChildren)) {
             QPoint pos = subsurf->window()->geometry().topLeft();
             QMargins m = frameMargins();
             subsurf->set_position(pos.x() + m.left(), pos.y() + m.top());