Skip to content

Commit ba87f4a

Browse files
committed
mqtt: removing redundant virtualization
1 parent 786976a commit ba87f4a

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

mqtt_streaming_module/include/mqtt_streaming_module/mqtt_base_fb.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,16 @@ class MqttBaseFb : public FunctionBlock
6767
StatusHelper<SubscriptionStatus> subscriptionStatus;
6868
int qos = DEFAULT_SUB_QOS;
6969

70-
virtual void createSignals() = 0;
7170
virtual void processMessage(const mqtt::MqttMessage& msg) = 0;
7271

73-
virtual void initProperties(const PropertyObjectPtr& config);
72+
void initProperties(const PropertyObjectPtr& config);
7473
virtual void readProperties() = 0;
7574

7675
void onSignalsMessage(const mqtt::MqttAsyncClient& subscriber, const mqtt::MqttMessage& msg);
7776

7877
virtual void clearSubscribedTopic() = 0;
79-
virtual CmdResult subscribeToTopic();
80-
virtual CmdResult unsubscribeFromTopic();
78+
CmdResult subscribeToTopic();
79+
CmdResult unsubscribeFromTopic();
8180

8281
virtual void propertyChanged() = 0;
8382

mqtt_streaming_module/include/mqtt_streaming_module/mqtt_json_receiver_fb_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ class MqttJsonReceiverFbImpl final : public MqttBaseFb
5353

5454
void initNestedFbTypes();
5555

56-
void createSignals() override;
56+
void createSignals();
5757
void clearSubscribedTopic() override;
5858

5959
void processMessage(const mqtt::MqttMessage& msg) override;
60-
void initProperties(const PropertyObjectPtr& config) override;
60+
void initProperties(const PropertyObjectPtr& config);
6161
void readProperties() override;
6262
void readJsonConfig();
6363
std::pair<bool, std::string> readFileToString(const std::string& filePath);

mqtt_streaming_module/include/mqtt_streaming_module/mqtt_raw_receiver_fb_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class MqttRawReceiverFbImpl final : public MqttBaseFb
4545

4646
static std::string generateLocalId();
4747

48-
void createSignals() override;
48+
void createSignals();
4949
void clearSubscribedTopic() override;
5050

5151
void processMessage(const mqtt::MqttMessage& msg) override;

0 commit comments

Comments
 (0)