From 783a7858385189f902551288b8c4f46009d4c1c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Thu, 7 Aug 2025 15:57:38 +0200
Subject: [PATCH] daylightsensor: Add Qt6 support

---
 daylightsensor/daylightsensor.pro                  |  8 +++-----
 daylightsensor/integrationplugindaylightsensor.cpp | 13 +++++++------
 daylightsensor/integrationplugindaylightsensor.h   |  9 ++++-----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/daylightsensor/daylightsensor.pro b/daylightsensor/daylightsensor.pro
index e6f1d8e7..734a87ee 100644
--- a/daylightsensor/daylightsensor.pro
+++ b/daylightsensor/daylightsensor.pro
@@ -1,11 +1,9 @@
 include(../plugins.pri)
 
-QT += network
-
-TARGET = $$qtLibraryTarget(nymea_integrationplugindaylightsensor)
+QT *= network
 
 SOURCES += \
-    integrationplugindaylightsensor.cpp \
+    integrationplugindaylightsensor.cpp
 
 HEADERS += \
-    integrationplugindaylightsensor.h \
+    integrationplugindaylightsensor.h
diff --git a/daylightsensor/integrationplugindaylightsensor.cpp b/daylightsensor/integrationplugindaylightsensor.cpp
index 07bd4e89..58af2b9d 100644
--- a/daylightsensor/integrationplugindaylightsensor.cpp
+++ b/daylightsensor/integrationplugindaylightsensor.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.
@@ -30,7 +30,8 @@
 
 #include "plugininfo.h"
 #include "integrationplugindaylightsensor.h"
-#include "network/networkaccessmanager.h"
+
+#include <network/networkaccessmanager.h>
 
 #include <QUrlQuery>
 #include <QNetworkReply>
@@ -56,7 +57,7 @@ void IntegrationPluginDaylightSensor::discoverThings(ThingDiscoveryInfo *info)
     QNetworkRequest request(QUrl("http://ip-api.com/json"));
     QNetworkReply* reply = hardwareManager()->networkManager()->get(request);
     connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
-    connect(reply, &QNetworkReply::finished, info, [this, reply, info]() {
+    connect(reply, &QNetworkReply::finished, info, [reply, info]() {
         if (reply->error() != QNetworkReply::NoError) {
             qCWarning(dcDaylightSensor()) << "Error fetching geolocation from ip-api:" << reply->error() << reply->errorString();
             info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("Failed to fetch data from the internet."));
@@ -124,8 +125,8 @@ void IntegrationPluginDaylightSensor::updateDevice(Thing *thing)
     QDateTime sunrise = sunriseSunset.first.toTimeZone(tz);
     QDateTime sunset = sunriseSunset.second.toTimeZone(tz);
     qCDebug(dcDaylightSensor()) << "Setting up daylight sensor:" << thing->name() << "Sunrise:" << sunrise.toString() << "Sunset:" << sunset.toString();
-    thing->setStateValue(daylightSensorSunriseTimeStateTypeId, sunrise.toTime_t());
-    thing->setStateValue(daylightSensorSunsetTimeStateTypeId, sunset.toTime_t());
+    thing->setStateValue(daylightSensorSunriseTimeStateTypeId, sunrise.toSecsSinceEpoch());
+    thing->setStateValue(daylightSensorSunsetTimeStateTypeId, sunset.toSecsSinceEpoch());
     thing->setStateValue(daylightSensorDaylightStateTypeId, sunrise < now && sunset > now);
 
     qint64 timeToNext = -1;
@@ -228,5 +229,5 @@ QPair<QDateTime, QDateTime> IntegrationPluginDaylightSensor::calculateSunriseSun
     QDateTime sunrise(dateTime.date(), QTime(hourRise, minuteRise));
     QDateTime sunset(dateTime.date(), QTime(hourSet, minuteSet));
 
-    return qMakePair<QDateTime, QDateTime>(sunrise, sunset);
+    return QPair<QDateTime, QDateTime>(sunrise, sunset);
 }
diff --git a/daylightsensor/integrationplugindaylightsensor.h b/daylightsensor/integrationplugindaylightsensor.h
index 3206fc18..937301bc 100644
--- a/daylightsensor/integrationplugindaylightsensor.h
+++ b/daylightsensor/integrationplugindaylightsensor.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.
@@ -31,9 +31,8 @@
 #ifndef INTEGRATIONPLUGINDAYLIGHTSENSOR_H
 #define INTEGRATIONPLUGINDAYLIGHTSENSOR_H
 
-
-#include "integrations/integrationplugin.h"
-#include "plugintimer.h"
+#include <integrations/integrationplugin.h>
+#include <plugintimer.h>
 
 class IntegrationPluginDaylightSensor: public IntegrationPlugin
 {
@@ -54,7 +53,7 @@ private slots:
 
     void updateDevice(Thing *thing);
 private:
-    QHash<Thing*, PluginTimer*> m_timers;
+    QHash<Thing *, PluginTimer *> m_timers;
     QPair<QDateTime, QDateTime> calculateSunriseSunset(qreal lat, qreal lon, const QDateTime &dateTime);
 
 };