From a06333719ba26dc55c733356859a76cb1e20ff82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Fri, 8 Aug 2025 10:08:55 +0200
Subject: [PATCH] espuino: Add Qt6 support

---
 espuino/espuino.pro                  |  3 +--
 espuino/integrationpluginespuino.cpp | 24 +++++++++++-------------
 espuino/integrationpluginespuino.h   | 10 +++++-----
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/espuino/espuino.pro b/espuino/espuino.pro
index efefd13f..a1a5d94f 100644
--- a/espuino/espuino.pro
+++ b/espuino/espuino.pro
@@ -1,7 +1,6 @@
 include(../plugins.pri)
 
-QT += network \
-      websockets
+QT *= network websockets
 
 PKGCONFIG += nymea-mqtt
 
diff --git a/espuino/integrationpluginespuino.cpp b/espuino/integrationpluginespuino.cpp
index 42d3054b..dfe79384 100644
--- a/espuino/integrationpluginespuino.cpp
+++ b/espuino/integrationpluginespuino.cpp
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -30,15 +30,13 @@
 
 #include "integrationpluginespuino.h"
 
-#include "integrations/integrationplugin.h"
-
 #include "plugininfo.h"
 
-#include "network/networkaccessmanager.h"
-#include "network/mqtt/mqttprovider.h"
-#include "network/mqtt/mqttchannel.h"
-#include "network/zeroconf/zeroconfservicebrowser.h"
-#include "platform/platformzeroconfcontroller.h"
+#include <network/networkaccessmanager.h>
+#include <network/mqtt/mqttprovider.h>
+#include <network/mqtt/mqttchannel.h>
+#include <network/zeroconf/zeroconfservicebrowser.h>
+#include <platform/platformzeroconfcontroller.h>
 
 #include <mqttclient.h>
 
@@ -46,6 +44,7 @@
 #include <QJsonDocument>
 #include <QNetworkReply>
 #include <QUrlQuery>
+#include <QRegularExpression>
 
 void IntegrationPluginEspuino::init()
 {
@@ -55,10 +54,9 @@ void IntegrationPluginEspuino::init()
 void IntegrationPluginEspuino::discoverThings(ThingDiscoveryInfo *info)
 {
     foreach (const ZeroConfServiceEntry &entry, m_zeroConfBrowser->serviceEntries()) {
-        QRegExp match("espuino.*");
-        if (!match.exactMatch(entry.name())) {
+
+        if (!QRegularExpression("espuino.*").match(entry.name()).hasMatch())
             continue;
-        }
 
         qCDebug(dcESPuino()) << "Found device:" << entry;
         ThingDescriptor descriptor(info->thingClassId(), entry.hostName(), entry.hostAddress().toString());
@@ -421,7 +419,7 @@ void IntegrationPluginEspuino::browseThing(BrowseResult *result)
 
 void IntegrationPluginEspuino::browseThing(BrowseResult *result, const QString &path)
 {
-    QUrl url(QString("http://%1/explorer?path=%2").arg(getHost(result->thing())).arg(path.isEmpty() ? "/" : path));
+    QUrl url(QString("http://%1/explorer?path=%2").arg(getHost(result->thing()), path.isEmpty() ? "/" : path));
     QNetworkRequest request(url);
     QNetworkReply *reply = hardwareManager()->networkManager()->get(request);
     connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
@@ -450,7 +448,7 @@ void IntegrationPluginEspuino::browseThing(BrowseResult *result, const QString &
             if (variantMap.value("dir").toBool()) {
                 id.addQueryItem("playmode", QString::number(5));
                 id.addQueryItem("type", "dir");
-            } else if (variantMap.value("name").toString().contains(QRegExp("\\.(:?mp3|ogg|wav|wma|acc|m4a|flac)$", Qt::CaseInsensitive))) {
+            } else if (variantMap.value("name").toString().contains(QRegularExpression("\\.(:?mp3|ogg|wav|wma|acc|m4a|flac)$", QRegularExpression::CaseInsensitiveOption))) {
                 id.addQueryItem("playmode", QString::number(1));
                 id.addQueryItem("type", "audiofile");
             } else if (variantMap.value("name").toString().endsWith(".m3u", Qt::CaseInsensitive)) {
diff --git a/espuino/integrationpluginespuino.h b/espuino/integrationpluginespuino.h
index 3e4d224c..87b171f0 100644
--- a/espuino/integrationpluginespuino.h
+++ b/espuino/integrationpluginespuino.h
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -31,8 +31,8 @@
 #ifndef INTEGRATIONPLUGINESPUINO_H
 #define INTEGRATIONPLUGINESPUINO_H
 
-#include "integrations/integrationplugin.h"
-#include "plugintimer.h"
+#include <integrations/integrationplugin.h>
+#include <plugintimer.h>
 
 #include <QHash>
 
@@ -69,8 +69,8 @@ private slots:
 private:
     QString getHost(Thing *thing) const;
 
-    ZeroConfServiceBrowser *m_zeroConfBrowser;
-    QHash<Thing*, MqttChannel*> m_mqttChannels;
+    ZeroConfServiceBrowser *m_zeroConfBrowser = nullptr;
+    QHash<Thing *, MqttChannel *> m_mqttChannels;
     QHash<ThingClassId, ParamTypeId> m_ipAddressParamTypeMap;
     QMap<QString, QPointer<ThingActionInfo>> m_pendingActions;
 };