aqhome-apps: no longer included removed files.

2025-03-18 22:53:34 +01:00
parent 2320ba3a69
commit 171caacc92
31 changed files with 15 additions and 36 deletions
--- a/apps/aqhome-mqttlog/s_publish.h
+++ b/apps/aqhome-mqttlog/s_publish.h
@@ -10,7 +10,7 @@
 #define AQHOMEMQTT_S_PUBLISH_H


-#include "./aqhome_mqtt.h"
+#include "./server.h"

 #include <aqhome/events2/object.h>
 #include <aqhome/ipc2/message.h>
--- a/apps/aqhome-mqttlog/s_setdata.h
+++ b/apps/aqhome-mqttlog/s_setdata.h
@@ -10,7 +10,7 @@
 #define AQHOMEMQTT_S_SETDATA_H


-#include "./aqhome_mqtt.h"
+#include "./server.h"

 #include <aqhome/events2/object.h>
 #include <aqhome/ipc2/message.h>
--- a/apps/aqhome-mqttlog/xmlread.h
+++ b/apps/aqhome-mqttlog/xmlread.h
@@ -10,7 +10,6 @@
 #define AQHOME_MQTTLOG_XMLREAD_H

 #include "aqhome-mqttlog/server.h"
-#include "aqhome-mqttlog/aqhome_mqtt.h"
 #include "aqhome-mqttlog/types/device.h"


--- a/apps/aqhome-mqttlog/xmlwrite.c
+++ b/apps/aqhome-mqttlog/xmlwrite.c
@@ -11,7 +11,6 @@
 #endif

 #include "./xmlwrite.h"
-#include "./aqhome_mqtt_p.h"
 #include "aqhome-mqttlog/types/topic.h"
 #include "aqhome-mqttlog/types/value.h"
 #include "aqhome-mqttlog/types/translation.h"
--- a/apps/aqhome-mqttlog/xmlwrite.h
+++ b/apps/aqhome-mqttlog/xmlwrite.h
@@ -10,7 +10,6 @@
 #define AQHOME_MQTTLOG_XMLWRITE_H

 #include "aqhome-mqttlog/server.h"
-#include "aqhome-mqttlog/aqhome_mqtt.h"
 #include "aqhome-mqttlog/types/device.h"


--- a/apps/aqhome-react/net_read.c
+++ b/apps/aqhome-react/net_read.c
@@ -12,7 +12,6 @@

 #include "./net_read.h"
 #include "./server_p.h"
-#include "aqhome-react/aqhome_react_p.h"
 #include "aqhome-react/types/unit.h"
 #include "aqhome-react/units/u_module.h"

--- a/apps/aqhome-react/net_read.h
+++ b/apps/aqhome-react/net_read.h
@@ -10,7 +10,7 @@
 #define AQHOMEREACT_NET_READ_H


-#include "./aqhome_react.h"
+#include "./server.h"


 int AQH_ReactServer_ReadUnitNetFiles(AQH_OBJECT *aqh);
--- a/apps/aqhome-react/types/dataobject.h
+++ b/apps/aqhome-react/types/dataobject.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 * This file is part of the project AqHome.
- * AqHome (c) by 2023 Martin Preuss, all rights reserved.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
 *
 * The license for this file can be found in the file COPYING which you
 * should have received along with this file.
@@ -11,6 +11,7 @@


 #include <gwenhywfar/list.h>
+#include <gwenhywfar/buffer.h>


 typedef struct AQHREACT_DATAOBJECT AQHREACT_DATAOBJECT;
@@ -25,7 +26,7 @@ enum {
 };


-#include "aqhome-react/aqhome_react.h"
+#include "aqhome-react/server.h"



--- a/apps/aqhome-react/types/param.h
+++ b/apps/aqhome-react/types/param.h
@@ -16,7 +16,7 @@
 typedef struct AQHREACT_PARAM AQHREACT_PARAM;
 GWEN_LIST_FUNCTION_DEFS(AQHREACT_PARAM, AQHREACT_Param)

-#include "aqhome-react/aqhome_react.h"
+#include "aqhome-react/server.h"



--- a/apps/aqhome-react/types/port.h
+++ b/apps/aqhome-react/types/port.h
@@ -16,10 +16,11 @@ typedef struct AQHREACT_PORT AQHREACT_PORT;
 GWEN_LIST_FUNCTION_DEFS(AQHREACT_PORT, AQHREACT_Port)


-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/link.h"
 #include "aqhome-react/types/dataobject.h"

+#include <gwenhywfar/buffer.h>
+


 AQHREACT_PORT *AQHREACT_Port_new();
--- a/apps/aqhome-react/types/prgrule.h
+++ b/apps/aqhome-react/types/prgrule.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 * This file is part of the project AqHome.
- * AqHome (c) by 2024 Martin Preuss, all rights reserved.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
 *
 * The license for this file can be found in the file COPYING which you
 * should have received along with this file.
@@ -10,7 +10,7 @@
 #define AQHOME_REACT_PRGRULE_H


-#include "aqhome-react/aqhome_react.h"
+#include "aqhome-react/server.h"

 #include <gwenhywfar/gwentime.h>
 #include <gwenhywfar/list.h>
--- a/apps/aqhome-react/types/unit.h
+++ b/apps/aqhome-react/types/unit.h
@@ -26,7 +26,6 @@ GWEN_INHERIT_FUNCTION_DEFS(AQHREACT_UNIT)


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/port.h"
 #include "aqhome-react/types/param.h"
 #include "aqhome-react/types/dataobject.h"
--- a/apps/aqhome-react/units/u_highpass.h
+++ b/apps/aqhome-react/units/u_highpass.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_logical.h
+++ b/apps/aqhome-react/units/u_logical.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_lowpass.h
+++ b/apps/aqhome-react/units/u_lowpass.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_module.h
+++ b/apps/aqhome-react/units/u_module.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"

 #include <gwenhywfar/xml.h>
--- a/apps/aqhome-react/units/u_module_p.h
+++ b/apps/aqhome-react/units/u_module_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 * This file is part of the project AqHome.
- * AqHome (c) by 2024 Martin Preuss, all rights reserved.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
 *
 * The license for this file can be found in the file COPYING which you
 * should have received along with this file.
@@ -12,7 +12,6 @@

 #include "./u_module.h"

-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"

 #include <gwenhywfar/list.h>
--- a/apps/aqhome-react/units/u_passthrough.h
+++ b/apps/aqhome-react/units/u_passthrough.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_stabilize.h
+++ b/apps/aqhome-react/units/u_stabilize.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"

 #define AQHOMEREACT_UNIT_STABILIZE_PARAM_HOLDTIME_HIGH  "holdTimeHigh"
--- a/apps/aqhome-react/units/u_statfns.h
+++ b/apps/aqhome-react/units/u_statfns.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_suntime.h
+++ b/apps/aqhome-react/units/u_suntime.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_suntime_p.h
+++ b/apps/aqhome-react/units/u_suntime_p.h
@@ -12,7 +12,6 @@

 #include "./u_suntime.h"

-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"

 #include <gwenhywfar/gwentime.h>
--- a/apps/aqhome-react/units/u_timeprogram.h
+++ b/apps/aqhome-react/units/u_timeprogram.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_timeprogram_p.h
+++ b/apps/aqhome-react/units/u_timeprogram_p.h
@@ -12,7 +12,6 @@

 #include "./u_timeprogram.h"

-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"
 #include "aqhome-react/types/prgrule.h"

--- a/apps/aqhome-react/units/u_timer.h
+++ b/apps/aqhome-react/units/u_timer.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_valuefilter.h
+++ b/apps/aqhome-react/units/u_valuefilter.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_valueset.h
+++ b/apps/aqhome-react/units/u_valueset.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_varchanges.h
+++ b/apps/aqhome-react/units/u_varchanges.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"

 #include "aqhome/data/value.h"
--- a/apps/aqhome-react/units/u_varset.c
+++ b/apps/aqhome-react/units/u_varset.c
@@ -12,14 +12,14 @@

 #include "./u_varset.h"

-#include "aqhome/ipc/data/msg_data_set.h"
-#include "aqhome/ipc/data/ipc_data.h"
+#include "aqhome/msg/ipc/data/m_ipcd_setdata.h"
+#include "aqhome/msg/ipc/data/m_ipcd.h"

 #include <gwenhywfar/debug.h>
 #include <gwenhywfar/text.h>


-#define DEBUG_DRY_RUN 1 /* don't actually set value if "1" */
+#define DEBUG_DRY_RUN 0 /* don't actually set value if "1" */


 /* ------------------------------------------------------------------------------------------------
--- a/apps/aqhome-react/units/u_varset.h
+++ b/apps/aqhome-react/units/u_varset.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"


--- a/apps/aqhome-react/units/u_zeroposnegstring.h
+++ b/apps/aqhome-react/units/u_zeroposnegstring.h
@@ -11,7 +11,6 @@


 #include "aqhome-react/server.h"
-#include "aqhome-react/aqhome_react.h"
 #include "aqhome-react/types/unit.h"