Some cleanups

dziegel · dziegel · commit 6a29832a8021 · 2024-08-29T08:40:34.000+02:00
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;

Original file line number	Diff line number	Diff line change
`@@ -2,29 +2,29 @@`
`2`	`2`
`3`	`3`	`namespace example::activeobject`
`4`	`4`	`{`
`5`		`-Fsm::Transition Fsm::State1Handler(ImplPtr /* impl */, Event event)`
	`5`	`+static Fsm::Transition State1Handler(Fsm::ImplPtr /* impl */, Fsm::Event event)`
`6`	`6`	`{`
`7`	`7`	`switch (event->Id())`
`8`	`8`	`{`
`9`	`9`	`case Go2::kId:`
`10`		`- return TransitionTo(kState2);`
	`10`	`+ return Fsm::TransitionTo(Fsm::kState2);`
`11`	`11`	`default:`
`12`		`- return NoTransition();`
	`12`	`+ return Fsm::NoTransition();`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-Fsm::Transition Fsm::State2Handler(ImplPtr impl, Event event)`
	`16`	`+static Fsm::Transition State2Handler(Fsm::ImplPtr impl, Fsm::Event event)`
`17`	`17`	`{`
`18`	`18`	`switch (event->Id())`
`19`	`19`	`{`
`20`	`20`	`case Go1::kId:`
`21`	`21`	`if (impl->SomeGuardFunction(event))`
`22`	`22`	`{`
`23`		`- return TransitionTo(kState1, &Impl::State2ToState1TransitionAction);`
	`23`	`+ return Fsm::TransitionTo(Fsm::kState1, &Fsm::Impl::State2ToState1TransitionAction);`
`24`	`24`	`}`
`25`		`- return NoTransition();`
	`25`	`+ return Fsm::NoTransition();`
`26`	`26`	`default:`
`27`		`- return UnhandledEvent();`
	`27`	`+ return Fsm::UnhandledEvent();`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace example::activeobject`
`9`	`9`	`{`
`10`	`10`	`// Implements Fsm action interface`
`11`		`-class FsmImpl : public cpp_active_objects::Hsm<Fsm>, private IFsmImpl`
	`11`	`+class FsmImpl final : public cpp_active_objects::Hsm<Fsm>, private IFsmImpl`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`	`14`	`FsmImpl();`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ using FsmBase = cpp_event_framework::Statemachine<IFsmImpl, const cpp_event_fram`
`29`	`29`	`class IFsmImpl`
`30`	`30`	`{`
`31`	`31`	`public:`
	`32`	`+ virtual ~IFsmImpl() = default;`
	`33`	`+`
`32`	`34`	`virtual void State1Entry() = 0;`
`33`	`35`
`34`	`36`	`virtual void State2ToState1TransitionAction(FsmBase::Event event) = 0;`
Original file line number	Diff line number	Diff line change
`@@ -2,29 +2,29 @@`
`2`	`2`
`3`	`3`	`namespace example::activeobject_embedded`
`4`	`4`	`{`
`5`		`-Fsm::Transition Fsm::State1Handler(ImplPtr /* impl */, Event event)`
	`5`	`+static Fsm::Transition State1Handler(Fsm::ImplPtr /* impl */, Fsm::Event event)`
`6`	`6`	`{`
`7`	`7`	`switch (event->Id())`
`8`	`8`	`{`
`9`	`9`	`case Go2::kId:`
`10`		`- return TransitionTo(kState2);`
	`10`	`+ return Fsm::TransitionTo(Fsm::kState2);`
`11`	`11`	`default:`
`12`		`- return NoTransition();`
	`12`	`+ return Fsm::NoTransition();`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-Fsm::Transition Fsm::State2Handler(ImplPtr impl, Event event)`
	`16`	`+static Fsm::Transition State2Handler(Fsm::ImplPtr impl, Fsm::Event event)`
`17`	`17`	`{`
`18`	`18`	`switch (event->Id())`
`19`	`19`	`{`
`20`	`20`	`case Go1::kId:`
`21`	`21`	`if (impl->SomeGuardFunction(event))`
`22`	`22`	`{`
`23`		`- return TransitionTo(kState1, &Impl::State2ToState1TransitionAction);`
	`23`	`+ return Fsm::TransitionTo(Fsm::kState1, &Fsm::Impl::State2ToState1TransitionAction);`
`24`	`24`	`}`
`25`		`- return NoTransition();`
	`25`	`+ return Fsm::NoTransition();`
`26`	`26`	`default:`
`27`		`- return UnhandledEvent();`
	`27`	`+ return Fsm::UnhandledEvent();`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace example::interface`
`7`	`7`	`{`
`8`	`8`	`// Implements Fsm action interface`
`9`		`-class FsmImpl : private IFsmImpl`
	`9`	`+class FsmImpl final : private IFsmImpl`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`	`12`	`FsmImpl();`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ using FsmBase = cpp_event_framework::Statemachine<IFsmImpl, EEvent>;`
`17`	`17`	`class IFsmImpl`
`18`	`18`	`{`
`19`	`19`	`public:`
	`20`	`+ virtual ~IFsmImpl() = default;`
	`21`	`+`
`20`	`22`	`virtual void State1Entry() = 0;`
`21`	`23`
`22`	`24`	`virtual void State2ToState1TransitionAction(FsmBase::Event) = 0;`