From 8b8992679276dd5fb7483c5a7f2b3c27b20a439b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 6 May 2022 12:31:40 +0200 Subject: [PATCH] Update includes --- alphainnotec/integrationpluginalphainnotec.cpp | 6 +++--- alphainnotec/integrationpluginalphainnotec.h | 5 +++-- drexelundweiss/integrationplugindrexelundweiss.cpp | 6 +++--- drexelundweiss/integrationplugindrexelundweiss.h | 7 ++++--- huawei/integrationpluginhuawei.cpp | 6 +++--- huawei/integrationpluginhuawei.h | 5 +++-- idm/idm.h | 2 +- idm/integrationpluginidm.cpp | 3 ++- idm/integrationpluginidm.h | 5 +++-- sunspec/integrationpluginsunspec.cpp | 5 +++-- sunspec/integrationpluginsunspec.h | 4 ++-- sunspec/sunspecthing.h | 3 ++- webasto/integrationpluginwebasto.cpp | 6 +++--- webasto/integrationpluginwebasto.h | 1 + 14 files changed, 36 insertions(+), 28 deletions(-) diff --git a/alphainnotec/integrationpluginalphainnotec.cpp b/alphainnotec/integrationpluginalphainnotec.cpp index d6f5fb6..96b6f96 100644 --- a/alphainnotec/integrationpluginalphainnotec.cpp +++ b/alphainnotec/integrationpluginalphainnotec.cpp @@ -29,11 +29,11 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "integrationpluginalphainnotec.h" - -#include "network/networkdevicediscovery.h" -#include "hardwaremanager.h" #include "plugininfo.h" +#include +#include + IntegrationPluginAlphaInnotec::IntegrationPluginAlphaInnotec() { diff --git a/alphainnotec/integrationpluginalphainnotec.h b/alphainnotec/integrationpluginalphainnotec.h index 284f591..8f94c4a 100644 --- a/alphainnotec/integrationpluginalphainnotec.h +++ b/alphainnotec/integrationpluginalphainnotec.h @@ -31,9 +31,10 @@ #ifndef INTEGRATIONPLUGINALPHAINNOTEC_H #define INTEGRATIONPLUGINALPHAINNOTEC_H -#include "plugintimer.h" +#include +#include + #include "alphainnotecmodbustcpconnection.h" -#include "integrations/integrationplugin.h" class IntegrationPluginAlphaInnotec: public IntegrationPlugin { diff --git a/drexelundweiss/integrationplugindrexelundweiss.cpp b/drexelundweiss/integrationplugindrexelundweiss.cpp index 493a8e0..c4eff29 100644 --- a/drexelundweiss/integrationplugindrexelundweiss.cpp +++ b/drexelundweiss/integrationplugindrexelundweiss.cpp @@ -31,9 +31,9 @@ #include "integrationplugindrexelundweiss.h" #include "plugininfo.h" -#include "hardwaremanager.h" -#include "hardware/modbus/modbusrtumaster.h" -#include "hardware/modbus/modbusrtuhardwareresource.h" +#include +#include +#include IntegrationPluginDrexelUndWeiss::IntegrationPluginDrexelUndWeiss() { diff --git a/drexelundweiss/integrationplugindrexelundweiss.h b/drexelundweiss/integrationplugindrexelundweiss.h index 12235eb..a93d0ed 100644 --- a/drexelundweiss/integrationplugindrexelundweiss.h +++ b/drexelundweiss/integrationplugindrexelundweiss.h @@ -31,9 +31,10 @@ #ifndef INTEGRATIONPLUGINDREXELUNDWEISS_H #define INTEGRATIONPLUGINDREXELUNDWEISS_H -#include "integrations/integrationplugin.h" -#include "hardware/modbus/modbusrtumaster.h" -#include "plugintimer.h" +#include +#include +#include + #include "modbusregisterdefinition.h" #include diff --git a/huawei/integrationpluginhuawei.cpp b/huawei/integrationpluginhuawei.cpp index fcdfee7..1c83ee2 100644 --- a/huawei/integrationpluginhuawei.cpp +++ b/huawei/integrationpluginhuawei.cpp @@ -29,11 +29,11 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "integrationpluginhuawei.h" - -#include "network/networkdevicediscovery.h" -#include "hardwaremanager.h" #include "plugininfo.h" +#include +#include + IntegrationPluginHuawei::IntegrationPluginHuawei() { diff --git a/huawei/integrationpluginhuawei.h b/huawei/integrationpluginhuawei.h index 5c05e09..8e5afe6 100644 --- a/huawei/integrationpluginhuawei.h +++ b/huawei/integrationpluginhuawei.h @@ -31,8 +31,9 @@ #ifndef INTEGRATIONPLUGINHUAWEI_H #define INTEGRATIONPLUGINHUAWEI_H -#include "plugintimer.h" -#include "integrations/integrationplugin.h" +#include +#include + #include "huaweifusionsolar.h" class IntegrationPluginHuawei: public IntegrationPlugin diff --git a/idm/idm.h b/idm/idm.h index 53f1d02..7c78d21 100644 --- a/idm/idm.h +++ b/idm/idm.h @@ -33,7 +33,7 @@ #include -#include "../modbus/modbustcpmaster.h" +#include #include "idminfo.h" diff --git a/idm/integrationpluginidm.cpp b/idm/integrationpluginidm.cpp index 7f92ed1..1f0790e 100644 --- a/idm/integrationpluginidm.cpp +++ b/idm/integrationpluginidm.cpp @@ -28,10 +28,11 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "network/networkdevicediscovery.h" #include "integrationpluginidm.h" #include "plugininfo.h" +#include + IntegrationPluginIdm::IntegrationPluginIdm() { diff --git a/idm/integrationpluginidm.h b/idm/integrationpluginidm.h index 058988e..860196c 100644 --- a/idm/integrationpluginidm.h +++ b/idm/integrationpluginidm.h @@ -31,8 +31,9 @@ #ifndef INTEGRATIONPLUGINIDM_H #define INTEGRATIONPLUGINIDM_H -#include "integrations/integrationplugin.h" -#include "plugintimer.h" +#include +#include + #include "idm.h" #include diff --git a/sunspec/integrationpluginsunspec.cpp b/sunspec/integrationpluginsunspec.cpp index 16b14b5..c4ad08d 100644 --- a/sunspec/integrationpluginsunspec.cpp +++ b/sunspec/integrationpluginsunspec.cpp @@ -28,9 +28,10 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "plugininfo.h" #include "integrationpluginsunspec.h" -#include "network/networkdevicediscovery.h" +#include "plugininfo.h" + +#include #include #include diff --git a/sunspec/integrationpluginsunspec.h b/sunspec/integrationpluginsunspec.h index f057d19..d4a5a40 100644 --- a/sunspec/integrationpluginsunspec.h +++ b/sunspec/integrationpluginsunspec.h @@ -31,8 +31,8 @@ #ifndef INTEGRATIONPLUGINSUNSPEC_H #define INTEGRATIONPLUGINSUNSPEC_H -#include "integrations/integrationplugin.h" -#include "plugintimer.h" +#include +#include #include #include diff --git a/sunspec/sunspecthing.h b/sunspec/sunspecthing.h index 211d522..ea22466 100644 --- a/sunspec/sunspecthing.h +++ b/sunspec/sunspecthing.h @@ -34,7 +34,8 @@ #include #include "extern-plugininfo.h" -#include "integrations/integrationplugin.h" + +#include #include #include diff --git a/webasto/integrationpluginwebasto.cpp b/webasto/integrationpluginwebasto.cpp index 7afc211..008c8e2 100644 --- a/webasto/integrationpluginwebasto.cpp +++ b/webasto/integrationpluginwebasto.cpp @@ -28,12 +28,12 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include -#include - #include "integrationpluginwebasto.h" #include "plugininfo.h" +#include +#include + #include #include #include diff --git a/webasto/integrationpluginwebasto.h b/webasto/integrationpluginwebasto.h index 6d833aa..eaed575 100644 --- a/webasto/integrationpluginwebasto.h +++ b/webasto/integrationpluginwebasto.h @@ -33,6 +33,7 @@ #include #include + #include "webasto.h" #include