From 1d629d50a67f34dcf414cdd138079c78256f253e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 8 Aug 2025 16:58:33 +0200 Subject: [PATCH] tmate: Add Qt6 support --- tmate/integrationplugintmate.cpp | 5 ++++- tmate/integrationplugintmate.h | 14 ++++++-------- tmate/tmate.pro | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tmate/integrationplugintmate.cpp b/tmate/integrationplugintmate.cpp index c7e0d006..f9acf5cf 100644 --- a/tmate/integrationplugintmate.cpp +++ b/tmate/integrationplugintmate.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -* Copyright 2013 - 2023, nymea GmbH +* Copyright 2013 - 2025, nymea GmbH * Contact: contact@nymea.io * * This file is part of nymea. @@ -31,8 +31,11 @@ #include "integrationplugintmate.h" #include "plugininfo.h" +#include + #include #include +#include #include IntegrationPluginTmate::IntegrationPluginTmate() diff --git a/tmate/integrationplugintmate.h b/tmate/integrationplugintmate.h index b308445e..eaa64c32 100644 --- a/tmate/integrationplugintmate.h +++ b/tmate/integrationplugintmate.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -* Copyright 2013 - 2023, nymea GmbH +* Copyright 2013 - 2025, nymea GmbH * Contact: contact@nymea.io * * This file is part of nymea. @@ -31,11 +31,11 @@ #ifndef INTEGRATIONPLUGINREMOTESSH_H #define INTEGRATIONPLUGINREMOTESSH_H -#include "plugintimer.h" -#include "integrations/integrationplugin.h" +#include #include "extern-plugininfo.h" -#include +class QProcess; +class PluginTimer; class IntegrationPluginTmate : public IntegrationPlugin { @@ -46,16 +46,14 @@ class IntegrationPluginTmate : public IntegrationPlugin public: explicit IntegrationPluginTmate(); - ~IntegrationPluginTmate(); + ~IntegrationPluginTmate() override; -// void startPairing(ThingPairingInfo *info) override; -// void confirmPairing(ThingPairingInfo *info, const QString &user, const QString &secret) override; void executeAction(ThingActionInfo *info) override; void setupThing(ThingSetupInfo *info) override; void thingRemoved(Thing *thing) override; private: - QHash m_processes; + QHash m_processes; PluginTimer *m_watchdog = nullptr; }; diff --git a/tmate/tmate.pro b/tmate/tmate.pro index b53656b6..4809fe5a 100644 --- a/tmate/tmate.pro +++ b/tmate/tmate.pro @@ -1,8 +1,8 @@ include(../plugins.pri) SOURCES += \ - integrationplugintmate.cpp \ + integrationplugintmate.cpp HEADERS += \ - integrationplugintmate.h \ + integrationplugintmate.h