5.6.4b

doxygen/metrics.dox

@@ -9,7 +9,7 @@
   License Type: Windows Single User License
   Licensed To : Quantum Leaps, LLC
   License No. : WS2975                          License Date: Dec 15, 2013
-  Build Date  : Sep  2 2009                         Run Date: Apr 24, 2016
+  Build Date  : Sep  2 2009                         Run Date: May 04, 2016
   (C)1996-2009 M Squared Technologies LLC
   ________________________________________________________________________
 
@@ -150,7 +150,7 @@
 
                           ~~ Total File Summary ~~
 
-  LOC 250      eLOC 218      lLOC 127      Comment 307      Lines      640
+  LOC 250      eLOC 218      lLOC 127      Comment 307      Lines      641
   ------------------------------------------------------------------------
 
                         ~~ File Functional Summary ~~
@@ -1666,12 +1666,12 @@
   File: ..\source\qk_mutex.cpp
   ________________________________________________________________________
 
-  Function: QP::QMutex::init
+  Function: QP::QKMutex::init
   Parameters: (uint_fast8_t const prio)
   Complexity   Param 1       Return 1      Cyclo Vg 1       Total        3
   LOC 4        eLOC 3        lLOC 2        Comment 15       Lines        4
 
-  Function: QP::QMutex::lock
+  Function: QP::QKMutex::lock
   Parameters: (void)
     Cyclomatic Complexity Vg Detail
       Function Base           : 1
@@ -1680,7 +1680,7 @@
   Complexity   Param 0       Return 1      Cyclo Vg 3       Total        4
   LOC 17       eLOC 15       lLOC 7        Comment 24       Lines       23
 
-  Function: QP::QMutex::unlock
+  Function: QP::QKMutex::unlock
   Parameters: (void)
     Cyclomatic Complexity Vg Detail
       Function Base           : 1
@@ -2513,7 +2513,7 @@
 
                          ~~ Total Project Summary ~~
 
-  LOC 5576     eLOC 4898     lLOC 2256     Comment 6448     Lines    12366
+  LOC 5576     eLOC 4898     lLOC 2256     Comment 6448     Lines    12367
   Average per File, metric/41 files
   LOC 136      eLOC 119      lLOC 55       Comment 157      Lines      301
 
@@ -3154,17 +3154,17 @@
   Complexity   Param 1       Return 1      Cyclo Vg 6       Total        8
   LOC 54       eLOC 47       lLOC 24       Comment 46       Lines       77
 
-  Function: QP::QMutex::init
+  Function: QP::QKMutex::init
   Parameters: (uint_fast8_t const prio)
   Complexity   Param 1       Return 1      Cyclo Vg 1       Total        3
   LOC 4        eLOC 3        lLOC 2        Comment 15       Lines        4
 
-  Function: QP::QMutex::lock
+  Function: QP::QKMutex::lock
   Parameters: (void)
   Complexity   Param 0       Return 1      Cyclo Vg 3       Total        4
   LOC 17       eLOC 15       lLOC 7        Comment 24       Lines       23
 
-  Function: QP::QMutex::unlock
+  Function: QP::QKMutex::unlock
   Parameters: (void)
   Complexity   Param 0       Return 1      Cyclo Vg 4       Total        5
   LOC 22       eLOC 19       lLOC 10       Comment 26       Lines       28

doxygen/snippets/qk_mux.cpp

@@ -1,4 +1,4 @@
-QMutex l_rndMutex;  // mutex to protect the random number generator
+QKMutex l_rndMutex;  // mutex to protect the random number generator
 
 
 void BSP::randomSeed(uint32_t seed) {

doxygen/struct.dox

@@ -99,7 +99,7 @@ The Quantum Leaps Application Note <a class="extern" target="_blank" href="http:
 <div class="clear"></div>
 
 @note
-The hallmark of the QP/C implementation of UML state machines is **traceability**, which is direct, precise, and unambiguous mapping of every state machine element to human-readable, portable, MISRA-compliant C code. Preserving the traceability from requirements through design to code is essential for mission-critical systems, such as medical devices or avionic systems.
+The hallmark of the QP/C++ implementation of UML state machines is **traceability**, which is direct, precise, and unambiguous mapping of every state machine element to human readable, portable, MISRA compliant C++ code. Preserving the traceability from requirements through design to code is essential for mission-critical systems, such as medical devices or avionic systems.
 
 
 ------------------------------------------------------------------------------

examples/arm-cm/blinky_ek-tm4c123gxl/win32-qv/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Blinky console, Win32-QV, MinGW
-# Last updated for version 5.6.2
+# Last updated for version 5.6.4
-# Last updated on  2016-03-31
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -168,7 +168,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/arm-cm/blinky_ek-tm4c123gxl/win32/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Blinky console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -168,7 +168,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/arm-cm/dpp_ek-tm4c123gxl/lint/lint_out.txt

@@ -94,48 +94,48 @@
 --- Global Wrap-up
 
 "C:\qp\qpcpp\include\qassert.h" 223 1 Warning 526: Symbol 'Q_onAssert(const char *, int)' (line 223, file C:\qp\qpcpp\include\qassert.h, module C:\qp\qpcpp\examples\arm-cm\dpp_ek-tm4c123gxl\philo.cpp) not defined
-"C:\qp\qpcpp\include\qep.h" 450 1 Info 758: global enum 'QP::QMsm::ReservedHsmSignals' (line 450, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-5]
+"C:\qp\qpcpp\include\qep.h" 451 1 Info 758: global enum 'QP::QMsm::ReservedHsmSignals' (line 451, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-5]
 "C:\qp\qpcpp\include\qs.h" 341 1 Info 758: global enum 'QP::QS::QSType' (line 341, file C:\qp\qpcpp\include\qs.h) not referenced [MISRA C++ Rule 0-1-5]
 "C:\qp\qpcpp\include\qs.h" 394 1 Info 758: global enum 'QP::QSpyRxRecords' (line 394, file C:\qp\qpcpp\include\qs.h) not referenced [MISRA C++ Rule 0-1-5]
-"C:\qp\qpcpp\include\qep.h" 320 1 Warning 1526: Member function 'QP::QMsm::init(const struct QP::QEvt *)' (line 320, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 321 1 Warning 1526: Member function 'QP::QMsm::init(const struct QP::QEvt *)' (line 321, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 321 1 Info 1716: Virtual member function 'QP::QMsm::init(void)' (line 321, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 322 1 Info 1716: Virtual member function 'QP::QMsm::init(void)' (line 322, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 324 1 Info 1716: Virtual member function 'QP::QMsm::dispatch(const struct QP::QEvt *)' (line 324, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 325 1 Info 1716: Virtual member function 'QP::QMsm::dispatch(const struct QP::QEvt *)' (line 325, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 324 1 Warning 1526: Member function 'QP::QMsm::dispatch(const struct QP::QEvt *)' (line 324, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 325 1 Warning 1526: Member function 'QP::QMsm::dispatch(const struct QP::QEvt *)' (line 325, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 327 1 Info 1714: Member function 'QP::QMsm::isInState(const struct QP::QMState *) const' (line 327, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 328 1 Info 1714: Member function 'QP::QMsm::isInState(const struct QP::QMState *) const' (line 328, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 327 1 Warning 1526: Member function 'QP::QMsm::isInState(const struct QP::QMState *) const' (line 327, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 328 1 Warning 1526: Member function 'QP::QMsm::isInState(const struct QP::QMState *) const' (line 328, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 330 1 Info 1714: Member function 'QP::QMsm::stateObj(void) const' (line 330, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 331 1 Info 1714: Member function 'QP::QMsm::stateObj(void) const' (line 331, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 335 1 Info 1714: Member function 'QP::QMsm::childStateObj(const struct QP::QMState *) const' (line 335, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 336 1 Info 1714: Member function 'QP::QMsm::childStateObj(const struct QP::QMState *) const' (line 336, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 335 1 Warning 1526: Member function 'QP::QMsm::childStateObj(const struct QP::QMState *) const' (line 335, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 336 1 Warning 1526: Member function 'QP::QMsm::childStateObj(const struct QP::QMState *) const' (line 336, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 339 1 Info 1714: Member function 'QP::QMsm::QMsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 339, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 340 1 Info 1714: Member function 'QP::QMsm::QMsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 340, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 339 1 Warning 1526: Member function 'QP::QMsm::QMsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 339, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 340 1 Warning 1526: Member function 'QP::QMsm::QMsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 340, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 349 1 Info 1714: Member function 'QP::QMsm::qm_tran_hist_(const struct QP::QMState *, const struct QP::QMTranActTable *)' (line 349, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 350 1 Info 1714: Member function 'QP::QMsm::qm_tran_hist_(const struct QP::QMState *, const struct QP::QMTranActTable *)' (line 350, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 365 1 Info 1714: Member function 'QP::QMsm::qm_tran_ep_(const struct QP::QMTranActTable *)' (line 365, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 366 1 Info 1714: Member function 'QP::QMsm::qm_tran_ep_(const struct QP::QMTranActTable *)' (line 366, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 372 1 Info 1714: Member function 'QP::QMsm::qm_tran_xp_(unsigned int (*)(void *), const struct QP::QMTranActTable *)' (line 372, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 373 1 Info 1714: Member function 'QP::QMsm::qm_tran_xp_(unsigned int (*)(void *), const struct QP::QMTranActTable *)' (line 373, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 394 1 Info 1714: Member function 'QP::QMsm::qm_super_sub_(const struct QP::QMState *)' (line 394, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 395 1 Info 1714: Member function 'QP::QMsm::qm_super_sub_(const struct QP::QMState *)' (line 395, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 420 1 Info 1714: Member function 'QP::QMsm::Q_HANDLED(void)' (line 420, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 421 1 Info 1714: Member function 'QP::QMsm::Q_HANDLED(void)' (line 421, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 428 1 Info 1714: Member function 'QP::QMsm::Q_UNHANDLED(void)' (line 428, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 429 1 Info 1714: Member function 'QP::QMsm::Q_UNHANDLED(void)' (line 429, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 433 1 Info 1714: Member function 'QP::QMsm::tran_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 433, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 434 1 Info 1714: Member function 'QP::QMsm::tran_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 434, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 439 1 Info 1714: Member function 'QP::QMsm::tran_hist_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 439, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 440 1 Info 1714: Member function 'QP::QMsm::tran_hist_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 440, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 445 1 Info 1714: Member function 'QP::QMsm::super_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 445, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 446 1 Info 1714: Member function 'QP::QMsm::super_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 446, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 451 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_ENTRY_SIG' (line 451, file C:\qp\qpcpp\include\qep.h) not referenced
+"C:\qp\qpcpp\include\qep.h" 452 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_ENTRY_SIG' (line 452, file C:\qp\qpcpp\include\qep.h) not referenced
-"C:\qp\qpcpp\include\qep.h" 452 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_EXIT_SIG' (line 452, file C:\qp\qpcpp\include\qep.h) not referenced
+"C:\qp\qpcpp\include\qep.h" 453 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_EXIT_SIG' (line 453, file C:\qp\qpcpp\include\qep.h) not referenced
-"C:\qp\qpcpp\include\qep.h" 453 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_INIT_SIG' (line 453, file C:\qp\qpcpp\include\qep.h) not referenced
+"C:\qp\qpcpp\include\qep.h" 454 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_INIT_SIG' (line 454, file C:\qp\qpcpp\include\qep.h) not referenced
-"C:\qp\qpcpp\include\qep.h" 467 1 Info 1715: static member 'QP::QMsm::MAX_ENTRY_DEPTH_' (line 467, file C:\qp\qpcpp\include\qep.h) not referenced
+"C:\qp\qpcpp\include\qep.h" 468 1 Info 1715: static member 'QP::QMsm::MAX_ENTRY_DEPTH_' (line 468, file C:\qp\qpcpp\include\qep.h) not referenced
-"C:\qp\qpcpp\include\qep.h" 470 1 Info 1715: static member 'QP::QMsm::msm_top_s' (line 470, file C:\qp\qpcpp\include\qep.h) not referenced
+"C:\qp\qpcpp\include\qep.h" 471 1 Info 1715: static member 'QP::QMsm::msm_top_s' (line 471, file C:\qp\qpcpp\include\qep.h) not referenced
-"C:\qp\qpcpp\include\qep.h" 470 1 Warning 1527: static member 'QP::QMsm::msm_top_s' (line 470, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 471 1 Warning 1527: static member 'QP::QMsm::msm_top_s' (line 471, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 506 1 Warning 1526: Member function 'QP::QHsm::init(const struct QP::QEvt *)' (line 506, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 507 1 Warning 1526: Member function 'QP::QHsm::init(const struct QP::QEvt *)' (line 507, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 510 1 Info 1716: Virtual member function 'QP::QHsm::dispatch(const struct QP::QEvt *)' (line 510, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 511 1 Info 1716: Virtual member function 'QP::QHsm::dispatch(const struct QP::QEvt *)' (line 511, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 510 1 Warning 1526: Member function 'QP::QHsm::dispatch(const struct QP::QEvt *)' (line 510, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 511 1 Warning 1526: Member function 'QP::QHsm::dispatch(const struct QP::QEvt *)' (line 511, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 514 1 Info 1714: Member function 'QP::QHsm::isIn(unsigned int (*)(void *, const struct QP::QEvt *))' (line 514, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 515 1 Info 1714: Member function 'QP::QHsm::isIn(unsigned int (*)(void *, const struct QP::QEvt *))' (line 515, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 514 1 Warning 1526: Member function 'QP::QHsm::isIn(unsigned int (*)(void *, const struct QP::QEvt *))' (line 514, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 515 1 Warning 1526: Member function 'QP::QHsm::isIn(unsigned int (*)(void *, const struct QP::QEvt *))' (line 515, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 517 1 Warning 1526: Member function 'QP::QHsm::top(void *, const struct QP::QEvt *)' (line 517, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 518 1 Warning 1526: Member function 'QP::QHsm::top(void *, const struct QP::QEvt *)' (line 518, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 520 1 Info 1714: Member function 'QP::QHsm::state(void) const' (line 520, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 521 1 Info 1714: Member function 'QP::QHsm::state(void) const' (line 521, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 525 1 Info 1714: Member function 'QP::QHsm::childState(unsigned int (*)(void *, const struct QP::QEvt *))' (line 525, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 526 1 Info 1714: Member function 'QP::QHsm::childState(unsigned int (*)(void *, const struct QP::QEvt *))' (line 526, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 525 1 Warning 1526: Member function 'QP::QHsm::childState(unsigned int (*)(void *, const struct QP::QEvt *))' (line 525, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 526 1 Warning 1526: Member function 'QP::QHsm::childState(unsigned int (*)(void *, const struct QP::QEvt *))' (line 526, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 529 1 Info 1714: Member function 'QP::QHsm::QHsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 529, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 530 1 Info 1714: Member function 'QP::QHsm::QHsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 530, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qep.h" 529 1 Warning 1526: Member function 'QP::QHsm::QHsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 529, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 530 1 Warning 1526: Member function 'QP::QHsm::QHsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 530, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 544 1 Warning 526: Symbol 'QP::versionStr' (line 544, file C:\qp\qpcpp\include\qep.h) not defined
+"C:\qp\qpcpp\include\qep.h" 545 1 Warning 526: Symbol 'QP::versionStr' (line 545, file C:\qp\qpcpp\include\qep.h) not defined
-"C:\qp\qpcpp\include\qep.h" 551 1 Info 1714: Member function 'QP::QEP::getVersion(void)' (line 551, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qep.h" 552 1 Info 1714: Member function 'QP::QEP::getVersion(void)' (line 552, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10]
 "C:\qp\qpcpp\include\qequeue.h" 161 1 Warning 1526: Member function 'QP::QEQueue::QEQueue(void)' (line 161, file C:\qp\qpcpp\include\qequeue.h) not defined
 "C:\qp\qpcpp\include\qequeue.h" 171 1 Info 1714: Member function 'QP::QEQueue::init(const struct QP::QEvt **, unsigned int)' (line 171, file C:\qp\qpcpp\include\qequeue.h) not referenced [MISRA C++ Rule 0-1-10]
 "C:\qp\qpcpp\include\qequeue.h" 171 1 Warning 1526: Member function 'QP::QEQueue::init(const struct QP::QEvt **, unsigned int)' (line 171, file C:\qp\qpcpp\include\qequeue.h) not defined
@@ -174,12 +174,12 @@
 "C:\qp\qpcpp\include\qk.h" 88 1 Info 1714: Member function 'QP::QK::getVersion(void)' (line 88, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10]
 "C:\qp\qpcpp\include\qk.h" 102 1 Info 1714: Member function 'QP::QK::onIdle(void)' (line 102, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10]
 "C:\qp\qpcpp\include\qk.h" 102 1 Warning 1526: Member function 'QP::QK::onIdle(void)' (line 102, file C:\qp\qpcpp\include\qk.h) not defined
-"C:\qp\qpcpp\include\qk.h" 108 1 Info 1714: Member function 'QP::QMutex::init(unsigned int)' (line 108, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qk.h" 108 1 Info 1714: Member function 'QP::QKMutex::init(unsigned int)' (line 108, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qk.h" 108 1 Warning 1526: Member function 'QP::QMutex::init(unsigned int)' (line 108, file C:\qp\qpcpp\include\qk.h) not defined
+"C:\qp\qpcpp\include\qk.h" 108 1 Warning 1526: Member function 'QP::QKMutex::init(unsigned int)' (line 108, file C:\qp\qpcpp\include\qk.h) not defined
-"C:\qp\qpcpp\include\qk.h" 109 1 Info 1714: Member function 'QP::QMutex::lock(void)' (line 109, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qk.h" 109 1 Info 1714: Member function 'QP::QKMutex::lock(void)' (line 109, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qk.h" 109 1 Warning 1526: Member function 'QP::QMutex::lock(void)' (line 109, file C:\qp\qpcpp\include\qk.h) not defined
+"C:\qp\qpcpp\include\qk.h" 109 1 Warning 1526: Member function 'QP::QKMutex::lock(void)' (line 109, file C:\qp\qpcpp\include\qk.h) not defined
-"C:\qp\qpcpp\include\qk.h" 110 1 Info 1714: Member function 'QP::QMutex::unlock(void)' (line 110, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10]
+"C:\qp\qpcpp\include\qk.h" 110 1 Info 1714: Member function 'QP::QKMutex::unlock(void)' (line 110, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10]
-"C:\qp\qpcpp\include\qk.h" 110 1 Warning 1526: Member function 'QP::QMutex::unlock(void)' (line 110, file C:\qp\qpcpp\include\qk.h) not defined
+"C:\qp\qpcpp\include\qk.h" 110 1 Warning 1526: Member function 'QP::QKMutex::unlock(void)' (line 110, file C:\qp\qpcpp\include\qk.h) not defined
 "C:\qp\qpcpp\include\qf.h" 182 1 Warning 1526: Member function 'QP::QMActive::QMActive(unsigned int (*)(void *, const struct QP::QEvt *))' (line 182, file C:\qp\qpcpp\include\qf.h) not defined
 "C:\qp\qpcpp\include\qf.h" 187 1 Warning 1526: Member function 'QP::QMActive::start(unsigned int, const struct QP::QEvt **, unsigned int, void *, unsigned int, const struct QP::QEvt *)' (line 187, file C:\qp\qpcpp\include\qf.h) not defined
 "C:\qp\qpcpp\include\qf.h" 193 1 Info 1716: Virtual member function 'QP::QMActive::start(unsigned int, const struct QP::QEvt **, unsigned int, void *, unsigned int)' (line 193, file C:\qp\qpcpp\include\qf.h) not referenced [MISRA C++ Rule 0-1-10]

examples/arm-cm/dpp_ek-tm4c123gxl/qk/bsp.cpp

@@ -1,7 +1,7 @@
 ///***************************************************************************
 // Product: DPP example, EK-TM4C123GXL board, preemptive QK kernel
-// Last updated for version 5.6.0
+// Last updated for version 5.6.4
-// Last updated on  2015-12-26
+// Last updated on  2016-05-04
 //
 //                    Q u a n t u m     L e a P s
 //                    ---------------------------
@@ -76,7 +76,7 @@ Q_ASSERT_COMPILE(MAX_KERNEL_AWARE_CMSIS_PRI <= (0xFF >>(8-__NVIC_PRIO_BITS)));
 #define BTN_SW2     (1U << 0)
 
 static uint32_t l_rnd; // random seed
-static QP::QMutex l_rndMutex; // to protect the random number generator
+static QP::QKMutex l_rndMutex; // to protect the random number generator
 
 #ifdef Q_SPY
 

examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, DPP-GUI, Win32-QV, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -172,7 +172,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/bsp.cpp

@@ -1,7 +1,7 @@
 //****************************************************************************
 // Product: DPP example with Win32-GUI
-// Last updated for version 5.6.0
+// Last updated for version 5.6.4
-// Last updated on  2015-12-30
+// Last updated on  2016-05-04
 //
 //                    Q u a n t u m     L e a P s
 //                    ---------------------------
@@ -35,7 +35,7 @@
 #include "dpp.h"
 #include "bsp.h"
 
-#include "win32_gui.h" // Win32 GUI elements for embedded front panels
+#include "qwin_gui.h"  // QWIN GUI
 #include "resource.h"  // GUI resource IDs generated by the resource editior
 
 #include <stdio.h>     // for snprintf()

examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/dpp-gui.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -82,7 +82,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32_GUI;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;QWIN_GUI;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -133,7 +133,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>Q_SPY;WIN32_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -190,7 +190,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QWIN_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>

examples/arm-cm/dpp_ek-tm4c123gxl/win32/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, DPP-GUI, Win32, MinGW
-# Last updated for version 5.6.0
+# Last updated for version 5.6.4
-# Last updated on  2015-12-30
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -172,7 +172,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/arm-cm/dpp_ek-tm4c123gxl/win32/bsp.cpp

@@ -1,7 +1,7 @@
 //****************************************************************************
 // Product: DPP example with Win32-GUI
-// Last updated for version 5.6.0
+// Last updated for version 5.6.4
-// Last updated on  2015-12-30
+// Last updated on  2016-05-04
 //
 //                    Q u a n t u m     L e a P s
 //                    ---------------------------
@@ -35,7 +35,7 @@
 #include "dpp.h"
 #include "bsp.h"
 
-#include "win32_gui.h" // Win32 GUI elements for embedded front panels
+#include "qwin_gui.h"  // QWIN GUI
 #include "resource.h"  // GUI resource IDs generated by the resource editior
 
 #include <stdio.h>     // for snprintf()

examples/arm-cm/dpp_ek-tm4c123gxl/win32/dpp-gui.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -82,7 +82,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32_GUI;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;QWIN_GUI;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -133,7 +133,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>Q_SPY;WIN32_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -190,7 +190,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QWIN_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>

examples/arm-cm/dpp_nucleo-l053r8/qk/bsp.cpp

@@ -1,7 +1,7 @@
 ///***************************************************************************
 // Product: DPP example, STM32 NUCLEO-L053R8 board, preemptive QK kernel
-// Last updated for version 5.6.0
+// Last updated for version 5.6.4
-// Last updated on  2015-12-30
+// Last updated on  2016-05-04
 //
 //                    Q u a n t u m     L e a P s
 //                    ---------------------------
@@ -71,7 +71,7 @@ Q_ASSERT_COMPILE(MAX_KERNEL_AWARE_CMSIS_PRI <= (0xFF >>(8-__NVIC_PRIO_BITS)));
 #define BTN_B1   (1U << 13)
 
 static unsigned  l_rnd; // random seed
-static QP::QMutex l_rndMutex; // to protect the random number generator
+static QP::QKMutex l_rndMutex; // to protect the random number generator
 
 #ifdef Q_SPY
 

examples/arm-cm/game_ek-lm3s811/win32-qv/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, "Fly 'n' Shoot" Game GUI, Win32-QV, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/arm-cm/game_ek-lm3s811/win32-qv/bsp.cpp

@@ -1,7 +1,7 @@
 //****************************************************************************
 // Product: "Fly 'n' Shoot" game example for Win32-GUI
-// Last updated for version 5.6.0
+// Last updated for version 5.6.4
-// Last updated on  2015-12-26
+// Last updated on  2016-05-04
 //
 //                    Q u a n t u m     L e a P s
 //                    ---------------------------
@@ -35,7 +35,7 @@
 #include "game.h"
 #include "bsp.h"
 
-#include "win32_gui.h" // Win32 GUI elements for embedded front panels
+#include "qwin_gui.h"  // QWIN GUI
 #include "resource.h"  // GUI resource IDs generated by the resource editior
 
 #include <stdio.h>     // for _snprintf_s()

examples/arm-cm/game_ek-lm3s811/win32-qv/game-gui.vcxproj

@@ -82,7 +82,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32_GUI;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;QWIN_GUI;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -133,7 +133,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>Q_SPY;WIN32_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -190,7 +190,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QWIN_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>

examples/arm-cm/game_ek-lm3s811/win32/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, "Fly 'n' Shoot" Game GUI, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/arm-cm/game_ek-lm3s811/win32/bsp.cpp

@@ -35,7 +35,7 @@
 #include "game.h"
 #include "bsp.h"
 
-#include "win32_gui.h" // Win32 GUI elements for embedded front panels
+#include "qwin_gui.h"  // QWIN GUI
 #include "resource.h"  // GUI resource IDs generated by the resource editior
 
 #include <stdio.h>     // for _snprintf_s()

examples/arm-cm/game_ek-lm3s811/win32/game-gui.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -82,7 +82,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32_GUI;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;QWIN_GUI;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -133,7 +133,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>Q_SPY;WIN32_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -190,7 +190,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QWIN_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>

examples/win32-qv/dpp/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, DPP console, Win32-QV, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -176,7 +176,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32-qv/reminder2/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Reminder2 pattern console, Win32-QV, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/calc/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Calc console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/calc2/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Calc2 console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/comp/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Orthogonal Component console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/comp_qm/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: QP/C++, Orthogonal Component with QM console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -176,7 +176,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/defer/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Deferred Event console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/dpp/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, DPP console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -176,7 +176,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/history_qhsm/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, History for QHsm console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/history_qmsm/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, History for QMsm console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/qhsmtst/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, QHsmTst console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/qmsmtst/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, QMsmTst console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/reminder/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Reminder pattern console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

examples/win32/reminder2/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++, Reminder2 pattern console, Win32, MinGW
-# Last updated for version 5.5.0
+# Last updated for version 5.6.4
-# Last updated on  2015-09-25
+# Last updated on  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 # is it a GUI application (any GUI resources provided?) ...
 ifneq (,$(RC_SRCS))
 LINKFLAGS += -mwindows
-DEFINES += -DWIN32_GUI
+DEFINES += -DQWIN_GUI
 endif
 
 #-----------------------------------------------------------------------------

include/qf.h

@@ -3,8 +3,8 @@
 /// @ingroup qf
 /// @cond
 ///***************************************************************************
-/// Last updated for version 5.6.2
+/// Last updated for version 5.6.4
-/// Last updated on  2016-03-30
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
@@ -260,7 +260,7 @@ public:
 
     friend class QF;
     friend class QTimeEvt;
-    friend class QMutex;
+    friend class QKMutex;
     friend class QXK;
     friend class QXThread;
     friend class QXMutex;

include/qk.h

@@ -3,8 +3,8 @@
 /// @ingroup qk
 /// @cond
 ///***************************************************************************
-/// Last updated for version 5.6.2
+/// Last updated for version 5.6.4
-/// Last updated on  2016-03-31
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
@@ -103,7 +103,7 @@ public:
 };
 
 /*! Priority-ceiling Mutex the QK preemptive kernel */
-class QMutex {
+class QKMutex {
 public:
     void init(uint_fast8_t const prio);
     void lock(void);
@@ -161,7 +161,7 @@ extern uint_fast8_t volatile QK_lockPrio_; //!< lock prio (0 == no-lock)
     // QF-specific scheduler locking
     //! Internal port-specific macro to represent the scheduler lock status
     // that needs to be preserved to allow nesting of locks.
-    #define QF_SCHED_STAT_TYPE_ QMutex
+    #define QF_SCHED_STAT_TYPE_ QKMutex
 
     //! Internal port-specific macro for selective scheduler locking.
     #define QF_SCHED_LOCK_(pLockStat_, prio_) do { \

ports/qt/qf_port.cpp

@@ -2,14 +2,14 @@
 /// @brief QP/C++ port to Qt
 /// @cond
 ///***************************************************************************
-/// Last Updated for Version: QP 5.5.0/Qt 5.x
+/// Last Updated for Version: QP 5.6.4/Qt 5.x
-/// Last updated on  2015-09-26
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
 ///                    innovating embedded systems
 ///
-/// Copyright (C) Quantum Leaps, www.state-machine.com.
+/// Copyright (C) Quantum Leaps, LLC. All rights reserved.
 ///
 /// This program is open source software: you can redistribute it and/or
 /// modify it under the terms of the GNU General Public License as published
@@ -30,8 +30,8 @@
 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
 ///
 /// Contact information:
-/// Web:   www.state-machine.com
+/// http://www.state-machine.com
-/// Email: info@state-machine.com
+/// mailtp:info@state-machine.com
 ///***************************************************************************
 /// @endcond
 

ports/qt/qf_port.h

@@ -2,8 +2,8 @@
 /// @brief QP/C++ port to Qt
 /// @cond
 ///***************************************************************************
-/// Last Updated for Version: QP 5.6.2/Qt 5.x
+/// Last Updated for Version: QP 5.6.4/Qt 5.x
-/// Last updated on  2016-03-31
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
@@ -67,6 +67,7 @@
 
 class QWaitCondition; // forward declaration
 class QThread;        // forward declaration
+class QMutex;         // forward declaration
 
 #include "qep_port.h" // QEP port
 #include "qequeue.h"  // Qt port uses event-queue
@@ -95,6 +96,10 @@ void QF_setTickRate(uint32_t ticksPerSec);
 // clock tick callback (provided in the app)
 void QF_onClockTick(void);
 
+#ifdef QP_IMPL
+extern QMutex QF_qtMutex_;
+#endif
+
 #ifdef Q_SPY
 void QS_onEvent(void);
 #endif
@@ -135,10 +140,6 @@ void QS_onEvent(void);
     #include <QMutex>
     #include <QWaitCondition>
 
-namespace QP {
-    extern QMutex QF_qtMutex_;
-} // namespace QP
-
 #endif // QP_IMPL
 
 // undefine the conflicting Q_ASSERT definition from Qt

ports/qt/vc/qp.pro

@@ -0,0 +1,104 @@
+#-----------------------------------------------------------------------------
+# Product: QP/C++ port to Qt5
+# Last Updated for Version: QP/C++ 5.5.0/Qt 5.x
+# Date of the Last Update:  2015-09-26
+#
+#                    Q u a n t u m     L e a P s
+#                    ---------------------------
+#                    innovating embedded systems
+#
+# Copyright (C) Quantum Leaps, LLC. All rights reserved.
+#
+# This program is open source software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Alternatively, this program may be distributed and modified under the
+# terms of Quantum Leaps commercial licenses, which expressly supersede
+# the GNU General Public License and are specifically designed for
+# licensees interested in retaining the proprietary status of their code.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Contact information:
+# http://www.state-machine.com
+# mailto:info@state-machine.com
+#-----------------------------------------------------------------------------
+
+# NOTE:
+# This project builds QP/C++ library (for Qt5). This libary is needed
+# only in projects that link this library. (The example projects in
+# the qpcpp/examples/qt/ directory build QP/C++ from sources and actually
+# don't need the QP/C++ library).
+
+# NOTE:
+# After you build the QP/C++ library (libqp.a), you should copy the Debug
+# version to the debug/ sub-directory and the Release version to the
+# release/ sub-directory.
+
+QT      += core gui widgets
+TARGET   = qp
+TEMPLATE = lib
+CONFIG  += staticlib
+DEFINES += QT_NO_STATEMACHINE
+
+QPCPP = ../../..
+
+INCLUDEPATH += .. \
+    $$QPCPP/include \
+    $$QPCPP/source
+
+HEADERS +=  \
+    ../qep_port.h \
+    ../qf_port.h \
+    ../tickerthread.h \
+    ../aothread.h \
+    ../guiapp.h \
+    ../guiactive.h \
+    ../pixellabel.h
+
+SOURCES += \
+    ../qf_port.cpp \
+    ../guiapp.cpp \
+    ../pixellabel.cpp \
+    $$QPCPP/source/qep_hsm.cpp \
+    $$QPCPP/source/qep_msm.cpp \
+    $$QPCPP/source/qf_act.cpp \
+    $$QPCPP/source/qf_actq.cpp \
+    $$QPCPP/source/qf_defer.cpp \
+    $$QPCPP/source/qf_dyn.cpp \
+    $$QPCPP/source/qf_mem.cpp \
+    $$QPCPP/source/qf_ps.cpp \
+    $$QPCPP/source/qf_qact.cpp \
+    $$QPCPP/source/qf_qeq.cpp \
+    $$QPCPP/source/qf_qmact.cpp \
+    $$QPCPP/source/qf_time.cpp
+
+
+CONFIG(debug, debug|release) {
+
+    # NOTE:
+    # The Debug configuration also uses Q-SPY software tracing.
+    # The following defines, headers, and sources are needed only for
+    # the QS target-resident component.
+
+    DEFINES += Q_SPY
+
+    SOURCES += \
+        $$QPCPP/source/qs.cpp \
+        $$QPCPP/source/qs_rx.cpp \
+        $$QPCPP/source/qs_fp.cpp \
+        $$QPCPP/source/qs_64bit.cpp
+
+} else {
+
+    # Release build configuartion
+    DEFINES += NDEBUG
+}

ports/win32-qv/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C++ port to Win32-QV API, MinGW toolset
+# Product: Makefile for QP/C++ port to Win32 API, MinGW toolset
-# Last Updated for Version: 5.5.0
+# Last Updated for Version: 5.6.4
-# Date of the Last Update:  2015-09-24
+# Date of the Last Update:  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -96,8 +96,8 @@ CPP_SRCS := \
 	qf_qeq.cpp \
 	qf_qmact.cpp \
 	qf_time.cpp \
-	win32_gui.cpp \
+	qf_port.cpp \
-	qf_port.cpp
+	qwin_gui.cpp
 
 # C++ QS source files
 CPP_QS_SRCS := \
@@ -107,7 +107,7 @@ CPP_QS_SRCS := \
 	qs_64bit.cpp
 
 # defines
-DEFINES  := -DWIN32_GUI
+DEFINES  := -DQWIN_GUI
 
 #-----------------------------------------------------------------------------
 # MinGW toolset (NOTE: assumed to be on your PATH)

ports/win32-qv/QSpy/qp.tlog/qp.lastbuildstate

@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-QSpy|Win32|C:\qp\qpcpp\ports\win32-qv\|

ports/win32-qv/qf_port.h

@@ -2,8 +2,8 @@
 /// \brief QF/C++ port to Win32 API with cooperative QV scheduler (win32-qv)
 /// \cond
 ///***************************************************************************
-/// Last updated for version 5.6.2
+/// Last updated for version 5.6.4
-/// Last updated on  2016-03-31
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
@@ -85,8 +85,8 @@ void QF_onClockTick(void);
 } // namespace QP
 
 
-// special adaptations for Win32 GUI applications
+// special adaptations for QWIN GUI applications
-#ifdef WIN32_GUI
+#ifdef QWIN_GUI
     // replace main() with main_gui() as the entry point to a GUI app.
     #define main() main_gui()
     int_t main_gui(); // prototype of the GUI application entry point

ports/win32-qv/qp.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -68,7 +68,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;../../include;../../source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_GUI;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QWIN_GUI;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -87,7 +87,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>.;../../include;../../source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_GUI;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QWIN_GUI;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -108,7 +108,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;../../include;../../source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>Q_SPY;WIN32_GUI;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -173,7 +173,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="qf_port.cpp" />
-    <ClCompile Include="win32_gui.cpp" />
+    <ClCompile Include="qwin_gui.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\qf_pkg.h" />
@@ -183,7 +183,7 @@
     </ClInclude>
     <ClInclude Include="qep_port.h" />
     <ClInclude Include="qf_port.h" />
-    <ClInclude Include="win32_gui.h" />
+    <ClInclude Include="qwin_gui.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

ports/win32-qv/qwin_gui.cpp

@@ -1,15 +1,15 @@
 /// \file
-/// \brief Win32 GUI facilities for building realistic embedded front panels
+/// \brief QWIN GUI facilities for building realistic embedded front panels
 /// \cond
 ///***************************************************************************
-/// Last updated for version 5.4.2
+/// Last updated for version 5.6.4
-/// Last updated on  2015-06-05
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
 ///                    innovating embedded systems
 ///
-/// Copyright (C) Quantum Leaps, www.state-machine.com.
+/// Copyright (C) Quantum Leaps, LLC. All rights reserved.
 ///
 /// This program is open source software: you can redistribute it and/or
 /// modify it under the terms of the GNU General Public License as published
@@ -30,12 +30,12 @@
 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
 ///
 /// Contact information:
-/// Web:   www.state-machine.com
+/// http://www.state-machine.com
-/// Email: info@state-machine.com
+/// mailto:info@state-machine.com
 ///***************************************************************************
 /// \endcond
 
-#include "win32_gui.h"
+#include "qwin_gui.h"
 #include <stdlib.h>
 
 //----------------------------------------------------------------------------

ports/win32-qv/qwin_gui.h

@@ -1,15 +1,15 @@
 /// \file
-/// \brief Win32 GUI facilities for building realistic embedded front panels
+/// \brief QWIN GUI facilities for building realistic embedded front panels
 /// \cond
 ///***************************************************************************
-/// Last updated for version 5.4.2
+/// Last updated for version 5.6.4
-/// Last updated on  2015-06-05
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
 ///                    innovating embedded systems
 ///
-/// Copyright (C) Quantum Leaps, www.state-machine.com.
+/// Copyright (C) Quantum Leaps, LLC. All rights reserved.
 ///
 /// This program is open source software: you can redistribute it and/or
 /// modify it under the terms of the GNU General Public License as published
@@ -30,16 +30,16 @@
 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
 ///
 /// Contact information:
-/// Web:   www.state-machine.com
+/// http://www.state-machine.com
-/// Email: info@state-machine.com
+/// mailto:info@state-machine.com
 ///***************************************************************************
 /// \endcond
 
-#ifndef win32_gui_h
+#ifndef qwin_gui_h
-#define win32_gui_h
+#define qwin_gui_h
 
-#ifndef WIN32_GUI
+#ifndef QWIN_GUI
-    #error The pre-processor macro WIN32_GUI must be defined
+    #error The pre-processor macro QWIN_GUI must be defined
 #endif
 
 #define WIN32_LEAN_AND_MEAN
@@ -111,4 +111,4 @@ public:
 // useful helper functions ...................................................
 void DrawBitmap(HDC hdc, HBITMAP hBitmap, int xStart, int yStart);
 
-#endif // win32_gui_h
+#endif // qwin_gui_h

ports/win32/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
 # Product: Makefile for QP/C++ port to Win32 API, MinGW toolset
-# Last Updated for Version: 5.5.0
+# Last Updated for Version: 5.6.4
-# Date of the Last Update:  2015-09-24
+# Date of the Last Update:  2016-05-04
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -96,8 +96,8 @@ CPP_SRCS := \
 	qf_qeq.cpp \
 	qf_qmact.cpp \
 	qf_time.cpp \
-	win32_gui.cpp \
+	qf_port.cpp \
-	qf_port.cpp
+	qwin_gui.cpp
 
 # C++ QS source files
 CPP_QS_SRCS := \
@@ -107,7 +107,7 @@ CPP_QS_SRCS := \
 	qs_64bit.cpp
 
 # defines
-DEFINES  := -DWIN32_GUI
+DEFINES  := -DQWIN_GUI
 
 #-----------------------------------------------------------------------------
 # MinGW toolset (NOTE: assumed to be on your PATH)

ports/win32/QSpy/qp.tlog/qp.lastbuildstate

@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-QSpy|Win32|C:\qp\qpcpp\ports\win32\|

ports/win32/qf_port.h

@@ -2,8 +2,8 @@
 /// \brief QF/C++ port to Win32 API
 /// \cond
 ///***************************************************************************
-/// Last updated for version 5.6.2
+/// Last updated for version 5.6.4
-/// Last updated on  2016-03-31
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
@@ -90,8 +90,8 @@ void QF_onClockTick(void);
 } // namespace QP
 
 
-// special adaptations for Win32 GUI applications
+// special adaptations for QWIN GUI applications
-#ifdef WIN32_GUI
+#ifdef QWIN_GUI
     // replace main() with main_gui() as the entry point to a GUI app.
     #define main() main_gui()
     int_t main_gui(); // prototype of the GUI application entry point

ports/win32/qp.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -68,7 +68,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;../../include;../../source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_GUI;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QWIN_GUI;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -87,7 +87,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>.;../../include;../../source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_GUI;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QWIN_GUI;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -108,7 +108,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;../../include;../../source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>Q_SPY;WIN32_GUI;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -173,7 +173,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="qf_port.cpp" />
-    <ClCompile Include="win32_gui.cpp" />
+    <ClCompile Include="qwin_gui.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\qf_pkg.h" />
@@ -183,7 +183,7 @@
     </ClInclude>
     <ClInclude Include="qep_port.h" />
     <ClInclude Include="qf_port.h" />
-    <ClInclude Include="win32_gui.h" />
+    <ClInclude Include="qwin_gui.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

ports/win32/qwin_gui.cpp

@@ -1,15 +1,15 @@
 /// \file
-/// \brief Win32 GUI facilities for building realistic embedded front panels
+/// \brief QWIN GUI facilities for building realistic embedded front panels
 /// \cond
 ///***************************************************************************
-/// Last updated for version 5.4.2
+/// Last updated for version 5.6.4
-/// Last updated on  2015-06-05
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
 ///                    innovating embedded systems
 ///
-/// Copyright (C) Quantum Leaps, www.state-machine.com.
+/// Copyright (C) Quantum Leaps, LLC. All rights reserved.
 ///
 /// This program is open source software: you can redistribute it and/or
 /// modify it under the terms of the GNU General Public License as published
@@ -30,12 +30,12 @@
 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
 ///
 /// Contact information:
-/// Web:   www.state-machine.com
+/// http://www.state-machine.com
-/// Email: info@state-machine.com
+/// mailto:info@state-machine.com
 ///***************************************************************************
 /// \endcond
 
-#include "win32_gui.h"
+#include "qwin_gui.h"
 #include <stdlib.h>
 
 //----------------------------------------------------------------------------

ports/win32/qwin_gui.h

@@ -1,15 +1,15 @@
 /// \file
-/// \brief Win32 GUI facilities for building realistic embedded front panels
+/// \brief QWIN GUI facilities for building realistic embedded front panels
 /// \cond
 ///***************************************************************************
-/// Last updated for version 5.4.2
+/// Last updated for version 5.6.4
-/// Last updated on  2015-06-05
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
 ///                    innovating embedded systems
 ///
-/// Copyright (C) Quantum Leaps, www.state-machine.com.
+/// Copyright (C) Quantum Leaps, LLC. All rights reserved.
 ///
 /// This program is open source software: you can redistribute it and/or
 /// modify it under the terms of the GNU General Public License as published
@@ -30,16 +30,16 @@
 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
 ///
 /// Contact information:
-/// Web:   www.state-machine.com
+/// http://www.state-machine.com
-/// Email: info@state-machine.com
+/// mailto:info@state-machine.com
 ///***************************************************************************
 /// \endcond
 
-#ifndef win32_gui_h
+#ifndef qwin_gui_h
-#define win32_gui_h
+#define qwin_gui_h
 
-#ifndef WIN32_GUI
+#ifndef QWIN_GUI
-    #error The pre-processor macro WIN32_GUI must be defined
+    #error The pre-processor macro QWIN_GUI must be defined
 #endif
 
 #define WIN32_LEAN_AND_MEAN
@@ -111,4 +111,4 @@ public:
 // useful helper functions ...................................................
 void DrawBitmap(HDC hdc, HBITMAP hBitmap, int xStart, int yStart);
 
-#endif // win32_gui_h
+#endif // qwin_gui_h

source/qk_mutex.cpp

@@ -1,12 +1,12 @@
 /// @file
-/// @brief QP::QMutex::init(), QP::QMutex::lock(), and QP::QMutex::unlock()
+/// @brief QP::QKMutex::init(), QP::QKMutex::lock(), and QP::QKMutex::unlock()
 /// definitions.
 /// @ingroup qk
 /// @cond
 ///***************************************************************************
 /// Product: QK/C++
-/// Last updated for version 5.6.2
+/// Last updated for version 5.6.4
-/// Last updated on  2016-03-31
+/// Last updated on  2016-05-04
 ///
 ///                    Q u a n t u m     L e a P s
 ///                    ---------------------------
@@ -70,13 +70,13 @@ enum {
 /// @note
 /// A mutex must be initialized before it can be locked or unlocked.
 ///
-/// @sa QP::QMutex::lock(), QP::QMutex::unlock()
+/// @sa QP::QKMutex::lock(), QP::QKMutex::unlock()
 ///
 /// @usage
 /// The following example shows how to initialize, lock and unlock QK mutex:
 /// @include qk_mux.cpp
 ///
-void QMutex::init(uint_fast8_t const prio) {
+void QKMutex::init(uint_fast8_t const prio) {
     m_lockPrio = prio;
     m_prevPrio = static_cast<uint_fast8_t>(MUTEX_UNUSED);
 }
@@ -89,16 +89,16 @@ void QMutex::init(uint_fast8_t const prio) {
 /// A mutex must be initialized before it can be locked or unlocked.
 ///
 /// @note
-/// QP::QMutex::lock() must be always followed by the corresponding
+/// QP::QKMutex::lock() must be always followed by the corresponding
-/// QP::QMutex::unlock().
+/// QP::QKMutex::unlock().
 ///
-/// @sa QP::QMutex::init(), QP::QMutex::unlock()
+/// @sa QP::QKMutex::init(), QP::QKMutex::unlock()
 ///
 /// @usage
 /// The following example shows how to initialize, lock and unlock QK mutex:
 /// @include qk_mux.cpp
 ///
-void QMutex::lock(void) {
+void QKMutex::lock(void) {
     QF_CRIT_STAT_
     QF_CRIT_ENTRY_();
 
@@ -130,16 +130,16 @@ void QMutex::lock(void) {
 /// A mutex must be initialized before it can be locked or unlocked.
 ///
 /// @note
-/// QP::QMutex::unlock() must always follow the corresponding
+/// QP::QKMutex::unlock() must always follow the corresponding
-/// QP::QMutex::lock().
+/// QP::QKMutex::lock().
 ///
-/// @sa QP::QMutex::init(), QP::QMutex::lock()
+/// @sa QP::QKMutex::init(), QP::QKMutex::lock()
 ///
 /// @usage
 /// The following example shows how to initialize, lock and unlock QK mutex:
 /// @include qk_mux.cpp
 ///
-void QMutex::unlock(void) {
+void QKMutex::unlock(void) {
     QF_CRIT_STAT_
     QF_CRIT_ENTRY_();