diff --git a/src/ebusd/datahandler.h b/src/ebusd/datahandler.h index 4bedd65f..b7dd223a 100755 --- a/src/ebusd/datahandler.h +++ b/src/ebusd/datahandler.h @@ -110,7 +110,7 @@ class DataHandler { /** * Called to start the @a DataHandler. */ - virtual void start() = 0; + virtual void startHandler() = 0; /** * Return whether this is a @a DataSink instance. diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp index 7b3406fd..89479bb2 100644 --- a/src/ebusd/mainloop.cpp +++ b/src/ebusd/mainloop.cpp @@ -231,7 +231,7 @@ void MainLoop::run() { if (dataHandler->isDataSink()) { dataSinks.push_back(dynamic_cast(dataHandler)); } - dataHandler->start(); + dataHandler->startHandler(); } while (!m_shutdown) { // pick the next message to handle diff --git a/src/ebusd/mqtthandler.cpp b/src/ebusd/mqtthandler.cpp index 61ab9df6..b0b717f4 100755 --- a/src/ebusd/mqtthandler.cpp +++ b/src/ebusd/mqtthandler.cpp @@ -1171,7 +1171,7 @@ MqttHandler::~MqttHandler() { mosquitto_lib_cleanup(); } -void MqttHandler::start() { +void MqttHandler::startHandler() { if (m_mosquitto) { WaitThread::start("MQTT"); } diff --git a/src/ebusd/mqtthandler.h b/src/ebusd/mqtthandler.h index a19a7bc8..28d93c7c 100644 --- a/src/ebusd/mqtthandler.h +++ b/src/ebusd/mqtthandler.h @@ -281,7 +281,7 @@ class MqttHandler : public DataSink, public DataSource, public WaitThread { virtual ~MqttHandler(); // @copydoc - void start() override; + void startHandler() override; /** * Notify the handler of a (re-)established connection to the broker.