Merge pull request #4975 from manup/taskitem_globals

Remove global TaskItems in thermostat and window covering modules
dresden-elektronik · Jun 4, 2021 · f6164f2 · f6164f2
2 parents 0f370be + 9cbae20
commit f6164f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/de_web_plugin_private.h b/de_web_plugin_private.h
@@ -1869,6 +1869,10 @@ public Q_SLOTS:
     // schedules
     QTimer *scheduleTimer;
     std::vector<Schedule> schedules;
+    TaskItem taskScheduleTimer;
+
+    // window covering
+    TaskItem calibrationTask;
 
     // webhooks
     QNetworkAccessManager *webhookManager = nullptr;

diff --git a/thermostat.cpp b/thermostat.cpp
@@ -299,7 +299,6 @@ void DeRestPluginPrivate::updateThermostatSchedule(Sensor *sensor, quint8 newWee
 
 
 // static const QStringList weekday({"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Away"});
-static TaskItem taskScheduleTimer;
 static int dayofweekTimer = 0;
 
 /*! Handle packets related to the ZCL Thermostat cluster.

diff --git a/window_covering.cpp b/window_covering.cpp
@@ -77,7 +77,6 @@
 
 int calibrationStep = 0;
 int operationalStatus = 0;
-TaskItem calibrationTask;
 
 /*! Handle packets related to the ZCL Window Covering cluster.
     \param ind the APS level data indication containing the ZCL packet