From f9a5bfa55e97a9431431bdf799daaedbd18c270b 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:51:23 +0200
Subject: [PATCH] commandlauncher: Add Qt6 support

---
 commandlauncher/commandlauncher.pro                  |  2 --
 commandlauncher/integrationplugincommandlauncher.cpp | 10 +++++-----
 commandlauncher/integrationplugincommandlauncher.h   |  8 ++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/commandlauncher/commandlauncher.pro b/commandlauncher/commandlauncher.pro
index d5fc37b2..bc967b6a 100644
--- a/commandlauncher/commandlauncher.pro
+++ b/commandlauncher/commandlauncher.pro
@@ -1,7 +1,5 @@
 include(../plugins.pri)
 
-TARGET = $$qtLibraryTarget(nymea_integrationplugincommandlauncher)
-
 SOURCES += \
     integrationplugincommandlauncher.cpp
 
diff --git a/commandlauncher/integrationplugincommandlauncher.cpp b/commandlauncher/integrationplugincommandlauncher.cpp
index ee5d5966..8f379d1e 100644
--- a/commandlauncher/integrationplugincommandlauncher.cpp
+++ b/commandlauncher/integrationplugincommandlauncher.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.
@@ -29,11 +29,11 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "integrationplugincommandlauncher.h"
-
-#include "integrations/thing.h"
 #include "plugininfo.h"
 
-#include <QDebug>
+#include <integrations/thing.h>
+
+#include <QRegularExpression>
 
 IntegrattionPluginCommandLauncher::IntegrattionPluginCommandLauncher()
 {
@@ -50,7 +50,7 @@ void IntegrattionPluginCommandLauncher::setupThing(ThingSetupInfo *info)
 
     // Script
     if(info->thing()->thingClassId() == scriptThingClassId){
-        QStringList scriptArguments = info->thing()->paramValue(scriptThingScriptParamTypeId).toString().split(QRegExp("[ \r\n][ \r\n]*"));
+        QStringList scriptArguments = info->thing()->paramValue(scriptThingScriptParamTypeId).toString().split(QRegularExpression("[ \r\n][ \r\n]*"));
         // check if script exists and if it is executable
         QFileInfo fileInfo(scriptArguments.first());
         if (!fileInfo.exists()) {
diff --git a/commandlauncher/integrationplugincommandlauncher.h b/commandlauncher/integrationplugincommandlauncher.h
index e9c8579d..632b030d 100644
--- a/commandlauncher/integrationplugincommandlauncher.h
+++ b/commandlauncher/integrationplugincommandlauncher.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,7 +31,7 @@
 #ifndef INTEGRATIONPLUGINCOMMANDLAUNCHER_H
 #define INTEGRATIONPLUGINCOMMANDLAUNCHER_H
 
-#include "integrations/integrationplugin.h"
+#include <integrations/integrationplugin.h>
 
 #include <QProcess>
 #include <QFileInfo>
@@ -52,8 +52,8 @@ public:
     void thingRemoved(Thing *thing) override;
 
 private:
-    QHash<QProcess*,Thing*> m_scripts;
-    QHash<QProcess*,Thing*> m_applications;
+    QHash<QProcess *,Thing *> m_scripts;
+    QHash<QProcess *,Thing *> m_applications;
 };
 
 #endif // INTEGRATIONPLUGINCOMMANDLAUNCHER_H