Rename CanardSubscription to SubscriptionBase.

107-systems · Jan 8, 2023 · 9c72e9a · 9c72e9a
1 parent ef20480
commit 9c72e9a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/src/Node.cpp b/src/Node.cpp
@@ -116,7 +116,7 @@ void Node::processRxQueue()
 
     if(result == 1)
     {
-      impl::CanardSubscription * sub_ptr = static_cast<impl::CanardSubscription *>(rx_subscription->user_reference);
+      impl::SubscriptionBase * sub_ptr = static_cast<impl::SubscriptionBase *>(rx_subscription->user_reference);
       sub_ptr->onTransferReceived(transfer);
 
       /* Free dynamically allocated memory after processing. */

diff --git a/src/Service.hpp b/src/Service.hpp
@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "CanardSubscription.h"
+#include "SubscriptionBase.h"
 
 #include "libcanard/canard.h"
 
@@ -35,10 +35,10 @@ namespace impl
  * CLASS DECLARATION
  **************************************************************************************/
 
-class ServiceBase : public CanardSubscription
+class ServiceBase : public SubscriptionBase
 {
 public:
-  ServiceBase() : CanardSubscription{CanardTransferKindRequest} { }
+  ServiceBase() : SubscriptionBase{CanardTransferKindRequest} { }
 };
 
 template<typename T_REQ, typename T_RSP, typename OnRequestCb>

diff --git a/src/Subscription.hpp b/src/Subscription.hpp
@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "CanardSubscription.h"
+#include "SubscriptionBase.h"
 
 #include "libcanard/canard.h"
 
@@ -35,18 +35,12 @@ namespace impl
  * CLASS DECLARATION
  **************************************************************************************/
 
-class SubscriptionBase : public CanardSubscription
-{
-public:
-  SubscriptionBase() : CanardSubscription{CanardTransferKindMessage} { }
-};
-
 template <typename T, typename OnReceiveCb>
 class Subscription : public SubscriptionBase
 {
 public:
   Subscription(Node & node_hdl, CanardPortID const port_id, OnReceiveCb const & on_receive_cb)
-  : SubscriptionBase{}
+  : SubscriptionBase{CanardTransferKindMessage}
   , _node_hdl{node_hdl}
   , _port_id{port_id}
   , _on_receive_cb{on_receive_cb}

diff --git a/src/CanardSubscription.h → src/SubscriptionBase.h b/src/CanardSubscription.h → src/SubscriptionBase.h
@@ -25,19 +25,19 @@ namespace impl
  * CLASS DECLARATION
  **************************************************************************************/
 
-class CanardSubscription
+class SubscriptionBase
 {
 public:
-  CanardSubscription(CanardTransferKind const transfer_kind)
+  SubscriptionBase(CanardTransferKind const transfer_kind)
   : _transfer_kind{transfer_kind}
   {
     _canard_rx_sub.user_reference = static_cast<void *>(this);
   }
-  virtual ~CanardSubscription() { }
-  CanardSubscription(CanardSubscription const &) = delete;
-  CanardSubscription(CanardSubscription &&) = delete;
-  CanardSubscription &operator=(CanardSubscription const &) = delete;
-  CanardSubscription &operator=(CanardSubscription &&) = delete;
+  virtual ~SubscriptionBase() { }
+  SubscriptionBase(SubscriptionBase const &) = delete;
+  SubscriptionBase(SubscriptionBase &&) = delete;
+  SubscriptionBase &operator=(SubscriptionBase const &) = delete;
+  SubscriptionBase &operator=(SubscriptionBase &&) = delete;
 
 
   virtual bool onTransferReceived(CanardRxTransfer const & transfer) = 0;