1 files changed, 9 insertions, 8 deletions

diff --git a/src/plugins/generic/tuiotouch/qtuiohandler.cpp b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
index 07f0589078..2815368e84 100644
--- a/src/plugins/generic/tuiotouch/qtuiohandler.cpp
+++ b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
@@ -39,7 +39,7 @@ QTuioHandler::QTuioHandler(const QString &specification)
     bool invertx = false;
     bool inverty = false;
 
-    for (int i = 0; i < args.count(); ++i) {
+    for (int i = 0; i < args.size(); ++i) {
         if (args.at(i).startsWith("udp=")) {
             QString portString = args.at(i).section('=', 1, 1);
             portNumber = portString.toInt();
@@ -59,6 +59,7 @@ QTuioHandler::QTuioHandler(const QString &specification)
             case 180:
             case 270:
                 rotationAngle = argValue;
+                break;
             default:
                 break;
             }
@@ -136,7 +137,7 @@ void QTuioHandler::processPackets()
             messages.push_back(msg);
         }
 
-        for (const QOscMessage &message : qAsConst(messages)) {
+        for (const QOscMessage &message : std::as_const(messages)) {
             if (message.addressPattern() == "/tuio/2Dcur") {
                 QList<QVariant> arguments = message.arguments();
                 if (arguments.size() == 0) {
@@ -326,7 +327,7 @@ void QTuioHandler::process2DCurFseq(const QOscMessage &message)
     Q_UNUSED(message); // TODO: do we need to do anything with the frame id?
 
     QWindow *win = QGuiApplication::focusWindow();
-    if (!win && QGuiApplication::topLevelWindows().length() > 0 && forceDelivery)
+    if (!win && QGuiApplication::topLevelWindows().size() > 0 && forceDelivery)
           win = QGuiApplication::topLevelWindows().at(0);
 
     if (!win)
@@ -335,12 +336,12 @@ void QTuioHandler::process2DCurFseq(const QOscMessage &message)
     QList<QWindowSystemInterface::TouchPoint> tpl;
     tpl.reserve(m_activeCursors.size() + m_deadCursors.size());
 
-    for (const QTuioCursor &tc : qAsConst(m_activeCursors)) {
+    for (const QTuioCursor &tc : std::as_const(m_activeCursors)) {
         QWindowSystemInterface::TouchPoint tp = cursorToTouchPoint(tc, win);
         tpl.append(tp);
     }
 
-    for (const QTuioCursor &tc : qAsConst(m_deadCursors)) {
+    for (const QTuioCursor &tc : std::as_const(m_deadCursors)) {
         QWindowSystemInterface::TouchPoint tp = cursorToTouchPoint(tc, win);
         tp.state = QEventPoint::State::Released;
         tpl.append(tp);
@@ -499,7 +500,7 @@ void QTuioHandler::process2DObjFseq(const QOscMessage &message)
     Q_UNUSED(message); // TODO: do we need to do anything with the frame id?
 
     QWindow *win = QGuiApplication::focusWindow();
-    if (!win && QGuiApplication::topLevelWindows().length() > 0 && forceDelivery)
+    if (!win && QGuiApplication::topLevelWindows().size() > 0 && forceDelivery)
           win = QGuiApplication::topLevelWindows().at(0);
 
     if (!win)
@@ -508,12 +509,12 @@ void QTuioHandler::process2DObjFseq(const QOscMessage &message)
     QList<QWindowSystemInterface::TouchPoint> tpl;
     tpl.reserve(m_activeTokens.size() + m_deadTokens.size());
 
-    for (const QTuioToken & t : qAsConst(m_activeTokens)) {
+    for (const QTuioToken & t : std::as_const(m_activeTokens)) {
         QWindowSystemInterface::TouchPoint tp = tokenToTouchPoint(t, win);
         tpl.append(tp);
     }
 
-    for (const QTuioToken & t : qAsConst(m_deadTokens)) {
+    for (const QTuioToken & t : std::as_const(m_deadTokens)) {
         QWindowSystemInterface::TouchPoint tp = tokenToTouchPoint(t, win);
         tp.state = QEventPoint::State::Released;
         tp.velocity = QVector2D();