Clean includes in drivers.

src/driver_amiplus.cc

@@ -15,12 +15,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
-#include"util.h"
 
 struct MeterAmiplus : public virtual MeterCommonImplementation
 {

src/driver_apator08.cc

@@ -15,11 +15,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
 
 using namespace std;
 

src/driver_auto.cc

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2021 Fredrik Öhrström
+ Copyright (C) 2021-2022 Fredrik Öhrström
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -15,18 +15,12 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
-#include"util.h"
-
-#include<assert.h>
 
 using namespace std;
 
-struct MeterAuto : public virtual MeterCommonImplementation {
+struct MeterAuto : public virtual MeterCommonImplementation
+{
     MeterAuto(MeterInfo &mi, DriverInfo &di);
 
     void processContent(Telegram *t);

src/driver_aventieshca.cc

@@ -15,11 +15,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
 
 struct MeterAventiesHCA : public virtual MeterCommonImplementation
 {

src/driver_aventieswm.cc

@@ -15,12 +15,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
-#include"util.h"
 
 using namespace std;
 

src/driver_iperl.cc

@@ -16,11 +16,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
 
 using namespace std;
 

src/driver_lansendw.cc

@@ -15,12 +15,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
-
 
 #define INFO_CODE_CLOSED 0x0011
 #define INFO_CODE_OPEN   0x0055

src/driver_microclima.cc

@@ -15,11 +15,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"dvparser.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
 
 struct MeterMicroClima : public virtual MeterCommonImplementation
 {
@@ -49,8 +45,7 @@ static bool ok = registerDriver([](DriverInfo&di)
     di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new MeterMicroClima(mi, di)); });
 });
 
-MeterMicroClima::MeterMicroClima(MeterInfo &mi, DriverInfo &di) :
-    MeterCommonImplementation(mi, di)
+MeterMicroClima::MeterMicroClima(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
 {
     addFieldWithExtractor(
         "total_energy_consumption",

src/driver_sharky.cc

@@ -16,11 +16,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"dvparser.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
 
 struct MeterSharky : public virtual MeterCommonImplementation
 {
@@ -48,8 +44,7 @@ static bool ok = registerDriver([](DriverInfo&di)
     di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new MeterSharky(mi, di)); });
 });
 
-MeterSharky::MeterSharky(MeterInfo &mi, DriverInfo &di) :
-    MeterCommonImplementation(mi, di)
+MeterSharky::MeterSharky(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
 {
     addFieldWithExtractor(
         "total_energy_consumption",

src/driver_supercom587.cc

@@ -15,12 +15,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
-#include"util.h"
 
 using namespace std;
 
@@ -44,8 +39,7 @@ static bool ok = registerDriver([](DriverInfo&di)
     di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new MeterSupercom587(mi, di)); });
 });
 
-MeterSupercom587::MeterSupercom587(MeterInfo &mi, DriverInfo &di) :
-    MeterCommonImplementation(mi, di)
+MeterSupercom587::MeterSupercom587(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
 {
     addFieldWithExtractor(
         "total",

src/driver_ultraheat.cc

@@ -15,12 +15,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
-#include"util.h"
 
 using namespace std;
 
@@ -46,8 +41,7 @@ static bool ok = registerDriver([](DriverInfo&di)
     di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new MeterUltraHeat(mi, di)); });
 });
 
-MeterUltraHeat::MeterUltraHeat(MeterInfo &mi, DriverInfo &di) :
-    MeterCommonImplementation(mi, di)
+MeterUltraHeat::MeterUltraHeat(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
 {
     addFieldWithExtractor(
         "heat",

src/driver_unknown.cc

@@ -15,19 +15,12 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include"dvparser.h"
-#include"meters.h"
 #include"meters_common_implementation.h"
-#include"wmbus.h"
-#include"wmbus_utils.h"
-#include"util.h"
-
-#include<assert.h>
 
 using namespace std;
 
-
-struct MeterUnknown : public virtual MeterCommonImplementation {
+struct MeterUnknown : public virtual MeterCommonImplementation
+{
     MeterUnknown(MeterInfo &mi, DriverInfo &di);
 
     void processContent(Telegram *t);