diff --git a/daemon/commands/adaptive-jitter-compensation.h b/daemon/commands/adaptive-jitter-compensation.h
index c8a901c02e045bdb181c7cf82abd542f023a923d..cc15bd07dfdca904253ffc2960dc61f7f0866620 100644
--- a/daemon/commands/adaptive-jitter-compensation.h
+++ b/daemon/commands/adaptive-jitter-compensation.h
@@ -1,6 +1,6 @@
 /*
 adaptive-jitter-compensation.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AdaptiveBufferCompensationCommand: public DaemonCommand {
 public:
 	AdaptiveBufferCompensationCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string &args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_ADAPTIVE_BUFFER_COMPENSATION_H_
diff --git a/daemon/commands/answer.h b/daemon/commands/answer.h
index 7dcd94972d211d351d2b9e5579d49b6cb758461e..046fd3175b7349b96c843bb6076944140bf654a4 100644
--- a/daemon/commands/answer.h
+++ b/daemon/commands/answer.h
@@ -1,6 +1,6 @@
 /*
 answer.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AnswerCommand: public DaemonCommand {
 public:
 	AnswerCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string &args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_ANSWER_H_
diff --git a/daemon/commands/audio-codec-get.h b/daemon/commands/audio-codec-get.h
index 8a807532171c87b61f1ce4c4e401751061a37062..0068fd308c2fc10907000a723ceb5773aa9213f7 100644
--- a/daemon/commands/audio-codec-get.h
+++ b/daemon/commands/audio-codec-get.h
@@ -1,6 +1,6 @@
 /*
 audio-codec-get.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AudioCodecGetCommand: public DaemonCommand {
 public:
 	AudioCodecGetCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string &args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_AUDIO_CODEC_GET_H_
diff --git a/daemon/commands/audio-codec-move.h b/daemon/commands/audio-codec-move.h
index a19fa7b84f1f0c25ce81bd70f6dd9eec8b263d1e..204edc95f9c68b8bf7406c9e91ba577bbbad6ad7 100644
--- a/daemon/commands/audio-codec-move.h
+++ b/daemon/commands/audio-codec-move.h
@@ -1,6 +1,6 @@
 /*
 audio-codec-move.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AudioCodecMoveCommand: public DaemonCommand {
 public:
 	AudioCodecMoveCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string &args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_AUDIO_CODEC_MOVE_H_
diff --git a/daemon/commands/audio-codec-set.h b/daemon/commands/audio-codec-set.h
index 0d90b28423b59e2fed6cae25a75d8e514dc12304..f5667f9f55bf4bdbfbb74736f95ef8bec54e784b 100644
--- a/daemon/commands/audio-codec-set.h
+++ b/daemon/commands/audio-codec-set.h
@@ -1,6 +1,6 @@
 /*
 audio-codec-set.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AudioCodecSetCommand: public DaemonCommand {
 public:
 	AudioCodecSetCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string &args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_AUDIO_CODEC_SET_H_
diff --git a/daemon/commands/audio-codec-toggle.h b/daemon/commands/audio-codec-toggle.h
index 36dce430076602ae365ffb248fb0644a5d481b12..f625112d6af6f99df9fb4d79fe904c6abedcdced 100644
--- a/daemon/commands/audio-codec-toggle.h
+++ b/daemon/commands/audio-codec-toggle.h
@@ -1,6 +1,6 @@
 /*
 audio-codec-toggle.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AudioCodecToggleCommand: public DaemonCommand {
 public:
 	AudioCodecToggleCommand(const char *name, const char *proto, const char *help, bool enable);
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string &args) override;
+
 protected:
 	bool mEnable;
 };
diff --git a/daemon/commands/audio-stream-start.h b/daemon/commands/audio-stream-start.h
index 4d8dc878e326bbf1d872a12f6af495f57ef8f545..730d586323439bbb3b2006ced150ecf73bdc4564 100644
--- a/daemon/commands/audio-stream-start.h
+++ b/daemon/commands/audio-stream-start.h
@@ -1,6 +1,6 @@
 /*
 audio-stream-start.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AudioStreamStartCommand: public DaemonCommand {
 public:
 	AudioStreamStartCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string &args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_AUDIO_STREAM_START_H_
diff --git a/daemon/commands/audio-stream-stats.h b/daemon/commands/audio-stream-stats.h
index f63fbb17c9437583793a6ace6a153218b5b7efcd..72e93feddf5dd588004fdbf9549adfe306fc4cb6 100644
--- a/daemon/commands/audio-stream-stats.h
+++ b/daemon/commands/audio-stream-stats.h
@@ -1,6 +1,6 @@
 /*
 audio-stream-stats.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AudioStreamStatsCommand: public DaemonCommand {
 public:
 	AudioStreamStatsCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string &args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_AUDIO_STREAM_STATS_H_
diff --git a/daemon/commands/audio-stream-stop.h b/daemon/commands/audio-stream-stop.h
index 44dd7166dc6e6431651fc97171df791db89160a2..ad2d0c051c14a20c588413af406b7fabd8d38b5e 100644
--- a/daemon/commands/audio-stream-stop.h
+++ b/daemon/commands/audio-stream-stop.h
@@ -1,6 +1,6 @@
 /*
 audio-stream-stop.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AudioStreamStopCommand: public DaemonCommand {
 public:
 	AudioStreamStopCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_AUDIO_STREAM_STOP_H_
diff --git a/daemon/commands/auth-infos-clear.h b/daemon/commands/auth-infos-clear.h
index 35df2165a443c2e37a9a3caa72e2e9af725880fc..59a53be78870ea9a1bba4416b4e875d6b9eefc18 100644
--- a/daemon/commands/auth-infos-clear.h
+++ b/daemon/commands/auth-infos-clear.h
@@ -1,6 +1,6 @@
 /*
 auth-infos-clear.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class AuthInfosClearCommand: public DaemonCommand {
 public:
 	AuthInfosClearCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_AUTH_INFOS_CLEAR_H_
diff --git a/daemon/commands/call-mute.h b/daemon/commands/call-mute.h
index bab2fe1287ff796c5887fcd4067d98ed896dc10d..993f9a989aef9e974414da509eb51d9d03b37d21 100644
--- a/daemon/commands/call-mute.h
+++ b/daemon/commands/call-mute.h
@@ -1,6 +1,6 @@
 /*
 call-mute.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class CallMuteCommand : public DaemonCommand
 {
 public:
 	CallMuteCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CALL_MUTE_H
diff --git a/daemon/commands/call-pause.h b/daemon/commands/call-pause.h
index 7fbb6177def37486b65f255d4d084c1c7bdc6e53..e0d96063f61a80975d42de5b4d2a6dbae9e6c88d 100644
--- a/daemon/commands/call-pause.h
+++ b/daemon/commands/call-pause.h
@@ -1,6 +1,6 @@
 /*
 call-pause.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class CallPauseCommand : public DaemonCommand
 {
 public:
 	CallPauseCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CALL_PAUSE_H
diff --git a/daemon/commands/call-resume.h b/daemon/commands/call-resume.h
index 03ac2ae8520be13c96dacd03e0e812e4e796f67e..6c08c28560150b08b5e38d6877c9fb921ded7f92 100644
--- a/daemon/commands/call-resume.h
+++ b/daemon/commands/call-resume.h
@@ -1,6 +1,6 @@
 /*
 call-resume.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class CallResumeCommand : public DaemonCommand
 {
 public:
 	CallResumeCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CALL_RESUME_H
diff --git a/daemon/commands/call-stats.h b/daemon/commands/call-stats.h
index 465e384957e054e8dccc5ed5b5ef6eecaf965388..27814ec1bfa92e9c422f989a76b7147f7fe514b8 100644
--- a/daemon/commands/call-stats.h
+++ b/daemon/commands/call-stats.h
@@ -1,6 +1,6 @@
 /*
 call-stats.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class CallStatsCommand: public DaemonCommand {
 public:
 	CallStatsCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CALL_STATS_H_
diff --git a/daemon/commands/call-status.h b/daemon/commands/call-status.h
index df598999896ec25909fcb9a6a187c72b912f7191..308ee1823b85b68eaee77ced9b0ee4f7e0735edd 100644
--- a/daemon/commands/call-status.h
+++ b/daemon/commands/call-status.h
@@ -1,6 +1,6 @@
 /*
 call-status.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class CallStatusCommand: public DaemonCommand {
 public:
 	CallStatusCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CALL_STATUS_H_
diff --git a/daemon/commands/call-transfer.h b/daemon/commands/call-transfer.h
index c0c0d977b9e98e34f9e4a298b21b028e1bf29b52..83e93d0c98c02a970b789a86807cd17dd3a84a31 100644
--- a/daemon/commands/call-transfer.h
+++ b/daemon/commands/call-transfer.h
@@ -1,6 +1,6 @@
 /*
 call-transfer.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class CallTransferCommand : public DaemonCommand
 {
 public:
 	CallTransferCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CALL_TRANSFER_H
diff --git a/daemon/commands/call.h b/daemon/commands/call.h
index e2cf8700e31585031852fe84963dfdf44e02ee54..881ad144e2a28156602b1e5198709d8b74208354 100644
--- a/daemon/commands/call.h
+++ b/daemon/commands/call.h
@@ -1,6 +1,6 @@
 /*
 call.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class CallCommand: public DaemonCommand {
 public:
 	CallCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CALL_H_
diff --git a/daemon/commands/cn.h b/daemon/commands/cn.h
index 6e625bea8c137920c7a4f5dc4d2b3f9e673a3297..9b46c6cd69ff0bee89192c470b64afab630e0eff 100644
--- a/daemon/commands/cn.h
+++ b/daemon/commands/cn.h
@@ -1,6 +1,6 @@
 /*
 cn.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class CNCommand: public DaemonCommand {
 public:
 	CNCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CN_H_
diff --git a/daemon/commands/conference.h b/daemon/commands/conference.h
index c9d0719eecf1934aa1ed1aa143c5a2e40a64a3db..cbf1cbe4b2281b790b1829ba5f8e56b70191dda7 100644
--- a/daemon/commands/conference.h
+++ b/daemon/commands/conference.h
@@ -1,6 +1,6 @@
 /*
 conference.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class ConferenceCommand : public DaemonCommand
 {
 public:
 	ConferenceCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CONFERENCE_H
diff --git a/daemon/commands/configcommand.h b/daemon/commands/configcommand.h
index 6a138b9004182e1c86b9f881acfdad77b16049d7..36feb749e55d98c7887c04a71237b2712d0198d5 100644
--- a/daemon/commands/configcommand.h
+++ b/daemon/commands/configcommand.h
@@ -1,6 +1,6 @@
 /*
 configcommand.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,13 +25,15 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class ConfigGetCommand: public DaemonCommand {
 public:
 	ConfigGetCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 class ConfigSetCommand: public DaemonCommand {
 public:
 	ConfigSetCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CONFIG_H_
diff --git a/daemon/commands/contact.h b/daemon/commands/contact.h
index 057472b94f0e0caad47a78bd31bb0afdad61cb0b..4b2def6d6e7eecdf12b5420289a83a026041519e 100644
--- a/daemon/commands/contact.h
+++ b/daemon/commands/contact.h
@@ -1,6 +1,6 @@
 /*
 contact.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class ContactCommand: public DaemonCommand {
 public:
 	ContactCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_CONTACT_H_
diff --git a/daemon/commands/dtmf.h b/daemon/commands/dtmf.h
index 96d52298db06c2d9c545ec7cd29781fce0e38e96..ca9104b478508be0c5aca5a6bd6d5f1564b3c645 100644
--- a/daemon/commands/dtmf.h
+++ b/daemon/commands/dtmf.h
@@ -1,6 +1,6 @@
 /*
 dtmf.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class DtmfCommand: public DaemonCommand {
 public:
 	DtmfCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_DTMF_H_
diff --git a/daemon/commands/firewall-policy.h b/daemon/commands/firewall-policy.h
index a19d1dfd19ee61fac8d32b6aecd4ce288d9863cb..475064692136bbda9f39bbb258fd3aa2d4e10b0e 100644
--- a/daemon/commands/firewall-policy.h
+++ b/daemon/commands/firewall-policy.h
@@ -1,6 +1,6 @@
 /*
 firewall-policy.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class FirewallPolicyCommand: public DaemonCommand {
 public:
 	FirewallPolicyCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_FIREWALL_POLICY_H_
diff --git a/daemon/commands/help.h b/daemon/commands/help.h
index 6e18fd1b5be3eb6abf1125a81ccd150e94be1b9a..826e610f982a4fe8eabab7cbb1dcbd85e61ed31d 100644
--- a/daemon/commands/help.h
+++ b/daemon/commands/help.h
@@ -1,6 +1,6 @@
 /*
 help.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class HelpCommand: public DaemonCommand {
 public:
 	HelpCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_HELP_H_
diff --git a/daemon/commands/ipv6.h b/daemon/commands/ipv6.h
index 31ef4899b12b997fa857d12e374bc2e0198d8218..e3ea1e29f975390108570f35d4470a348a210345 100644
--- a/daemon/commands/ipv6.h
+++ b/daemon/commands/ipv6.h
@@ -1,6 +1,6 @@
 /*
 ipv6.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class IPv6Command: public DaemonCommand {
 public:
 	IPv6Command();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_IPV6_H_
diff --git a/daemon/commands/jitterbuffer.h b/daemon/commands/jitterbuffer.h
index 76855e0aacd2215ea5a36a1b0729bb9b180928ed..2ea34511a018ce93e775870c9b9c70e0e63248a4 100644
--- a/daemon/commands/jitterbuffer.h
+++ b/daemon/commands/jitterbuffer.h
@@ -1,6 +1,6 @@
 /*
 jitterbuffer.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,15 +25,17 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 class JitterBufferCommand : public DaemonCommand{
 public:
-    JitterBufferCommand();
-    virtual void exec(Daemon *app, const std::string& args);
+	JitterBufferCommand();
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 
 class JitterBufferResetCommand : public DaemonCommand{
 public:
-    JitterBufferResetCommand();
-    virtual void exec(Daemon *app, const std::string& args);
+	JitterBufferResetCommand();
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_JITTER_BUFFER_H
diff --git a/daemon/commands/media-encryption.h b/daemon/commands/media-encryption.h
index 7a35d0c271f9a68dbe2c9ea1d5a5df0b263d437d..ddd531a4200cee383099adcba51172aea7504ca7 100644
--- a/daemon/commands/media-encryption.h
+++ b/daemon/commands/media-encryption.h
@@ -1,6 +1,6 @@
 /*
 media-encryption.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class MediaEncryptionCommand: public DaemonCommand {
 public:
 	MediaEncryptionCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_MEDIA_ENCRYPTION_H_
diff --git a/daemon/commands/msfilter-add-fmtp.h b/daemon/commands/msfilter-add-fmtp.h
index ecb2969ec5c53ff6e8125ef65bfa84cef42b20b2..c9a3d327070283e7faded3e8954d52be0517e9a7 100644
--- a/daemon/commands/msfilter-add-fmtp.h
+++ b/daemon/commands/msfilter-add-fmtp.h
@@ -1,6 +1,6 @@
 /*
 msfilter-add-fmtp.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class MSFilterAddFmtpCommand : public DaemonCommand {
 public:
 	MSFilterAddFmtpCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_MSFILTER_ADD_FMTP
diff --git a/daemon/commands/netsim.h b/daemon/commands/netsim.h
index e6b147c63b6e083f63f2c926c77b7a194bf05753..dcedc43e94cb0e39db7e47d6619424ef86aa31a5 100644
--- a/daemon/commands/netsim.h
+++ b/daemon/commands/netsim.h
@@ -1,6 +1,6 @@
 /*
 netsim.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class NetsimCommand: public DaemonCommand {
 public:
 	NetsimCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_NETSIM_H_
diff --git a/daemon/commands/play-wav.h b/daemon/commands/play-wav.h
index 19a24520509807a14646b970654501962d3b3ea2..dd91805608cb7abeba9e884a3a14a0b1b2663086 100644
--- a/daemon/commands/play-wav.h
+++ b/daemon/commands/play-wav.h
@@ -1,6 +1,6 @@
 /*
 play-wav.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class PlayWavCommand: public DaemonCommand {
 public:
 	PlayWavCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_PLAY_WAV_H_
diff --git a/daemon/commands/pop-event.h b/daemon/commands/pop-event.h
index 66a3a8489c10aa8a16b2a5585b3f12b12edc399a..e05f7c67e54ec163aae204fc5a540903489c5f44 100644
--- a/daemon/commands/pop-event.h
+++ b/daemon/commands/pop-event.h
@@ -1,6 +1,6 @@
 /*
 pop-event.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class PopEventCommand: public DaemonCommand {
 public:
 	PopEventCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_POP_EVENT_H_
diff --git a/daemon/commands/port.h b/daemon/commands/port.h
index 465a087e347b7d7847c0c57e72c30e872ec4efb6..99c698fcc581cccf26497346b0cf95fbee5ab369 100644
--- a/daemon/commands/port.h
+++ b/daemon/commands/port.h
@@ -1,6 +1,6 @@
 /*
 port.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class PortCommand: public DaemonCommand {
 public:
 	PortCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_PORT_H_
diff --git a/daemon/commands/ptime.h b/daemon/commands/ptime.h
index a54a17cd6b12a37937ea063e80913c69bcdcf6da..03a390e904b82df71179b739e145a57dabb5bbf8 100644
--- a/daemon/commands/ptime.h
+++ b/daemon/commands/ptime.h
@@ -1,6 +1,6 @@
 /*
 ptime.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class PtimeCommand: public DaemonCommand {
 public:
 	PtimeCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_PTIME_H_
diff --git a/daemon/commands/quit.h b/daemon/commands/quit.h
index 99bf5f49a8696e504183e8a76441b97ee1db7827..3ff30d89047227520086fba7b3e851aa9f29e7db 100644
--- a/daemon/commands/quit.h
+++ b/daemon/commands/quit.h
@@ -1,6 +1,6 @@
 /*
 quit.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class QuitCommand: public DaemonCommand {
 public:
 	QuitCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_QUIT_H_
diff --git a/daemon/commands/register-info.h b/daemon/commands/register-info.h
index e6b437a57608bf839f828236207bd67d089cbf98..cdbbaf66325d4e332f49bb5cab9f788e49dbac92 100644
--- a/daemon/commands/register-info.h
+++ b/daemon/commands/register-info.h
@@ -1,6 +1,6 @@
 /*
 register-info.h
-Copyright (C) 2017 Belledonne Communications, Grenoble, France 
+Copyright (C) 2017 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class RegisterInfoCommand: public DaemonCommand {
 public:
 	RegisterInfoCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_REGISTER_INFO_H_
diff --git a/daemon/commands/register-status.h b/daemon/commands/register-status.h
index 5e19cbe14ef7231f69e1ac21e79fecc699369482..ce8bbbf574715e2a484502e05ec1b9c7b24389dd 100644
--- a/daemon/commands/register-status.h
+++ b/daemon/commands/register-status.h
@@ -1,6 +1,6 @@
 /*
 register-status.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class RegisterStatusCommand: public DaemonCommand {
 public:
 	RegisterStatusCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_REGISTER_STATUS_H_
diff --git a/daemon/commands/register.h b/daemon/commands/register.h
index c29a17f2b82fdcccfe37f592d69b1b0254671b07..f7b2f4e05503c71a668f800a8fb35b51398fb86d 100644
--- a/daemon/commands/register.h
+++ b/daemon/commands/register.h
@@ -1,6 +1,6 @@
 /*
 register.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class RegisterCommand: public DaemonCommand {
 public:
 	RegisterCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_REGISTER_H_
diff --git a/daemon/commands/terminate.h b/daemon/commands/terminate.h
index 5733d3f215974cb28b5f4e752b48aed05dea78c5..0d58ebc5999b3e5f688179c5e5dc03d209c151d0 100644
--- a/daemon/commands/terminate.h
+++ b/daemon/commands/terminate.h
@@ -1,6 +1,6 @@
 /*
 terminate.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class TerminateCommand: public DaemonCommand {
 public:
 	TerminateCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_TERMINATE_H_
diff --git a/daemon/commands/unregister.h b/daemon/commands/unregister.h
index 09dd5521ccc5280fd5d47abef676085c7ada29c8..62f34ee87b11615f4706256c7458823794f84c79 100644
--- a/daemon/commands/unregister.h
+++ b/daemon/commands/unregister.h
@@ -1,6 +1,6 @@
 /*
 unregister.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class UnregisterCommand: public DaemonCommand {
 public:
 	UnregisterCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_UNREGISTER_H_
diff --git a/daemon/commands/version.h b/daemon/commands/version.h
index 18c897b8c9bff12c43b73292b66fef2dfaeeaab3..76a6d81d06ee949b2b8319b602d6d1fc3b928497 100644
--- a/daemon/commands/version.h
+++ b/daemon/commands/version.h
@@ -1,6 +1,6 @@
 /*
 version.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 class VersionCommand: public DaemonCommand {
 public:
 	VersionCommand();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_VERSION_H_
diff --git a/daemon/commands/video.h b/daemon/commands/video.h
index b456888177712468880d560efb125f9201871e39..a971a2360278dbddd43543ca293c1cee6767640f 100644
--- a/daemon/commands/video.h
+++ b/daemon/commands/video.h
@@ -1,6 +1,6 @@
 /*
 video.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,8 @@ class Video : public DaemonCommand
 {
 public:
 	Video();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 
@@ -34,14 +35,16 @@ class VideoSource : public DaemonCommand
 {
 public:
 	VideoSource();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 class AutoVideo : public DaemonCommand
 {
 public:
 	AutoVideo();
-	virtual void exec(Daemon *app, const std::string& args);
+
+	void exec(Daemon *app, const std::string& args) override;
 };
 
 #endif // LINPHONE_DAEMON_COMMAND_VIDEO_H
diff --git a/daemon/daemon-pipetest.c b/daemon/daemon-pipetest.c
index 625312c14f385422a290eda7868041ee3a17504d..f3fa70c248337d2c9eb87384d93761a91565f9b4 100644
--- a/daemon/daemon-pipetest.c
+++ b/daemon/daemon-pipetest.c
@@ -1,6 +1,6 @@
 /*
 daemon-pipetest.c
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]){
 	SetConsoleMode(hin, fdwOldMode);
 #else
 	struct pollfd pfds[2] = { { 0 } };
-	int bytes;
+	ssize_t bytes;
 	pfds[0].fd=fd;
 	pfds[0].events=POLLIN;
 	pfds[1].fd=1;
@@ -91,11 +91,11 @@ int main(int argc, char *argv[]){
 			/*splice to stdout*/
 			if (pfds[0].revents & POLLIN){
 				if ((bytes=read(pfds[0].fd,buf,sizeof(buf)))>0){
-					if (write(0,buf,bytes)==-1){
+					if (write(0,buf,(size_t)bytes)==-1){
 						ortp_error("Fail to write to stdout?");
 						break;
 					}
-					fprintf(stdout,"\n");		
+					fprintf(stdout,"\n");
 				}else if (bytes==0){
 					break;
 				}
@@ -103,10 +103,10 @@ int main(int argc, char *argv[]){
 			/*splice from stdin to pipe */
 			if (pfds[1].revents & POLLIN){
 				if ((bytes=read(pfds[1].fd,buf,sizeof(buf)))>0){
-					if (write(pfds[0].fd,buf,bytes)==-1){
+					if (write(pfds[0].fd,buf,(size_t)bytes)==-1){
 						ortp_error("Fail to write to unix socket");
 						break;
-					}		
+					}
 				}else if (bytes==0){
 					break;
 				}
@@ -117,4 +117,3 @@ int main(int argc, char *argv[]){
 
 	return 0;
 }
-
diff --git a/daemon/daemon.h b/daemon/daemon.h
index 12a32c3583ca11b8fed3d1e760985cd04da2698e..97591982eb78467eebb7f3dca7fbbe8ecb76e629 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -1,6 +1,6 @@
 /*
 daemon.h
-Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+Copyright (C) 2016 Belledonne Communications, Grenoble, France
 
 This library is free software; you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by