From 5fee00f27bec32eec3c80e4834ee93dfacdc3be0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 5 Apr 2026 23:56:02 +0200 Subject: [PATCH] [Cleanup] Add 'override' to virtual controller queue functions --- platformio_core_defs.ini | 8 +------- src/src/ControllerQueue/C011_queue_element.h | 8 ++++---- src/src/ControllerQueue/C015_queue_element.h | 8 ++++---- src/src/ControllerQueue/C016_queue_element.h | 8 ++++---- src/src/ControllerQueue/C018_queue_element.h | 8 ++++---- src/src/ControllerQueue/C023_queue_element.h | 8 ++++---- src/src/ControllerQueue/MQTT_queue_element.h | 8 ++++---- .../SimpleQueueElement_formatted_Strings.h | 8 ++++---- src/src/ControllerQueue/SimpleQueueElement_string_only.h | 8 ++++---- 9 files changed, 33 insertions(+), 39 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 37863806d..c7340f2b5 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -238,13 +238,7 @@ build_flags = -DESP32_STAGE -DNO_GLOBAL_SPIFFS -DNO_GLOBAL_OPENTHREADCLI -DNO_GLOBAL_WIFIPROV - - - - - - - +; -Wsuggest-override lib_ignore = BLE Zigbee diff --git a/src/src/ControllerQueue/C011_queue_element.h b/src/src/ControllerQueue/C011_queue_element.h index 91d99167c..35f06e1a3 100644 --- a/src/src/ControllerQueue/C011_queue_element.h +++ b/src/src/ControllerQueue/C011_queue_element.h @@ -29,17 +29,17 @@ public: C011_queue_element(const struct EventStruct *event); - bool isDuplicate(const Queue_element_base& other) const; + bool isDuplicate(const Queue_element_base& other) const override; - const UnitMessageCount_t* getUnitMessageCount() const { + const UnitMessageCount_t* getUnitMessageCount() const override { return nullptr; } - UnitMessageCount_t* getUnitMessageCount() { + UnitMessageCount_t* getUnitMessageCount() override { return nullptr; } - size_t getSize() const; + size_t getSize() const override; String uri; String HttpMethod; diff --git a/src/src/ControllerQueue/C015_queue_element.h b/src/src/ControllerQueue/C015_queue_element.h index fec2c6658..caffef823 100644 --- a/src/src/ControllerQueue/C015_queue_element.h +++ b/src/src/ControllerQueue/C015_queue_element.h @@ -35,15 +35,15 @@ public: bool checkDone(bool succesfull) const; - size_t getSize() const; + size_t getSize() const override; - bool isDuplicate(const Queue_element_base& other) const; + bool isDuplicate(const Queue_element_base& other) const override; - const UnitMessageCount_t* getUnitMessageCount() const { + const UnitMessageCount_t* getUnitMessageCount() const override { return nullptr; } - UnitMessageCount_t* getUnitMessageCount() { + UnitMessageCount_t* getUnitMessageCount() override { return nullptr; } diff --git a/src/src/ControllerQueue/C016_queue_element.h b/src/src/ControllerQueue/C016_queue_element.h index 5c35d3df1..d1125eb6d 100644 --- a/src/src/ControllerQueue/C016_queue_element.h +++ b/src/src/ControllerQueue/C016_queue_element.h @@ -49,15 +49,15 @@ public: C016_queue_element & operator=(C016_queue_element&& other); - size_t getSize() const; + size_t getSize() const override; - bool isDuplicate(const Queue_element_base& other) const; + bool isDuplicate(const Queue_element_base& other) const override; - const UnitMessageCount_t* getUnitMessageCount() const { + const UnitMessageCount_t* getUnitMessageCount() const override { return nullptr; } - UnitMessageCount_t* getUnitMessageCount() { + UnitMessageCount_t* getUnitMessageCount() override { return nullptr; } diff --git a/src/src/ControllerQueue/C018_queue_element.h b/src/src/ControllerQueue/C018_queue_element.h index b7c9fb8ae..d702e82df 100644 --- a/src/src/ControllerQueue/C018_queue_element.h +++ b/src/src/ControllerQueue/C018_queue_element.h @@ -30,15 +30,15 @@ public: C018_queue_element(struct EventStruct *event, uint8_t sampleSetCount); - size_t getSize() const; + size_t getSize() const override; - bool isDuplicate(const Queue_element_base& other) const; + bool isDuplicate(const Queue_element_base& other) const override; - const UnitMessageCount_t* getUnitMessageCount() const { + const UnitMessageCount_t* getUnitMessageCount() const override { return nullptr; } - UnitMessageCount_t* getUnitMessageCount() { + UnitMessageCount_t* getUnitMessageCount() override { return nullptr; } diff --git a/src/src/ControllerQueue/C023_queue_element.h b/src/src/ControllerQueue/C023_queue_element.h index e5e1fc4d5..7ad745f62 100644 --- a/src/src/ControllerQueue/C023_queue_element.h +++ b/src/src/ControllerQueue/C023_queue_element.h @@ -30,15 +30,15 @@ public: C023_queue_element(struct EventStruct *event, uint8_t sampleSetCount); - size_t getSize() const; + size_t getSize() const override; - bool isDuplicate(const Queue_element_base& other) const; + bool isDuplicate(const Queue_element_base& other) const override; - const UnitMessageCount_t* getUnitMessageCount() const { + const UnitMessageCount_t* getUnitMessageCount() const override { return nullptr; } - UnitMessageCount_t* getUnitMessageCount() { + UnitMessageCount_t* getUnitMessageCount() override { return nullptr; } diff --git a/src/src/ControllerQueue/MQTT_queue_element.h b/src/src/ControllerQueue/MQTT_queue_element.h index fef4383de..1f2e8f137 100644 --- a/src/src/ControllerQueue/MQTT_queue_element.h +++ b/src/src/ControllerQueue/MQTT_queue_element.h @@ -35,15 +35,15 @@ public: bool retained, bool callbackTask); - size_t getSize() const; + size_t getSize() const override; - bool isDuplicate(const Queue_element_base& other) const; + bool isDuplicate(const Queue_element_base& other) const override; - const UnitMessageCount_t* getUnitMessageCount() const { + const UnitMessageCount_t* getUnitMessageCount() const override { return &UnitMessageCount; } - UnitMessageCount_t* getUnitMessageCount() { + UnitMessageCount_t* getUnitMessageCount() override { return &UnitMessageCount; } diff --git a/src/src/ControllerQueue/SimpleQueueElement_formatted_Strings.h b/src/src/ControllerQueue/SimpleQueueElement_formatted_Strings.h index f812063e5..622424217 100644 --- a/src/src/ControllerQueue/SimpleQueueElement_formatted_Strings.h +++ b/src/src/ControllerQueue/SimpleQueueElement_formatted_Strings.h @@ -39,15 +39,15 @@ public: // For controllers that only send a single value per request and thus need to keep track of the number of values already sent. bool checkDone(bool succesfull) const; - size_t getSize() const; + size_t getSize() const override; - bool isDuplicate(const Queue_element_base& other) const; + bool isDuplicate(const Queue_element_base& other) const override; - const UnitMessageCount_t* getUnitMessageCount() const { + const UnitMessageCount_t* getUnitMessageCount() const override { return nullptr; } - UnitMessageCount_t* getUnitMessageCount() { + UnitMessageCount_t* getUnitMessageCount() override { return nullptr; } diff --git a/src/src/ControllerQueue/SimpleQueueElement_string_only.h b/src/src/ControllerQueue/SimpleQueueElement_string_only.h index 488eeabe3..bbe87be95 100644 --- a/src/src/ControllerQueue/SimpleQueueElement_string_only.h +++ b/src/src/ControllerQueue/SimpleQueueElement_string_only.h @@ -23,15 +23,15 @@ public: taskIndex_t TaskIndex, String && req); - size_t getSize() const; + size_t getSize() const override; - bool isDuplicate(const Queue_element_base& other) const; + bool isDuplicate(const Queue_element_base& other) const override; - const UnitMessageCount_t* getUnitMessageCount() const { + const UnitMessageCount_t* getUnitMessageCount() const override { return nullptr; } - UnitMessageCount_t* getUnitMessageCount() { + UnitMessageCount_t* getUnitMessageCount() override { return nullptr; }