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

---
 solarlog/integrationpluginsolarlog.cpp | 6 ++++--
 solarlog/integrationpluginsolarlog.h   | 9 +++++----
 solarlog/solarlog.pro                  | 4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/solarlog/integrationpluginsolarlog.cpp b/solarlog/integrationpluginsolarlog.cpp
index 3e030dae..05f9d560 100644
--- a/solarlog/integrationpluginsolarlog.cpp
+++ b/solarlog/integrationpluginsolarlog.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,9 @@
 
 #include "integrationpluginsolarlog.h"
 #include "plugininfo.h"
-#include "network/networkaccessmanager.h"
+
+#include <network/networkaccessmanager.h>
+#include <plugintimer.h>
 
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/solarlog/integrationpluginsolarlog.h b/solarlog/integrationpluginsolarlog.h
index cfe6570d..d47c6d10 100644
--- a/solarlog/integrationpluginsolarlog.h
+++ b/solarlog/integrationpluginsolarlog.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,15 +31,16 @@
 #ifndef INTEGRATIONPLUGINSOLARLOG_H
 #define INTEGRATIONPLUGINSOLARLOG_H
 
-#include "integrations/integrationplugin.h"
-#include "plugintimer.h"
+#include <integrations/integrationplugin.h>
 
 #include <QDebug>
 #include <QHostAddress>
 #include <QUrlQuery>
 
+class PluginTimer;
 
-class IntegrationPluginSolarLog: public IntegrationPlugin {
+class IntegrationPluginSolarLog: public IntegrationPlugin
+{
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "io.nymea.IntegrationPlugin" FILE "integrationpluginsolarlog.json")
     Q_INTERFACES(IntegrationPlugin)
diff --git a/solarlog/solarlog.pro b/solarlog/solarlog.pro
index 06846de6..b2110182 100644
--- a/solarlog/solarlog.pro
+++ b/solarlog/solarlog.pro
@@ -3,7 +3,7 @@ include(../plugins.pri)
 QT += network
 
 SOURCES += \
-    integrationpluginsolarlog.cpp \
+    integrationpluginsolarlog.cpp
 
 HEADERS += \
-    integrationpluginsolarlog.h \
+    integrationpluginsolarlog.h