Some code cleanup

Author: gizmocuz

hardware/DomoticzTCP.h

@@ -32,8 +32,8 @@ class DomoticzTCP : public CDomoticzHardwareBase
 	void disconnectTCP();
 	bool StartHardwareTCP();
 	bool StopHardwareTCP();
-	bool StartHardware();
-	bool StopHardware();
+	bool StartHardware() override;
+	bool StopHardware() override;
 	void writeTCP(const char *data, size_t size);
 	void Do_Work();
 	bool ConnectInternal();

hardware/MySensorsBase.h

@@ -322,13 +322,13 @@ class MySensorsBase : public CDomoticzHardwareBase
 		std::string _Payload;
 		bool _bUseAck;
 		int _AckTimeout;
-		_tMySensorSmartSleepQueueItem(const int NodeID, const int ChildID, const _eMessageType messageType, const _eSetType SubType, const std::string &Payload, const bool bUseAck, const int AckTimeout)
+		_tMySensorSmartSleepQueueItem(const int NodeID, const int ChildID, const _eMessageType messageType, const _eSetType SubType, const std::string &Payload, const bool bUseAck, const int AckTimeout):
+			_Payload(Payload)
 		{
 			_NodeID = NodeID;
 			_ChildID = ChildID;
 			_messageType = messageType;
 			_SubType = SubType;
-			_Payload = Payload;
 			_bUseAck = bUseAck;
 			_AckTimeout = AckTimeout;
 		}

main/WebServer.h

@@ -97,10 +97,10 @@ class CWebServer : public session_store, public boost::enable_shared_from_this<C
 		const std::string &hardwareid = ""); // OTO
 
 	// SessionStore interface
-	const WebEmStoredSession GetSession(const std::string & sessionId);
-	void StoreSession(const WebEmStoredSession & session);
-	void RemoveSession(const std::string & sessionId);
-	void CleanSessions();
+	const WebEmStoredSession GetSession(const std::string & sessionId) override;
+	void StoreSession(const WebEmStoredSession & session) override;
+	void RemoveSession(const std::string & sessionId) override;
+	void CleanSessions() override;
 	void RemoveUsersSessions(const std::string& username, const WebEmSession & exceptSession);
 	std::string PluginHardwareDesc(int HwdID);
 

tcpserver/TCPClient.h

@@ -43,9 +43,9 @@ class CTCPClient : public CTCPClientBase,
 public:
 	CTCPClient(boost::asio::io_service& ios, CTCPServerIntBase *pManager);
 	~CTCPClient();
-	virtual void start();
-	virtual void stop();
-	virtual void write(const char *pData, size_t Length);
+	virtual void start() override;
+	virtual void stop() override;
+	virtual void write(const char *pData, size_t Length) override;
 private:
 	void handleRead(const boost::system::error_code& error, size_t length);
 	void handleWrite(const boost::system::error_code& error);
@@ -62,9 +62,9 @@ class CSharedClient : public CTCPClientBase,
 public:
 	CSharedClient(CTCPServerIntBase *pManager, boost::shared_ptr<http::server::CProxyClient> proxy, const std::string &token, const std::string &username);
 	~CSharedClient();
-	virtual void start();
-	virtual void stop();
-	virtual void write(const char *pData, size_t Length);
+	virtual void start() override;
+	virtual void stop() override;
+	virtual void write(const char *pData, size_t Length) override;
 	void OnIncomingData(const unsigned char *data, size_t bytes_transferred);
 	bool CompareToken(const std::string &token);
 private:

tcpserver/TCPServer.h

@@ -72,10 +72,10 @@ class CTCPServerInt : public CTCPServerIntBase {
 public:
 	CTCPServerInt(const std::string& address, const std::string& port, CTCPServer *pRoot);
 	~CTCPServerInt(void);
-	virtual void start();
-	virtual void stop();
+	virtual void start() override;
+	virtual void stop() override;
 	/// Stop the specified connection.
-	virtual void stopClient(CTCPClient_ptr c);
+	virtual void stopClient(CTCPClient_ptr c) override;
 private:
 
 	void handleAccept(const boost::system::error_code& error);
@@ -99,10 +99,10 @@ class CTCPServerProxied : public CTCPServerIntBase {
 public:
 	CTCPServerProxied(CTCPServer *pRoot, boost::shared_ptr<http::server::CProxyClient> proxy);
 	~CTCPServerProxied(void);
-	virtual void start();
-	virtual void stop();
+	virtual void start() override;
+	virtual void stop() override;
 	/// Stop the specified connection.
-	virtual void stopClient(CTCPClient_ptr c);
+	virtual void stopClient(CTCPClient_ptr c) override;
 
 	bool OnNewConnection(const std::string &token, const std::string &username, const std::string &password);
 	bool OnDisconnect(const std::string &token);

webserver/cWebem.h

@@ -121,7 +121,7 @@ namespace http {
 				{}
 
 			/// Handle a request and produce a reply.
-			virtual void handle_request(const request& req, reply& rep);
+			virtual void handle_request(const request& req, reply& rep) override;
 		private:
 			char *strftime_t(const char *format, const time_t rawtime);
 			bool CompressWebOutput(const request& req, reply& rep);

webserver/server.hpp

@@ -78,7 +78,7 @@ class server : public server_base {
 	virtual ~server() {}
 
 	/// Print server settings to string (debug purpose)
-	virtual std::string to_string() const {
+	virtual std::string to_string() const override {
 		return "'server[" + settings_.to_string() + "]'";
 	}
 protected:
@@ -100,7 +100,7 @@ class ssl_server : public server_base {
 	virtual ~ssl_server() {}
 
 	/// Print server settings to string (debug purpose)
-	virtual std::string to_string() const {
+	virtual std::string to_string() const override {
 		return "'ssl_server[" + settings_.to_string() + "]'";
 	}
 

webserver/server_settings.hpp

@@ -243,7 +243,7 @@ struct ssl_server_settings : public server_settings {
 		verify_file_path = server_settings::get_valid_value(verify_file_path, ssl_settings.verify_file_path);
 	}
 
-	virtual std::string to_string() const {
+	virtual std::string to_string() const  override {
 		return std::string("ssl_server_settings[") + server_settings::to_string() +
 				", ssl_method='" + ssl_method + "'" +
 				", certificate_chain_file_path='" + certificate_chain_file_path + "'" +