From 4ff9d013ffc2b127ae4c2c12a52ff45e369a4920 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Tue, 12 Aug 2014 16:20:16 -0400 Subject: [PATCH] client: cleanup, fix warnings Refs: #48032 --- daemon/src/client/callmanager.cpp | 5 ----- daemon/src/client/callmanager.h | 3 +-- daemon/src/client/configurationmanager.cpp | 5 ----- daemon/src/client/configurationmanager.h | 3 +-- daemon/src/client/presencemanager.cpp | 5 ----- daemon/src/client/presencemanager.h | 3 +-- daemon/src/client/videomanager.cpp | 1 - daemon/src/client/videomanager.h | 4 +--- 8 files changed, 4 insertions(+), 25 deletions(-) diff --git a/daemon/src/client/callmanager.cpp b/daemon/src/client/callmanager.cpp index 472f2edd97..6f33529094 100644 --- a/daemon/src/client/callmanager.cpp +++ b/daemon/src/client/callmanager.cpp @@ -46,11 +46,6 @@ #include "logger.h" #include "manager.h" -CallManager::CallManager() -{ - evHandlers_ = {}; -} - void CallManager::registerEvHandlers(struct sflph_call_ev_handlers* evHandlers) { evHandlers_ = *evHandlers; diff --git a/daemon/src/client/callmanager.h b/daemon/src/client/callmanager.h index 8070afabdf..17826347f4 100644 --- a/daemon/src/client/callmanager.h +++ b/daemon/src/client/callmanager.h @@ -55,7 +55,6 @@ class AudioZrtpSession; class CallManager { public: - CallManager(); void registerEvHandlers(struct sflph_call_ev_handlers* evHandlers); // Methods @@ -163,7 +162,7 @@ class CallManager private: // Event handlers; needed by the library API - struct sflph_call_ev_handlers evHandlers_; + sflph_call_ev_handlers evHandlers_{}; }; #endif//CALLMANAGER_H diff --git a/daemon/src/client/configurationmanager.cpp b/daemon/src/client/configurationmanager.cpp index bd22b5bbdc..a5ecf01742 100644 --- a/daemon/src/client/configurationmanager.cpp +++ b/daemon/src/client/configurationmanager.cpp @@ -51,11 +51,6 @@ #include "history/historynamecache.h" #include "audio/audiolayer.h" -ConfigurationManager::ConfigurationManager() -{ - evHandlers_ = {}; -} - void ConfigurationManager::registerEvHandlers(struct sflph_config_ev_handlers* evHandlers) { evHandlers_ = *evHandlers; diff --git a/daemon/src/client/configurationmanager.h b/daemon/src/client/configurationmanager.h index db75fa4a8a..c2d36ee976 100644 --- a/daemon/src/client/configurationmanager.h +++ b/daemon/src/client/configurationmanager.h @@ -47,7 +47,6 @@ class ConfigurationManager { public: - ConfigurationManager(); void registerEvHandlers(struct sflph_config_ev_handlers* evHandlers); // Methods @@ -162,7 +161,7 @@ class ConfigurationManager private: // Event handlers; needed by the library API - struct sflph_config_ev_handlers evHandlers_; + sflph_config_ev_handlers evHandlers_{}; }; #endif //CONFIGURATIONMANAGER_H diff --git a/daemon/src/client/presencemanager.cpp b/daemon/src/client/presencemanager.cpp index 201c29143f..c0d8378536 100644 --- a/daemon/src/client/presencemanager.cpp +++ b/daemon/src/client/presencemanager.cpp @@ -49,11 +49,6 @@ constexpr static const char* LINESTATUS_KEY = "LineStatus"; constexpr static const char* ONLINE_KEY = "Online"; constexpr static const char* OFFLINE_KEY = "Offline"; -PresenceManager::PresenceManager() -{ - evHandlers_ = {}; -} - void PresenceManager::registerEvHandlers(struct sflph_pres_ev_handlers* evHandlers) { evHandlers_ = *evHandlers; diff --git a/daemon/src/client/presencemanager.h b/daemon/src/client/presencemanager.h index 60063f3c0e..9dc96ba887 100644 --- a/daemon/src/client/presencemanager.h +++ b/daemon/src/client/presencemanager.h @@ -43,7 +43,6 @@ class PresenceManager { public: - PresenceManager(); void registerEvHandlers(struct sflph_pres_ev_handlers* evHandlers); // Methods @@ -66,7 +65,7 @@ class PresenceManager private: // Event handlers; needed by the library API - struct sflph_pres_ev_handlers evHandlers_; + struct sflph_pres_ev_handlers evHandlers_{}; }; #endif //PRESENCEINT_H diff --git a/daemon/src/client/videomanager.cpp b/daemon/src/client/videomanager.cpp index 237a3b45d8..f065bacd53 100644 --- a/daemon/src/client/videomanager.cpp +++ b/daemon/src/client/videomanager.cpp @@ -40,7 +40,6 @@ VideoManager::VideoManager() { - evHandlers_ = {}; libav_utils::sfl_avcodec_init(); } diff --git a/daemon/src/client/videomanager.h b/daemon/src/client/videomanager.h index 3865bde8c0..c02bc36267 100644 --- a/daemon/src/client/videomanager.h +++ b/daemon/src/client/videomanager.h @@ -110,9 +110,7 @@ class VideoManager void stoppedDecoding(const std::string &id, const std::string& shmPath, bool isMixer); private: -#ifdef SFL_VIDEO - struct sflph_video_ev_handlers evHandlers_; -#endif + sflph_video_ev_handlers evHandlers_{}; }; #endif // VIDEOMANAGER_H_ -- GitLab