prepare for QP v8.x.x, adjust internal code to v7+ QP API

Author: mattheweshleman

cpputest-for-qpcpp-lib/include/cmsDummyActiveObject.hpp

@@ -134,7 +134,7 @@ class DummyActiveObject : public QP::QActive {
     static QP::QState initial(DummyActiveObject* const me,
                               QP::QEvt const* const)
     {
-        return Q_TRAN(&running);
+        return me->tran(Q_STATE_CAST(&running));
     }
 
     static QP::QState running(DummyActiveObject* const me,
@@ -143,7 +143,7 @@ class DummyActiveObject : public QP::QActive {
         QP::QState rtn;
         switch (e->sig) {
             case Q_INIT_SIG:
-                rtn = Q_SUPER(&top);
+                rtn = me->super(&top);
                 break;
             case Q_ENTRY_SIG:   // purposeful fall through
             case Q_EXIT_SIG:
@@ -153,7 +153,7 @@ class DummyActiveObject : public QP::QActive {
                 if ((me->m_eventHandler != nullptr) && (e->sig != 0)) {
                     me->m_eventHandler(e);
                 }
-                rtn = Q_SUPER(&top);
+                rtn = me->super(&top);
                 break;
         }
 

cpputest-for-qpcpp-lib/include/cmsOrthogonalContainer.hpp

@@ -78,7 +78,7 @@ class OrthogonalContainer : public QP::QActive {
     {
         ForEachInTuple(me->m_components,
                        [](auto& component) { component.start(); });
-        return Q_TRAN(&running);
+        return me->tran(Q_STATE_CAST(&running));
     }
 
     static QP::QState running(OrthogonalContainer* const me,
@@ -102,7 +102,7 @@ class OrthogonalContainer : public QP::QActive {
                     rtn = Q_HANDLED();
                 }
                 else {
-                    rtn = Q_SUPER(&top);
+                    rtn = me->super(&top);
                 }
             } break;
         }

cpputest-for-qpcpp-lib/include/qp_port.hpp

@@ -11,6 +11,10 @@
     #include "qp_config.hpp" // external QP configuration
 #endif
 
+#ifndef QP_API_VERSION
+#define QP_API_VERSION 700 //cpputest for qpcpp support v7.x.x and v8.x.x
+#endif
+
 // no-return function specifier (C++11 Standard)
 // removed due to certain cpputest test functions
 #define Q_NORETURN  void

cpputest-for-qpcpp-lib/tests/orthogonalComponentTests.cpp

@@ -78,7 +78,7 @@ class TestComponent : public OrthogonalComponent {
 
     static QP::QState initial(TestComponent* const me, QP::QEvt const* const)
     {
-        return Q_TRAN(&running);
+        return me->tran(Q_STATE_CAST(&running));
     }
 
     static QP::QState running(TestComponent* const me, QP::QEvt const* const e)
@@ -109,7 +109,7 @@ class TestComponent : public OrthogonalComponent {
                 rtn = Q_HANDLED();
                 break;
             default:
-                rtn = Q_SUPER(&top);
+                rtn = me->super(&top);
                 break;
         }
         return rtn;

cpputest-for-qpcpp-lib/tests/orthogonalContainerTests.cpp

@@ -104,7 +104,7 @@ class TestComponent : public OrthogonalComponent {
 
     static QP::QState initial(TestComponent* const me, QP::QEvt const* const)
     {
-        return Q_TRAN(&running);
+        return me->tran(Q_STATE_CAST(&running));
     }
 
     static QP::QState running(TestComponent* const me, QP::QEvt const* const e)
@@ -144,7 +144,7 @@ class TestComponent : public OrthogonalComponent {
                 rtn = Q_HANDLED();
                 break;
             default:
-                rtn = Q_SUPER(&top);
+                rtn = me->super(&top);
                 break;
         }
         return rtn;