From 09b08550451f6e47f74a8bddfbf5e53847e38fe1 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:46:02 +0200
Subject: [PATCH] systemmonitor: Add Qt6 support

---
 systemmonitor/integrationpluginsystemmonitor.cpp |  8 ++++++--
 systemmonitor/integrationpluginsystemmonitor.h   | 13 +++++++------
 systemmonitor/systemmonitor.pro                  |  6 ++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/systemmonitor/integrationpluginsystemmonitor.cpp b/systemmonitor/integrationpluginsystemmonitor.cpp
index 4b97319e..ee9048e8 100644
--- a/systemmonitor/integrationpluginsystemmonitor.cpp
+++ b/systemmonitor/integrationpluginsystemmonitor.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.
@@ -31,7 +31,11 @@
 #include "integrationpluginsystemmonitor.h"
 #include "plugininfo.h"
 
+#include <plugintimer.h>
+
 #include <QStorageInfo>
+#include <QRegularExpression>
+
 #include <sys/types.h>
 #include <sys/sysinfo.h>
 #include <unistd.h>
@@ -309,7 +313,7 @@ qint32 IntegrationPluginSystemMonitor::getPidByName(const QString &processName)
             continue;
         }
         QString line = statusFile.readLine().trimmed();
-        line.remove(QRegExp("Name:(\\s)*"));
+        line.remove(QRegularExpression("Name:(\\s)*"));
 //        qCDebug(dcSystemMonitor()) << "Found process:" << line << "looking for" << processName.left(15);
         // names in /proc/<pid>/status are trimmed to 15 characters...
         if (processName.left(15) == line.left(15)) {
diff --git a/systemmonitor/integrationpluginsystemmonitor.h b/systemmonitor/integrationpluginsystemmonitor.h
index d0e215cb..9bf475b9 100644
--- a/systemmonitor/integrationpluginsystemmonitor.h
+++ b/systemmonitor/integrationpluginsystemmonitor.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,8 +31,7 @@
 #ifndef INTEGRATIONPLUGINSYSTEMMONITOR_H
 #define INTEGRATIONPLUGINSYSTEMMONITOR_H
 
-#include "integrations/integrationplugin.h"
-#include "plugintimer.h"
+#include <integrations/integrationplugin.h>
 
 #include <QDebug>
 #include <QProcess>
@@ -40,6 +39,8 @@
 
 #include "extern-plugininfo.h"
 
+class PluginTimer;
+
 class IntegrationPluginSystemMonitor: public IntegrationPlugin {
 	Q_OBJECT
     Q_PLUGIN_METADATA(IID "io.nymea.IntegrationPlugin" FILE "integrationpluginsystemmonitor.json")
@@ -66,9 +67,9 @@ private:
 private:
     PluginTimer *m_refreshTimer = nullptr;
 
-    QHash<Thing*, qulonglong> m_oldTotalJiffies;
-    QHash<Thing*, qulonglong> m_oldWorkJiffies;
-    QHash<Thing*, qulonglong> m_oldProcessWorkJiffies;
+    QHash<Thing *, qulonglong> m_oldTotalJiffies;
+    QHash<Thing *, qulonglong> m_oldWorkJiffies;
+    QHash<Thing *, qulonglong> m_oldProcessWorkJiffies;
 
 };
 
diff --git a/systemmonitor/systemmonitor.pro b/systemmonitor/systemmonitor.pro
index 675de848..afdc0491 100644
--- a/systemmonitor/systemmonitor.pro
+++ b/systemmonitor/systemmonitor.pro
@@ -1,9 +1,7 @@
 include(../plugins.pri)
 
-TARGET = $$qtLibraryTarget(nymea_integrationpluginsystemmonitor)
-
 SOURCES += \
-    integrationpluginsystemmonitor.cpp \
+    integrationpluginsystemmonitor.cpp
 
 HEADERS += \
-    integrationpluginsystemmonitor.h \
+    integrationpluginsystemmonitor.h