From 6c104c018a124c9ff2757adddad8a784a673dbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 8 Aug 2025 15:50:56 +0200 Subject: [PATCH] philipshue: Add Qt6 support --- philipshue/huelight.h | 4 ++-- philipshue/hueremote.h | 4 ++-- philipshue/integrationpluginphilipshue.cpp | 25 +++++++++---------- philipshue/integrationpluginphilipshue.h | 28 ++++++++++------------ philipshue/philipshue.pro | 4 +--- 5 files changed, 31 insertions(+), 34 deletions(-) diff --git a/philipshue/huelight.h b/philipshue/huelight.h index f3a8150c..6faa1fea 100644 --- a/philipshue/huelight.h +++ b/philipshue/huelight.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. @@ -39,7 +39,7 @@ #include #include -#include "typeutils.h" +#include #include "huedevice.h" class HueLight : public HueDevice diff --git a/philipshue/hueremote.h b/philipshue/hueremote.h index 9f3d1253..438405ba 100644 --- a/philipshue/hueremote.h +++ b/philipshue/hueremote.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. @@ -37,7 +37,7 @@ #include #include -#include "typeutils.h" +#include #include "huedevice.h" class HueRemote : public HueDevice diff --git a/philipshue/integrationpluginphilipshue.cpp b/philipshue/integrationpluginphilipshue.cpp index 48eb2692..f345adf1 100644 --- a/philipshue/integrationpluginphilipshue.cpp +++ b/philipshue/integrationpluginphilipshue.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,21 +29,22 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "integrationpluginphilipshue.h" - -#include "integrations/thing.h" -#include "types/param.h" #include "plugininfo.h" -#include "network/upnp/upnpdiscovery.h" -#include "network/upnp/upnpdiscoveryreply.h" -#include "platform/platformzeroconfcontroller.h" -#include "network/zeroconf/zeroconfservicebrowser.h" +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include IntegrationPluginPhilipsHue::IntegrationPluginPhilipsHue() { @@ -409,7 +410,7 @@ void IntegrationPluginPhilipsHue::setupThing(ThingSetupInfo *info) ParamList migratedParams; foreach (const Param &oldParam, thing->params()) { QString oldId = oldParam.paramTypeId().toString(); - oldId.remove(QRegExp("[{}]")); + oldId.remove(QRegularExpression("[{}]")); if (migrationMap.contains(oldId)) { ParamTypeId newId = migrationMap.value(oldId); QVariant oldValue = oldParam.value(); @@ -470,7 +471,7 @@ void IntegrationPluginPhilipsHue::setupThing(ThingSetupInfo *info) ParamList migratedParams; foreach (const Param &oldParam, thing->params()) { QString oldId = oldParam.paramTypeId().toString(); - oldId.remove(QRegExp("[{}]")); + oldId.remove(QRegularExpression("[{}]")); if (migrationMap.contains(oldId)) { ParamTypeId newId = migrationMap.value(oldId); QVariant oldValue = oldParam.value(); @@ -1557,7 +1558,7 @@ void IntegrationPluginPhilipsHue::onMotionSensorPresenceChanged(bool presence) HueMotionSensor *sensor = static_cast(sender()); Thing *sensorDevice = m_motionSensors.value(sensor); sensorDevice->setStateValue(sensor->isPresentStateTypeId(), presence); - if (presence) sensorDevice->setStateValue(sensor->lastSeenTimeStateTypeId(), QDateTime::currentDateTime().toTime_t()); + if (presence) sensorDevice->setStateValue(sensor->lastSeenTimeStateTypeId(), QDateTime::currentDateTime().toSecsSinceEpoch()); } void IntegrationPluginPhilipsHue::onMotionSensorLightIntensityChanged(double lightIntensity) @@ -2539,4 +2540,4 @@ void IntegrationPluginPhilipsHue::abortRequests(QHash reply->abort(); } } -} \ No newline at end of file +} diff --git a/philipshue/integrationpluginphilipshue.h b/philipshue/integrationpluginphilipshue.h index f67d57a3..0ac5db66 100644 --- a/philipshue/integrationpluginphilipshue.h +++ b/philipshue/integrationpluginphilipshue.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,21 +31,19 @@ #ifndef INTEGRATIONPLUGINPHILIPSHUE_H #define INTEGRATIONPLUGINPHILIPSHUE_H -#include "integrations/integrationplugin.h" +#include +#include +#include +#include + #include "huebridge.h" #include "huelight.h" #include "hueremote.h" #include "huemotionsensor.h" #include "huetapdial.h" -#include "plugintimer.h" -#include "network/networkaccessmanager.h" -#include "network/upnp/upnpdiscovery.h" -#include "network/zeroconf/zeroconfservicebrowser.h" -#include "network/zeroconf/zeroconfserviceentry.h" - - class QNetworkReply; +class UpnpDiscoveryReply; class IntegrationPluginPhilipsHue: public IntegrationPlugin { @@ -99,9 +97,9 @@ private: private: class DiscoveryJob { public: - UpnpDiscoveryReply* upnpReply; + UpnpDiscoveryReply *upnpReply; bool upnpDone = false; - QNetworkReply* nUpnpReply; + QNetworkReply *nUpnpReply; bool nUpnpDone = false; ThingDescriptors results; }; @@ -109,7 +107,7 @@ private: void startUpnPDiscovery(ThingDiscoveryInfo *info, DiscoveryJob *discovery); void startNUpnpDiscovery(ThingDiscoveryInfo *info, DiscoveryJob *discovery); - void finishDiscovery(ThingDiscoveryInfo *info, DiscoveryJob* job); + void finishDiscovery(ThingDiscoveryInfo *info, DiscoveryJob *job); PluginTimer *m_pluginTimer1Sec = nullptr; PluginTimer *m_pluginTimer5Sec = nullptr; @@ -154,14 +152,14 @@ private: void bridgeReachableChanged(Thing *thing, bool reachable); - Thing* bridgeForBridgeId(const QString &id); + Thing *bridgeForBridgeId(const QString &id); bool lightAlreadyAdded(const QString &uuid); bool sensorAlreadyAdded(const QString &uuid); int brightnessToPercentage(int brightness); int percentageToBrightness(int percentage); - void abortRequests(QHash requestList, Thing* thing); + void abortRequests(QHash requestList, Thing *thing); }; -#endif // INTEGRATIONPLUGINPHILIPSHUE_H \ No newline at end of file +#endif // INTEGRATIONPLUGINPHILIPSHUE_H diff --git a/philipshue/philipshue.pro b/philipshue/philipshue.pro index 7f433f9e..d3895008 100644 --- a/philipshue/philipshue.pro +++ b/philipshue/philipshue.pro @@ -1,8 +1,6 @@ include(../plugins.pri) -TARGET = $$qtLibraryTarget(nymea_integrationpluginphilipshue) - -QT += network +QT *= network SOURCES += \ integrationpluginphilipshue.cpp \