Some cleanups

dziegel · Aug 29, 2024 · 6a29832 · 6a29832
1 parent edbbc63
commit 6a29832
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/examples/activeobject/Fsm.cxx b/examples/activeobject/Fsm.cxx
@@ -2,29 +2,29 @@
 
 namespace example::activeobject
 {
-Fsm::Transition Fsm::State1Handler(ImplPtr /* impl */, Event event)
+static Fsm::Transition State1Handler(Fsm::ImplPtr /* impl */, Fsm::Event event)
 {
     switch (event->Id())
     {
     case Go2::kId:
-        return TransitionTo(kState2);
+        return Fsm::TransitionTo(Fsm::kState2);
     default:
-        return NoTransition();
+        return Fsm::NoTransition();
     }
 }
 
-Fsm::Transition Fsm::State2Handler(ImplPtr impl, Event event)
+static Fsm::Transition State2Handler(Fsm::ImplPtr impl, Fsm::Event event)
 {
     switch (event->Id())
     {
     case Go1::kId:
         if (impl->SomeGuardFunction(event))
         {
-            return TransitionTo(kState1, &Impl::State2ToState1TransitionAction);
+            return Fsm::TransitionTo(Fsm::kState1, &Fsm::Impl::State2ToState1TransitionAction);
         }
-        return NoTransition();
+        return Fsm::NoTransition();
     default:
-        return UnhandledEvent();
+        return Fsm::UnhandledEvent();
     }
 }
 

diff --git a/examples/activeobject/Fsm.hxx b/examples/activeobject/Fsm.hxx
@@ -11,10 +11,6 @@ public:
     static const State kState1;
     static const State kState2;
 
-    // Handlers
-    static Transition State1Handler(ImplPtr impl, Event event);
-    static Transition State2Handler(ImplPtr impl, Event event);
-
     inline void Start()
     {
         FsmBase::Start(&kState1);

diff --git a/examples/activeobject/FsmImpl.hxx b/examples/activeobject/FsmImpl.hxx
@@ -8,7 +8,7 @@
 namespace example::activeobject
 {
 // Implements Fsm action interface
-class FsmImpl : public cpp_active_objects::Hsm<Fsm>, private IFsmImpl
+class FsmImpl final : public cpp_active_objects::Hsm<Fsm>, private IFsmImpl
 {
 public:
     FsmImpl();

diff --git a/examples/activeobject/IFsmImpl.hxx b/examples/activeobject/IFsmImpl.hxx
@@ -29,6 +29,8 @@ using FsmBase = cpp_event_framework::Statemachine<IFsmImpl, const cpp_event_fram
 class IFsmImpl
 {
 public:
+    virtual ~IFsmImpl() = default;
+
     virtual void State1Entry() = 0;
 
     virtual void State2ToState1TransitionAction(FsmBase::Event event) = 0;

diff --git a/examples/activeobject_embedded/Fsm.cxx b/examples/activeobject_embedded/Fsm.cxx
@@ -2,29 +2,29 @@
 
 namespace example::activeobject_embedded
 {
-Fsm::Transition Fsm::State1Handler(ImplPtr /* impl */, Event event)
+static Fsm::Transition State1Handler(Fsm::ImplPtr /* impl */, Fsm::Event event)
 {
     switch (event->Id())
     {
     case Go2::kId:
-        return TransitionTo(kState2);
+        return Fsm::TransitionTo(Fsm::kState2);
     default:
-        return NoTransition();
+        return Fsm::NoTransition();
     }
 }
 
-Fsm::Transition Fsm::State2Handler(ImplPtr impl, Event event)
+static Fsm::Transition State2Handler(Fsm::ImplPtr impl, Fsm::Event event)
 {
     switch (event->Id())
     {
     case Go1::kId:
         if (impl->SomeGuardFunction(event))
         {
-            return TransitionTo(kState1, &Impl::State2ToState1TransitionAction);
+            return Fsm::TransitionTo(Fsm::kState1, &Fsm::Impl::State2ToState1TransitionAction);
         }
-        return NoTransition();
+        return Fsm::NoTransition();
     default:
-        return UnhandledEvent();
+        return Fsm::UnhandledEvent();
     }
 }
 

diff --git a/examples/activeobject_embedded/Fsm.hxx b/examples/activeobject_embedded/Fsm.hxx
@@ -11,10 +11,6 @@ public:
     static const State kState1;
     static const State kState2;
 
-    // Handlers
-    static Transition State1Handler(ImplPtr impl, Event event);
-    static Transition State2Handler(ImplPtr impl, Event event);
-
     inline void Start()
     {
         FsmBase::Start(&kState1);

diff --git a/examples/activeobject_embedded/FsmImpl.hxx b/examples/activeobject_embedded/FsmImpl.hxx
@@ -8,7 +8,7 @@
 namespace example::activeobject_embedded
 {
 // Implements Fsm action interface
-class FsmImpl : public cpp_active_objects_embedded::Hsm<Fsm>, private IFsmImpl
+class FsmImpl final : public cpp_active_objects_embedded::Hsm<Fsm>, private IFsmImpl
 {
 public:
     FsmImpl();

diff --git a/examples/activeobject_embedded/IFsmImpl.hxx b/examples/activeobject_embedded/IFsmImpl.hxx
@@ -29,6 +29,8 @@ using FsmBase = cpp_event_framework::Statemachine<IFsmImpl, const cpp_event_fram
 class IFsmImpl
 {
 public:
+    virtual ~IFsmImpl() = default;
+
     virtual void State1Entry() = 0;
 
     virtual void State2ToState1TransitionAction(FsmBase::Event event) = 0;

diff --git a/examples/interface/FsmImpl.hxx b/examples/interface/FsmImpl.hxx
@@ -6,7 +6,7 @@
 namespace example::interface
 {
 // Implements Fsm action interface
-class FsmImpl : private IFsmImpl
+class FsmImpl final : private IFsmImpl
 {
 public:
     FsmImpl();

diff --git a/examples/interface/IFsmImpl.hxx b/examples/interface/IFsmImpl.hxx
@@ -17,6 +17,8 @@ using FsmBase = cpp_event_framework::Statemachine<IFsmImpl, EEvent>;
 class IFsmImpl
 {
 public:
+    virtual ~IFsmImpl() = default;
+
     virtual void State1Entry() = 0;
 
     virtual void State2ToState1TransitionAction(FsmBase::Event) = 0;

diff --git a/examples/signals/FsmImpl.hxx b/examples/signals/FsmImpl.hxx
@@ -6,7 +6,7 @@
 namespace example::signals
 {
 // Implements Fsm action interface
-class FsmImpl : public IFsmImpl
+class FsmImpl final : public IFsmImpl
 {
 public:
     FsmImpl();

diff --git a/examples/signals/IFsmImpl.hxx b/examples/signals/IFsmImpl.hxx
@@ -29,6 +29,8 @@ using FsmBase = cpp_event_framework::Statemachine<IFsmImpl, const cpp_event_fram
 class IFsmImpl
 {
 public:
+    virtual ~IFsmImpl() = default;
+
     virtual void State1Entry() = 0;
 
     virtual void State2ToState1TransitionAction(FsmBase::Event event) = 0;