From 9461e64cc5c4742e02e3ac6e5c04e62935945242 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 4 Mar 2017 14:08:19 +0100 Subject: [PATCH] avoid virtual with override --- src/ebusd/bushandler.h | 6 ++-- src/ebusd/datahandler.h | 4 +-- src/ebusd/mainloop.h | 12 ++++---- src/ebusd/mqtthandler.h | 4 +-- src/lib/ebus/contrib/tem.h | 6 ++-- src/lib/ebus/data.h | 56 +++++++++++++++++++------------------- src/lib/ebus/datatype.h | 22 +++++++-------- src/lib/ebus/device.h | 18 ++++++------ src/lib/ebus/message.h | 50 +++++++++++++++++----------------- src/lib/utils/thread.h | 4 +-- 10 files changed, 91 insertions(+), 91 deletions(-) diff --git a/src/ebusd/bushandler.h b/src/ebusd/bushandler.h index 40f9f673..1ade0c2b 100644 --- a/src/ebusd/bushandler.h +++ b/src/ebusd/bushandler.h @@ -166,7 +166,7 @@ class PollRequest : public BusRequest { result_t prepare(symbol_t masterAddress); // @copydoc - virtual bool notify(result_t result, SlaveSymbolString& slave) override; + bool notify(result_t result, SlaveSymbolString& slave) override; private: @@ -215,7 +215,7 @@ class ScanRequest : public BusRequest { result_t prepare(symbol_t masterAddress); // @copydoc - virtual bool notify(result_t result, SlaveSymbolString& slave) override; + bool notify(result_t result, SlaveSymbolString& slave) override; private: @@ -269,7 +269,7 @@ class ActiveBusRequest : public BusRequest { virtual ~ActiveBusRequest() {} // @copydoc - virtual bool notify(result_t result, SlaveSymbolString& slave) override; + bool notify(result_t result, SlaveSymbolString& slave) override; private: diff --git a/src/ebusd/datahandler.h b/src/ebusd/datahandler.h index bbd89114..418cce0a 100644 --- a/src/ebusd/datahandler.h +++ b/src/ebusd/datahandler.h @@ -152,7 +152,7 @@ class DataSink : virtual public DataHandler { virtual void notifyUpdate(Message* message); // @copydoc - virtual bool isDataSink() override { return true; } + bool isDataSink() override { return true; } protected: @@ -182,7 +182,7 @@ class DataSource : virtual public DataHandler { virtual ~DataSource() {} // @copydoc - virtual bool isDataSource() override { return true; } + bool isDataSource() override { return true; } protected: diff --git a/src/ebusd/mainloop.h b/src/ebusd/mainloop.h index 9dae4b34..255905eb 100644 --- a/src/ebusd/mainloop.h +++ b/src/ebusd/mainloop.h @@ -62,22 +62,22 @@ class UserList : public UserInfo, public FileReader { virtual ~UserList() {} // @copydoc - virtual result_t addFromFile(vector::iterator& begin, const vector::iterator end, + result_t addFromFile(vector::iterator& begin, const vector::iterator end, vector< vector >* defaults, const string& defaultDest, const string& defaultCircuit, const string& defaultSuffix, const string& filename, unsigned int lineNo) override; // @copydoc - virtual bool hasUser(const string user) override { + bool hasUser(const string user) override { return m_userLevels.find(user) != m_userLevels.end(); } // @copydoc - virtual bool checkSecret(const string user, const string secret) override { + bool checkSecret(const string user, const string secret) override { return m_userSecrets.find(user) != m_userSecrets.end() && m_userSecrets[user] == secret; } // @copydoc - virtual string getLevels(const string user) override { return m_userLevels[user]; } + string getLevels(const string user) override { return m_userLevels[user]; } private: /** the secret string by user name. */ @@ -119,12 +119,12 @@ class MainLoop : public Thread, DeviceListener { void addMessage(NetMessage* message) { m_netQueue.push(message); } // @copydoc - virtual void notifyDeviceData(const symbol_t symbol, bool received) override; + void notifyDeviceData(const symbol_t symbol, bool received) override; protected: // @copydoc - virtual void run() override; + void run() override; private: diff --git a/src/ebusd/mqtthandler.h b/src/ebusd/mqtthandler.h index 71a98b39..6ff7e810 100644 --- a/src/ebusd/mqtthandler.h +++ b/src/ebusd/mqtthandler.h @@ -71,7 +71,7 @@ class MqttHandler : public DataSink, public DataSource, public Thread { virtual ~MqttHandler(); // @copydoc - virtual void start() override; + void start() override; /** * Notify the handler of a received MQTT message. @@ -83,7 +83,7 @@ class MqttHandler : public DataSink, public DataSource, public Thread { protected: // @copydoc - virtual void run() override; + void run() override; private: diff --git a/src/lib/ebus/contrib/tem.h b/src/lib/ebus/contrib/tem.h index ca40b8e9..af6fee56 100644 --- a/src/lib/ebus/contrib/tem.h +++ b/src/lib/ebus/contrib/tem.h @@ -50,15 +50,15 @@ class TemParamDataType : public NumberDataType { : NumberDataType(id, 16, 0, 0xffff, 0, 0xffff, 0) {} // @copydoc - virtual result_t derive(int divisor, size_t bitCount, NumberDataType* &derived) override; + result_t derive(int divisor, size_t bitCount, NumberDataType* &derived) override; // @copydoc - virtual result_t readSymbols(SymbolString& input, + result_t readSymbols(SymbolString& input, const size_t offset, const size_t length, ostringstream& output, OutputFormat outputFormat) override; // @copydoc - virtual result_t writeSymbols(istringstream& input, + result_t writeSymbols(istringstream& input, const size_t offset, const size_t length, SymbolString& output, size_t* usedLength) override; }; diff --git a/src/lib/ebus/data.h b/src/lib/ebus/data.h index 46baf9ed..93ee509d 100644 --- a/src/lib/ebus/data.h +++ b/src/lib/ebus/data.h @@ -242,7 +242,7 @@ class SingleDataField : public DataField { virtual ~SingleDataField() {} // @copydoc - virtual SingleDataField* clone() override; + SingleDataField* clone() override; /** * Factory method for creating a new @a SingleDataField instance derived from a base type. @@ -284,10 +284,10 @@ class SingleDataField : public DataField { PartType getPartType() const { return m_partType; } // @copydoc - virtual size_t getLength(PartType partType, size_t maxLength = MAX_LEN) override; + size_t getLength(PartType partType, size_t maxLength = MAX_LEN) override; // @copydoc - virtual result_t derive(string name, string comment, + result_t derive(string name, string comment, string unit, const PartType partType, int divisor, map values, vector& fields) override; @@ -301,22 +301,22 @@ class SingleDataField : public DataField { bool hasFullByteOffset(bool after); // @copydoc - virtual void dump(ostream& output) override; + void dump(ostream& output) override; // @copydoc - virtual bool hasField(const char* fieldName, bool numeric) override; + bool hasField(const char* fieldName, bool numeric) override; // @copydoc - virtual result_t read(SymbolString& data, size_t offset, + result_t read(SymbolString& data, size_t offset, unsigned int& output, const char* fieldName = NULL, ssize_t fieldIndex = -1) override; // @copydoc - virtual result_t read(SymbolString& data, size_t offset, + result_t read(SymbolString& data, size_t offset, ostringstream& output, OutputFormat outputFormat, ssize_t outputIndex = -1, bool leadingSeparator = false, const char* fieldName = NULL, ssize_t fieldIndex = -1) override; // @copydoc - virtual result_t write(istringstream& input, SymbolString& data, + result_t write(istringstream& input, SymbolString& data, size_t offset, char separator = UI_FIELD_SEPARATOR, size_t* length = NULL) override; @@ -386,25 +386,25 @@ class ValueListDataField : public SingleDataField { virtual ~ValueListDataField() {} // @copydoc - virtual ValueListDataField* clone() override; + ValueListDataField* clone() override; // @copydoc - virtual result_t derive(string name, string comment, + result_t derive(string name, string comment, string unit, const PartType partType, int divisor, map values, vector& fields) override; // @copydoc - virtual void dump(ostream& output) override; + void dump(ostream& output) override; protected: // @copydoc - virtual result_t readSymbols(SymbolString& input, const size_t offset, + result_t readSymbols(SymbolString& input, const size_t offset, ostringstream& output, OutputFormat outputFormat) override; // @copydoc - virtual result_t writeSymbols(istringstream& input, const size_t offset, + result_t writeSymbols(istringstream& input, const size_t offset, SymbolString& output, size_t* usedLength) override; @@ -442,25 +442,25 @@ class ConstantDataField : public SingleDataField { virtual ~ConstantDataField() {} // @copydoc - virtual ConstantDataField* clone() override; + ConstantDataField* clone() override; // @copydoc - virtual result_t derive(string name, string comment, + result_t derive(string name, string comment, string unit, const PartType partType, int divisor, map values, vector& fields) override; // @copydoc - virtual void dump(ostream& output) override; + void dump(ostream& output) override; protected: // @copydoc - virtual result_t readSymbols(SymbolString& input, const size_t offset, + result_t readSymbols(SymbolString& input, const size_t offset, ostringstream& output, OutputFormat outputFormat) override; // @copydoc - virtual result_t writeSymbols(istringstream& input, const size_t offset, + result_t writeSymbols(istringstream& input, const size_t offset, SymbolString& output, size_t* usedLength) override; @@ -523,16 +523,16 @@ class DataFieldSet : public DataField { virtual ~DataFieldSet(); // @copydoc - virtual DataFieldSet* clone() override; + DataFieldSet* clone() override; // @copydoc - virtual size_t getLength(PartType partType, size_t maxLength = MAX_LEN) override; + size_t getLength(PartType partType, size_t maxLength = MAX_LEN) override; // @copydoc - virtual string getName(ssize_t fieldIndex = -1) override; + string getName(ssize_t fieldIndex = -1) override; // @copydoc - virtual result_t derive(string name, string comment, + result_t derive(string name, string comment, string unit, const PartType partType, int divisor, map values, vector& fields) override; @@ -568,22 +568,22 @@ class DataFieldSet : public DataField { size_t size() const { return m_fields.size(); } // @copydoc - virtual bool hasField(const char* fieldName, bool numeric) override; + bool hasField(const char* fieldName, bool numeric) override; // @copydoc - virtual void dump(ostream& output) override; + void dump(ostream& output) override; // @copydoc - virtual result_t read(SymbolString& data, size_t offset, + result_t read(SymbolString& data, size_t offset, unsigned int& output, const char* fieldName = NULL, ssize_t fieldIndex = -1) override; // @copydoc - virtual result_t read(SymbolString& data, size_t offset, + result_t read(SymbolString& data, size_t offset, ostringstream& output, OutputFormat outputFormat, ssize_t outputIndex = -1, bool leadingSeparator = false, const char* fieldName = NULL, ssize_t fieldIndex = -1) override; // @copydoc - virtual result_t write(istringstream& input, SymbolString& data, + result_t write(istringstream& input, SymbolString& data, size_t offset, char separator = UI_FIELD_SEPARATOR, size_t* length = NULL) override; @@ -638,7 +638,7 @@ class DataFieldTemplates : public FileReader { result_t add(DataField* field, string name = "", bool replace = false); // @copydoc - virtual result_t addFromFile(vector::iterator& begin, const vector::iterator end, + result_t addFromFile(vector::iterator& begin, const vector::iterator end, vector< vector >* defaults, const string& defaultDest, const string& defaultCircuit, const string& defaultSuffix, const string& filename, unsigned int lineNo) override; diff --git a/src/lib/ebus/datatype.h b/src/lib/ebus/datatype.h index 7d0d3b5f..65aa0cbb 100644 --- a/src/lib/ebus/datatype.h +++ b/src/lib/ebus/datatype.h @@ -304,17 +304,17 @@ class StringDataType : public DataType { virtual ~StringDataType() {} // @copydoc - virtual result_t readRawValue(SymbolString& input, + result_t readRawValue(SymbolString& input, const size_t offset, const size_t length, unsigned int& value) override; // @copydoc - virtual result_t readSymbols(SymbolString& input, + result_t readSymbols(SymbolString& input, const size_t offset, const size_t length, ostringstream& output, OutputFormat outputFormat) override; // @copydoc - virtual result_t writeSymbols(istringstream& input, + result_t writeSymbols(istringstream& input, const size_t offset, const size_t length, SymbolString& output, size_t* usedLength) override; @@ -366,17 +366,17 @@ class DateTimeDataType : public DataType { int16_t getResolution() const { return m_resolution; } // @copydoc - virtual result_t readRawValue(SymbolString& input, + result_t readRawValue(SymbolString& input, const size_t offset, const size_t length, unsigned int& value) override; // @copydoc - virtual result_t readSymbols(SymbolString& input, + result_t readSymbols(SymbolString& input, const size_t offset, const size_t length, ostringstream& output, OutputFormat outputFormat) override; // @copydoc - virtual result_t writeSymbols(istringstream& input, + result_t writeSymbols(istringstream& input, const size_t offset, const size_t length, SymbolString& output, size_t* usedLength) override; @@ -441,7 +441,7 @@ class NumberDataType : public DataType { static size_t calcPrecision(const int divisor); // @copydoc - virtual bool dump(ostream& output, const size_t length, const bool appendSeparatorDivisor = true) const override; + bool dump(ostream& output, const size_t length, const bool appendSeparatorDivisor = true) const override; /** * Derive a new @a NumberDataType from this. @@ -481,12 +481,12 @@ class NumberDataType : public DataType { int16_t getFirstBit() const { return m_firstBit; } // @copydoc - virtual result_t readRawValue(SymbolString& input, + result_t readRawValue(SymbolString& input, const size_t offset, const size_t length, unsigned int& value) override; // @copydoc - virtual result_t readSymbols(SymbolString& input, + result_t readSymbols(SymbolString& input, const size_t offset, const size_t length, ostringstream& output, OutputFormat outputFormat) override; @@ -500,12 +500,12 @@ class NumberDataType : public DataType { * or NULL. * @return @a RESULT_OK on success, or an error code. */ - virtual result_t writeRawValue(unsigned int value, + result_t writeRawValue(unsigned int value, const size_t offset, const size_t length, SymbolString& output, size_t* usedLength = NULL); // @copydoc - virtual result_t writeSymbols(istringstream& input, + result_t writeSymbols(istringstream& input, const size_t offset, const size_t length, SymbolString& output, size_t* usedLength) override; diff --git a/src/lib/ebus/device.h b/src/lib/ebus/device.h index 159ef8b9..3dda3947 100644 --- a/src/lib/ebus/device.h +++ b/src/lib/ebus/device.h @@ -211,15 +211,15 @@ class SerialDevice : public Device { : Device(name, checkDevice, readOnly, initialSend) {} // @copydoc - virtual result_t open() override; + result_t open() override; // @copydoc - virtual void close() override; + void close() override; protected: // @copydoc - virtual void checkDevice() override; + void checkDevice() override; private: @@ -246,24 +246,24 @@ class NetworkDevice : public Device { m_buffer(NULL), m_bufSize(0), m_bufLen(0), m_bufPos(0) {} // @copydoc - virtual unsigned int getLatency() const override { return 10000; } + unsigned int getLatency() const override { return 10000; } // @copydoc - virtual result_t open() override; + result_t open() override; protected: // @copydoc - virtual void checkDevice() override; + void checkDevice() override; // @copydoc - virtual bool available() override; + bool available() override; // @copydoc - virtual ssize_t write(const symbol_t value) override; + ssize_t write(const symbol_t value) override; // @copydoc - virtual ssize_t read(symbol_t& value) override; + ssize_t read(symbol_t& value) override; private: diff --git a/src/lib/ebus/message.h b/src/lib/ebus/message.h index b7cba6d0..79fbac88 100644 --- a/src/lib/ebus/message.h +++ b/src/lib/ebus/message.h @@ -702,37 +702,37 @@ class ChainedMessage : public Message { virtual ~ChainedMessage(); // @copydoc - virtual Message* derive(const symbol_t dstAddress, const symbol_t srcAddress = SYN, + Message* derive(const symbol_t dstAddress, const symbol_t srcAddress = SYN, const string circuit = "") override; // @copydoc - virtual size_t getIdLength() const override { return m_ids[0].size() - 2; } + size_t getIdLength() const override { return m_ids[0].size() - 2; } // @copydoc - virtual bool checkId(MasterSymbolString& master, size_t* index = NULL) override; + bool checkId(MasterSymbolString& master, size_t* index = NULL) override; // @copydoc - virtual bool checkId(Message& other) override; + bool checkId(Message& other) override; // @copydoc - virtual size_t getCount() override { return m_ids.size(); } + size_t getCount() override { return m_ids.size(); } protected: // @copydoc - virtual result_t prepareMasterPart(MasterSymbolString& master, istringstream& input, char separator, + result_t prepareMasterPart(MasterSymbolString& master, istringstream& input, char separator, size_t index) override; public: // @copydoc - virtual result_t storeLastData(MasterSymbolString& master, SlaveSymbolString& slave) override; + result_t storeLastData(MasterSymbolString& master, SlaveSymbolString& slave) override; // @copydoc - virtual result_t storeLastData(MasterSymbolString& data, size_t index) override; + result_t storeLastData(MasterSymbolString& data, size_t index) override; // @copydoc - virtual result_t storeLastData(SlaveSymbolString& data, size_t index) override; + result_t storeLastData(SlaveSymbolString& data, size_t index) override; /** * Combine all last stored data. @@ -742,7 +742,7 @@ class ChainedMessage : public Message { protected: // @copydoc - virtual void dumpColumn(ostream& output, column_t column, bool withConditions = false) override; + void dumpColumn(ostream& output, column_t column, bool withConditions = false) override; private: @@ -910,20 +910,20 @@ class SimpleCondition : public Condition { virtual ~SimpleCondition() {} // @copydoc - virtual SimpleCondition* derive(string valueList) override; + SimpleCondition* derive(string valueList) override; // @copydoc - virtual void dump(ostream& output, bool matched = false) override; + void dump(ostream& output, bool matched = false) override; // @copydoc - virtual CombinedCondition* combineAnd(Condition* other) override; + CombinedCondition* combineAnd(Condition* other) override; // @copydoc - virtual result_t resolve(MessageMap* messages, ostringstream& errorMessage, + result_t resolve(MessageMap* messages, ostringstream& errorMessage, void (*readMessageFunc)(Message* message) = NULL) override; // @copydoc - virtual bool isTrue() override; + bool isTrue() override; /** * Return whether the condition is based on a numeric value. @@ -1005,7 +1005,7 @@ class SimpleNumericCondition : public SimpleCondition { protected: // @copydoc - virtual bool checkValue(Message* message, const string field) override; + bool checkValue(Message* message, const string field) override; private: @@ -1041,12 +1041,12 @@ class SimpleStringCondition : public SimpleCondition { virtual ~SimpleStringCondition() {} // @copydoc - virtual bool isNumeric() override { return false; } + bool isNumeric() override { return false; } protected: // @copydoc - virtual bool checkValue(Message* message, const string field) override; + bool checkValue(Message* message, const string field) override; private: @@ -1072,17 +1072,17 @@ class CombinedCondition : public Condition { virtual ~CombinedCondition() {} // @copydoc - virtual void dump(ostream& output, bool matched = false) override; + void dump(ostream& output, bool matched = false) override; // @copydoc - virtual CombinedCondition* combineAnd(Condition* other) override { m_conditions.push_back(other); return this; } + CombinedCondition* combineAnd(Condition* other) override { m_conditions.push_back(other); return this; } // @copydoc - virtual result_t resolve(MessageMap* messages, ostringstream& errorMessage, + result_t resolve(MessageMap* messages, ostringstream& errorMessage, void (*readMessageFunc)(Message* message) = NULL) override; // @copydoc - virtual bool isTrue() override; + bool isTrue() override; private: @@ -1209,7 +1209,7 @@ class LoadInstruction : public Instruction { virtual ~LoadInstruction() { } // @copydoc - virtual result_t execute(MessageMap* messages, ostringstream& log, Condition* condition) override; + result_t execute(MessageMap* messages, ostringstream& log, Condition* condition) override; private: @@ -1250,7 +1250,7 @@ class MessageMap : public FileReader { result_t add(Message* message, bool storeByName = true); // @copydoc - virtual result_t addDefaultFromFile(vector< vector >& defaults, vector& row, + result_t addDefaultFromFile(vector< vector >& defaults, vector& row, vector::iterator& begin, string defaultDest, string defaultCircuit, string defaultSuffix, const string& filename, unsigned int lineNo) override; @@ -1264,7 +1264,7 @@ class MessageMap : public FileReader { result_t readConditions(string& types, const string& filename, Condition*& condition); // @copydoc - virtual result_t addFromFile(vector::iterator& begin, const vector::iterator end, + result_t addFromFile(vector::iterator& begin, const vector::iterator end, vector< vector >* defaults, const string& defaultDest, const string& defaultCircuit, const string& defaultSuffix, const string& filename, unsigned int lineNo) override; diff --git a/src/lib/utils/thread.h b/src/lib/utils/thread.h index f73c4f39..f0f7d56e 100644 --- a/src/lib/utils/thread.h +++ b/src/lib/utils/thread.h @@ -121,10 +121,10 @@ class WaitThread : public Thread { virtual ~WaitThread(); // @copydoc - virtual void stop() override; + void stop() override; // @copydoc - virtual bool join() override; + bool join() override; /** * Wait for the specified amount of time.