From fc2bc6bafce8dfec72666bff3d0ef5c78b124dd3 Mon Sep 17 00:00:00 2001 From: Thomas Sax Date: Wed, 6 Dec 2023 14:30:45 +0100 Subject: [PATCH] Mark hwapi-functions as overridden. --- include/hwapi.h | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/include/hwapi.h b/include/hwapi.h index 1b6d22e..892e9f9 100644 --- a/include/hwapi.h +++ b/include/hwapi.h @@ -26,6 +26,8 @@ V4.0 6.9.2023: activating DC-Bootloader in slve-lib (SM) #ifndef hwapi_H #define hwapi_H +#include +//#include #include #include #include @@ -69,9 +71,12 @@ V4.0 6.9.2023: activating DC-Bootloader in slve-lib (SM) */ //for CAslave: -//#undef THIS_IS_CA_MASTER +//#undef THIS_IS_CA_MASTER //for CAmaster: +#define THIS_IS_CA_MASTER + + class QSharedMemory; @@ -1305,31 +1310,35 @@ public: + signals: - // already declared in interfaces.h - void hwapi_templatePrintFinished_OK(void) const; - void hwapi_templatePrintFinished_Err(void) const; + void hwapi_templatePrintFinished_OK(void) const override; + void hwapi_templatePrintFinished_Err(void) const override; - void hwapi_coinCollectionJustStarted(void) const; - void hwapi_coinCollectionAborted(void) const; + void hwapi_coinCollectionJustStarted(void) const override; + void hwapi_coinCollectionAborted(void) const override; - void hwapi_gotNewCoin(void) const; - void hwapi_payStopByMax(void) const; - void hwapi_payStopByPushbutton(void) const; + void hwapi_gotNewCoin(void) const override; + void hwapi_payStopByMax(void) const override; + void hwapi_payStopByPushbutton(void) const override; - void hwapi_payStopByEscrow(void) const; - void hwapi_payStopByError(void) const; - void hwapi_payStopByTimeout(void) const; - void hwapi_payCancelled(void) const; - void hwapi_coinProcessJustStopped(void) const; + void hwapi_payStopByEscrow(void) const override; + void hwapi_payStopByError(void) const override; + void hwapi_payStopByTimeout(void) const override; + void hwapi_payCancelled(void) const override; + void hwapi_coinProcessJustStopped(void) const override; // new from 2023.06.12 - void hwapi_doorServiceDoorOpened(void) const; - void hwapi_doorVaultDoorOpened(void) const; - void hwapi_doorCoinBoxRemoved(void) const; - void hwapi_doorCoinBoxInserted(void) const; - void hwapi_doorCBinAndAllDoorsClosed(void) const; - void hwapi_doorAllDoorsClosed(void) const; + void hwapi_doorServiceDoorOpened(void) const override; + void hwapi_doorVaultDoorOpened(void) const override; + void hwapi_doorCoinBoxRemoved(void) const override; + void hwapi_doorCoinBoxInserted(void) const override; + void hwapi_doorCBinAndAllDoorsClosed(void) const override; + void hwapi_doorAllDoorsClosed(void) const override; + + + + private slots: //void hwapi_slotPrintFinished_OK(void);