From 673a25ef8de5a098d48daf13fbf92a4f3adcb4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Mon, 11 Aug 2025 14:54:30 +0200
Subject: [PATCH] unifi: Add Qt6 support

---
 unifi/integrationpluginunifi.cpp | 8 ++++----
 unifi/integrationpluginunifi.h   | 9 ++++-----
 unifi/unifi.pro                  | 6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/unifi/integrationpluginunifi.cpp b/unifi/integrationpluginunifi.cpp
index a09a1e70..d8e908c3 100644
--- a/unifi/integrationpluginunifi.cpp
+++ b/unifi/integrationpluginunifi.cpp
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2020, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -144,7 +144,7 @@ void IntegrationPluginUnifi::discoverThings(ThingDiscoveryInfo *info)
                             } else {
                                 QVariantList clients = response.value("data").toList();
                                 foreach (const QVariant &clientVariant, clients) {
-//                                    qCDebug(dcUnifi()) << "client:" << qUtf8Printable(QJsonDocument::fromVariant(clientVariant).toJson());
+                                    // qCDebug(dcUnifi()) << "client:" << qUtf8Printable(QJsonDocument::fromVariant(clientVariant).toJson());
 
                                     QString name = clientVariant.toMap().value("name").toString();
                                     if (name.isEmpty()) {
@@ -262,7 +262,7 @@ void IntegrationPluginUnifi::setupThing(ThingSetupInfo *info)
         QNetworkReply *reply = hardwareManager()->networkManager()->post(request, QJsonDocument::fromVariant(login).toJson());
 
         connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
-        connect(reply, &QNetworkReply::finished, info, [this, info, reply](){
+        connect(reply, &QNetworkReply::finished, info, [info, reply](){
             if (reply->error() != QNetworkReply::NoError) {
                 qCWarning(dcUnifi()) << "SetupThing: Network request error:" << reply->error() << reply->errorString();
                 info->finish(Thing::ThingErrorHardwareFailure);
@@ -348,7 +348,7 @@ void IntegrationPluginUnifi::postSetupThing(Thing *thing)
                         return;
                     }
 
-//                    qCDebug(dcUnifi()) << "Client is present reply" << qUtf8Printable(jsonDoc.toJson());
+                    //                    qCDebug(dcUnifi()) << "Client is present reply" << qUtf8Printable(jsonDoc.toJson());
                     QVariantList clientEntries = jsonDoc.toVariant().toMap().value("data").toList();
                     if (clientEntries.count() != 1) {
                         qCWarning(dcUnifi()) << "Client data not found in controller reply";
diff --git a/unifi/integrationpluginunifi.h b/unifi/integrationpluginunifi.h
index b1806175..29a1d94c 100644
--- a/unifi/integrationpluginunifi.h
+++ b/unifi/integrationpluginunifi.h
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2020, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -33,7 +33,7 @@
 
 #include <QObject>
 
-#include "integrations/integrationplugin.h"
+#include <integrations/integrationplugin.h>
 
 #include <QNetworkRequest>
 
@@ -56,7 +56,6 @@ public:
     void setupThing(ThingSetupInfo *info) override;
     void postSetupThing(Thing *thing) override;
     void thingRemoved(Thing *thing) override;
-//    void executeAction(ThingActionInfo *info) override;
 
 private:
     QNetworkRequest createRequest(const QString &address, uint port, const QString &path, const QString &prefix = QString());
@@ -64,8 +63,8 @@ private:
 
     void markOffline(Thing *thing);
 private:
-    QHash<ThingDiscoveryInfo*, Things> m_pendingDiscoveries;
-    QHash<Thing*, QStringList> m_pendingSiteDiscoveries;
+    QHash<ThingDiscoveryInfo *, Things> m_pendingDiscoveries;
+    QHash<Thing *, QStringList> m_pendingSiteDiscoveries;
 
     PluginTimer *m_loginTimer = nullptr;
     PluginTimer *m_pollTimer = nullptr;
diff --git a/unifi/unifi.pro b/unifi/unifi.pro
index c0049e1d..f62934af 100644
--- a/unifi/unifi.pro
+++ b/unifi/unifi.pro
@@ -1,11 +1,11 @@
 include(../plugins.pri)
 
-QT += network
+QT *= network
 
 HEADERS += \
-    integrationpluginunifi.h \
+    integrationpluginunifi.h
 
 SOURCES += \
-    integrationpluginunifi.cpp \
+    integrationpluginunifi.cpp