Fixed compile after name changes

grodansparadis · May 13, 2024 · e8b8908 · e8b8908
1 parent c089318
commit e8b8908
Show file tree

Hide file tree

Showing 40 changed files with 59 additions and 64 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -273,12 +273,12 @@ if (WIN32)
     src/vscp/common/canaldlldef.h
     src/vscp/common/vscpcanaldeviceif.h
     src/vscp/common/vscpcanaldeviceif.cpp
-    src/vscp/common/canal_xmlconfig.h
-    src/vscp/common/canal_xmlconfig.cpp
-    src/vscp/common/vscp_client_base.h
-    src/vscp/common/vscp_client_base.cpp
-    src/vscp/common/vscp_client_mqtt.h
-    src/vscp/common/vscp_client_mqtt.cpp
+    src/vscp/common/canal-xmlconfig.h
+    src/vscp/common/canal-xmlconfig.cpp
+    src/vscp/common/vscp-client-base.h
+    src/vscp/common/vscp-client-base.cpp
+    src/vscp/common/vscp-client-mqtt.h
+    src/vscp/common/vscp-client-mqtt.cpp
     ./third_party/mustache/mustache.hpp
     ./third_party/sqlite3/sqlite3.h
     ./third_party/sqlite3/sqlite3.c
@@ -323,12 +323,12 @@ else()
     src/vscp/common/canaldlldef.h
     src/vscp/common/vscpcanaldeviceif.h
     src/vscp/common/vscpcanaldeviceif.cpp
-    src/vscp/common/canal_xmlconfig.h
-    src/vscp/common/canal_xmlconfig.cpp
-    src/vscp/common/vscp_client_base.h
-    src/vscp/common/vscp_client_base.cpp
-    src/vscp/common/vscp_client_mqtt.h
-    src/vscp/common/vscp_client_mqtt.cpp
+    src/vscp/common/canal-xmlconfig.h
+    src/vscp/common/canal-xmlconfig.cpp
+    src/vscp/common/vscp-client-base.h
+    src/vscp/common/vscp-client-base.cpp
+    src/vscp/common/vscp-client-mqtt.h
+    src/vscp/common/vscp-client-mqtt.cpp
     ./third_party/mustache/mustache.hpp
     ./third_party/sqlite3/sqlite3.h
     ./third_party/sqlite3/sqlite3.c
@@ -400,7 +400,6 @@ if(MSVC)
         OpenSSL::SSL 
         OpenSSL::Crypto
         OpenSSL::SSL OpenSSL::Crypto
-#        websockets_shared
         ${MOSQUITTO_LIBRARIES}
         ${LIBWEBSOCKETS_LIBRARIES}
         expat::expat

diff --git a/src/vscp/common/canal-xmlconfig.cpp b/src/vscp/common/canal-xmlconfig.cpp
@@ -43,7 +43,7 @@
 #include "vscp.h"
 #include "vscphelper.h"
 
-#include "canal_xmlconfig.h"
+#include "canal-xmlconfig.h"
 
 #include <limits>
 #include <cfloat>

diff --git a/src/vscp/common/mqtt.h b/src/vscp/common/mqtt.h
@@ -32,7 +32,7 @@
 #include <guid.h>
 #include <vscp.h>
 #include <vscphelper.h>
-#include <vscp_client_mqtt.h>
+#include <vscp-client-mqtt.h>
 
 #include <stdlib.h>
 #include <string>

diff --git a/src/vscp/common/vscp-bootdevice.h b/src/vscp/common/vscp-bootdevice.h
@@ -71,7 +71,7 @@
 #include "guid.h"
 #include "mdf.h"
 #include "register.h"
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 
 #include <list>
 

diff --git a/src/vscp/common/vscp-client-base.cpp b/src/vscp/common/vscp-client-base.cpp
@@ -35,7 +35,7 @@
 #include <list>
 #include <string>
 
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CVscpClient

diff --git a/src/vscp/common/vscp-client-canal.cpp b/src/vscp/common/vscp-client-canal.cpp
@@ -35,7 +35,7 @@
 
 #include <pthread.h>
 
-#include "vscp_client_canal.h"
+#include "vscp-client-canal.h"
 #include "vscphelper.h"
 
 

diff --git a/src/vscp/common/vscp-client-canal.h b/src/vscp/common/vscp-client-canal.h
@@ -27,7 +27,7 @@
 #define VSCPCLIENTCANAL_H__INCLUDED_
 
 #include "vscp.h"
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 #include "vscpcanaldeviceif.h"
 
 #include <pthread.h>

diff --git a/src/vscp/common/vscp-client-level2.cpp b/src/vscp/common/vscp-client-level2.cpp
@@ -62,7 +62,7 @@
 #include <vscp_class.h>
 #include <vscp_type.h>
 #include <vscphelper.h>
-#include "vscp_client_level2.h"
+#include "vscp-client-level2.h"
 
 #include <string>
 #include <list>

diff --git a/src/vscp/common/vscp-client-mqtt.cpp b/src/vscp/common/vscp-client-mqtt.cpp
@@ -27,7 +27,7 @@
 #include <pch.h>
 #endif
 
-#include "vscp_client_mqtt.h"
+#include "vscp-client-mqtt.h"
 
 #include <pthread.h>
 #ifndef WIN32

diff --git a/src/vscp/common/vscp-client-mqtt.h b/src/vscp/common/vscp-client-mqtt.h
@@ -152,7 +152,7 @@ mqtt-options/protocol-version can be set to 310/311/500
 #if !defined(VSCPCLIENTMQTT_H__INCLUDED_)
 #define VSCPCLIENTMQTT_H__INCLUDED_
 
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 #include <guid.h>
 #include <vscp.h>
 #include <vscphelper.h>

diff --git a/src/vscp/common/vscp-client-multicast.cpp b/src/vscp/common/vscp-client-multicast.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #include "vscphelper.h"
-#include "vscp_client_multicast.h"
+#include "vscp-client-multicast.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CTor

diff --git a/src/vscp/common/vscp-client-multicast.h b/src/vscp/common/vscp-client-multicast.h
@@ -27,7 +27,7 @@
 #define VSCPCLIENTMULTICAST_H__INCLUDED_
 
 #include "vscp.h"
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 
 class vscpClientMulticast : public CVscpClient {
 

diff --git a/src/vscp/common/vscp-client-rawcan.cpp b/src/vscp/common/vscp-client-rawcan.cpp
@@ -27,7 +27,7 @@
 #include <pch.h>
 #endif
 
-#include "vscp_client_rawcan.h"
+#include "vscp-client-rawcan.h"
 #include "vscphelper.h"
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/vscp/common/vscp-client-rawcan.h b/src/vscp/common/vscp-client-rawcan.h
@@ -27,7 +27,7 @@
 #define VSCPCLIENTRAWCAN_H__INCLUDED_
 
 #include "vscp.h"
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 
 class vscpClientRawCan : public CVscpClient
 {

diff --git a/src/vscp/common/vscp-client-rawmqtt.cpp b/src/vscp/common/vscp-client-rawmqtt.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #include "vscphelper.h"
-#include "vscp_client_rawmqtt.h"
+#include "vscp-client-rawmqtt.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CTor

diff --git a/src/vscp/common/vscp-client-rawmqtt.h b/src/vscp/common/vscp-client-rawmqtt.h
@@ -27,7 +27,7 @@
 #define VSCPCLIENTRAWMQTT_H__INCLUDED_
 
 #include "vscp.h"
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 
 class vscpClientRawMqtt : public CVscpClient
 {

diff --git a/src/vscp/common/vscp-client-socketcan.cpp b/src/vscp/common/vscp-client-socketcan.cpp
@@ -54,7 +54,7 @@
 
 #include <expat.h>
 
-#include "vscp_client_socketcan.h"
+#include "vscp-client-socketcan.h"
 #include <guid.h>
 #include <vscp.h>
 #include <vscp_class.h>

diff --git a/src/vscp/common/vscp-client-tcp.cpp b/src/vscp/common/vscp-client-tcp.cpp
@@ -27,7 +27,7 @@
 #include <pch.h>
 #endif
 
-#include "vscp_client_tcp.h"
+#include "vscp-client-tcp.h"
 
 void
 workerThread(vscpClientTcp *pObj);

diff --git a/src/vscp/common/vscp-client-tcp.h b/src/vscp/common/vscp-client-tcp.h
@@ -26,7 +26,7 @@
 #if !defined(VSCPCLIENTTCP_H__INCLUDED_)
 #define VSCPCLIENTTCP_H__INCLUDED_
 
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 #include <vscpremotetcpif.h>
 
 #include <mutex>

diff --git a/src/vscp/common/vscp-client-udp.cpp b/src/vscp/common/vscp-client-udp.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #include "vscphelper.h"
-#include "vscp_client_udp.h"
+#include "vscp-client-udp.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CTor

diff --git a/src/vscp/common/vscp-client-udp.h b/src/vscp/common/vscp-client-udp.h
@@ -27,7 +27,7 @@
 #define VSCPCLIENTUDP_H__INCLUDED_
 
 #include "vscp.h"
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 
 class vscpClientUdp : public CVscpClient {
 

diff --git a/src/vscp/common/vscp-client-ws1.cpp b/src/vscp/common/vscp-client-ws1.cpp
@@ -39,7 +39,7 @@
 #include <vscphelper.h>
 // #include "civetweb.h"
 
-#include "vscp_client_ws1.h"
+#include "vscp-client-ws1.h"
 
 /*
 static int

diff --git a/src/vscp/common/vscp-client-ws1.h b/src/vscp/common/vscp-client-ws1.h
@@ -36,7 +36,7 @@
 #endif
 
 #include "vscp.h"
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 
 const uint32_t WS1_CONNECTION_TIMEOUT = 30000;
 const uint32_t WS1_RESPONSE_TIMEOUT   = 2000;

diff --git a/src/vscp/common/vscp-client-ws2.cpp b/src/vscp/common/vscp-client-ws2.cpp
@@ -39,7 +39,7 @@
 #include <vscphelper.h>
 // #include "civetweb.h"
 
-#include "vscp_client_ws2.h"
+#include "vscp-client-ws2.h"
 
 #include <nlohmann/json.hpp> // Needs C++11  -std=c++11
 

diff --git a/src/vscp/common/vscp-client-ws2.h b/src/vscp/common/vscp-client-ws2.h
@@ -35,7 +35,7 @@
 #endif
 
 #include "vscp.h"
-#include "vscp_client_base.h"
+#include "vscp-client-base.h"
 #include <nlohmann/json.hpp>
 
 const uint32_t WS2_CONNECTION_TIMEOUT = 30000;

diff --git a/src/vscp/common/vscp_debug.h → src/vscp/common/vscp-debug.h b/src/vscp/common/vscp_debug.h → src/vscp/common/vscp-debug.h
diff --git a/src/vscp/common/vscp-type.h → src/vscp/common/vscp_type.h b/src/vscp/common/vscp-type.h → src/vscp/common/vscp_type.h
diff --git a/src/vscp/common/vscpcanaldeviceif.cpp b/src/vscp/common/vscpcanaldeviceif.cpp
@@ -42,7 +42,7 @@
 #include <nlohmann/json.hpp> // Needs C++11  -std=c++11
 
 #include <canal.h>
-#include <canal_macro.h>
+#include <canal-macro.h>
 #include <canaldlldef.h>
 #include <vscp.h>
 #include <vscpcanaldeviceif.h>

diff --git a/src/vscp/common/vscphelper.cpp b/src/vscp/common/vscphelper.cpp
@@ -60,7 +60,7 @@
 #include <expat.h>
 #include <nlohmann/json.hpp>
 
-#include <canal_macro.h>
+#include <canal-macro.h>
 #include <crc.h>
 #include <crc8.h>
 #include <vscp_aes.h>

diff --git a/src/vscp/daemon/controlobject.cpp b/src/vscp/daemon/controlobject.cpp
@@ -79,9 +79,9 @@
 #include <randpassword.h>
 #include <version.h>
 #include <vscp.h>
-#include <vscp_client_mqtt.h>
-#include <vscp_debug.h>
-#include <vscpd_caps.h>
+#include <vscp-client-mqtt.h>
+#include <vscp-debug.h>
+#include <vscpd-caps.h>
 #include <vscphelper.h>
 
 #include <algorithm>

diff --git a/src/vscp/daemon/devicelist.cpp b/src/vscp/daemon/devicelist.cpp
@@ -52,8 +52,8 @@
 #include <devicethread.h>
 #include <guid.h>
 #include <vscp.h>
-#include <vscp_client_mqtt.h>
-#include <vscp_debug.h>
+#include <vscp-client-mqtt.h>
+#include <vscp-debug.h>
 #include <vscphelper.h>
 
 #include <nlohmann/json.hpp> // Needs C++11  -std=c++11

diff --git a/src/vscp/daemon/devicelist.h b/src/vscp/daemon/devicelist.h
@@ -34,7 +34,7 @@
 
 #include <canaldlldef.h>
 #include <vscp.h>
-#include <vscp_client_mqtt.h>
+#include <vscp-client-mqtt.h>
 //#include <devicethread.h>
 #include <guid.h>
 #include <level2drvdef.h>

diff --git a/src/vscp/daemon/devicethread.cpp b/src/vscp/daemon/devicethread.cpp
@@ -51,12 +51,12 @@
 
 #include "devicethread.h"
 
-#include <canal_macro.h>
+#include <canal-macro.h>
 #include <controlobject.h>
 #include <devicelist.h>
 #include <level2drvdef.h>
 #include <vscp.h>
-#include <vscp_debug.h>
+#include <vscp-debug.h>
 #include <vscphelper.h>
 
 #include <mustache.hpp>
@@ -81,27 +81,23 @@ extern uint64_t gDebugLevel;
 //
 
 static void
-receive_event_callback(vscpEvent *pev, void *pobj)
+receive_event_callback(vscpEvent &ev, void *pobj)
 {
   int rv;
 
   // Check pointers
-  if (nullptr == pev) {
-    return;
-  }
-
   if (nullptr == pobj) {
     return;
   }
 
   CDeviceItem *pDeviceItem = (CDeviceItem *) pobj;
 
-  spdlog::trace("VSCP Event received. class={0} type={1}", pev->vscp_class, pev->vscp_type);
+  spdlog::trace("VSCP Event received. class={0} type={1}", ev.vscp_class, ev.vscp_type);
 
   if (VSCP_DRIVER_LEVEL1 == pDeviceItem->m_driverLevel) {
 
     canalMsg msg;
-    vscp_convertEventToCanal(&msg, pev);
+    vscp_convertEventToCanal(&msg, &ev);
 
     // Use blocking method if available
     if (nullptr != pDeviceItem->m_proc_CanalBlockingSend) {
@@ -121,7 +117,7 @@ receive_event_callback(vscpEvent *pev, void *pobj)
     }
   }
   else if (VSCP_DRIVER_LEVEL2 == pDeviceItem->m_driverLevel) {
-    if (CANAL_ERROR_SUCCESS != pDeviceItem->m_proc_VSCPWrite(pDeviceItem->m_openHandle, pev, 500)) {
+    if (CANAL_ERROR_SUCCESS != pDeviceItem->m_proc_VSCPWrite(pDeviceItem->m_openHandle, &ev, 500)) {
       spdlog::error("driver: mqtt_on_message - Failed to send level II event.");
     }
   }
@@ -406,7 +402,7 @@ deviceThread(void *pData)
                                            &pDeviceItem->m_pCtrlObj->m_map_type_id2Token);
 
     // Set event callback
-    pDeviceItem->m_mqttClient.setCallback(receive_event_callback, pDeviceItem);
+    pDeviceItem->m_mqttClient.setCallbackEv(receive_event_callback, pDeviceItem);
 
     // Connect to server
     if (VSCP_ERROR_SUCCESS != pDeviceItem->m_mqttClient.connect()) {
@@ -687,7 +683,7 @@ deviceThread(void *pData)
                                            &pDeviceItem->m_pCtrlObj->m_map_type_id2Token);
 
     // Set event callback
-    pDeviceItem->m_mqttClient.setCallback(receive_event_callback);
+    pDeviceItem->m_mqttClient.setCallbackEv(receive_event_callback);
 
     // Connect to server
     if (VSCP_ERROR_SUCCESS != pDeviceItem->m_mqttClient.connect()) {

diff --git a/src/vscp/daemon/vscpd.cpp b/src/vscp/daemon/vscpd.cpp
@@ -59,7 +59,7 @@
 
 #endif
 
-#include "canal_macro.h"
+#include "canal-macro.h"
 #include "vscpd.h"
 #include "controlobject.h"
 #include <crc.h>