diff --git a/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h b/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h index c3481844971919f06097f41119168578e7c32d3a..cc8c6381913839bbcc508e04b7298c095fb6f038 100644 --- a/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h +++ b/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h @@ -71,13 +71,6 @@ timeval2microtimeout (const timeval& t) return ( (t.tv_sec * 1000000ul) + t.tv_usec); } -class AudioRtpSessionException: public std::exception -{ - virtual const char* what() const throw() { - return "AudioRtpSessionException occured"; - } -}; - typedef struct DtmfEvent { ost::RTPPacket::RFC2833Payload payload; int factor; diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.h b/sflphone-common/src/audio/audiortp/AudioSrtpSession.h index 2d8d79a5aa6849e505cd4655513173aef7765f46..86c2718ca82328f1c402448711d5ac50cb7357d4 100644 --- a/sflphone-common/src/audio/audiortp/AudioSrtpSession.h +++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.h @@ -66,13 +66,6 @@ class SIPCall; namespace sfl { -class SrtpException: public std::exception -{ - virtual const char* what() const throw() { - return "ZRTP ZID initialization failed."; - } -}; - class AudioSrtpSession : public AudioRtpSession { public: diff --git a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h b/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h index c9d2acadff0bf7c9caba62ecefe3ee24309fc81e..bdd26e7db2382c4954848726fb635326b36c3944 100644 --- a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h +++ b/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h @@ -46,13 +46,6 @@ class DBusManagerImpl; namespace sfl { -class ZrtpSessionCallbackException: public std::exception -{ - virtual const char* what() const throw() { - return "An exception occured while being in a zrtp callback\n"; - } -}; - class ZrtpSessionCallback: public ZrtpUserCallback { public: diff --git a/sflphone-common/src/config/yamlengine.h b/sflphone-common/src/config/yamlengine.h index d1ba6965c6b10b06e67862c266ac0f3a2f30222d..00b1a4bc27c7cb71136fea350e26e09fc80978db 100644 --- a/sflphone-common/src/config/yamlengine.h +++ b/sflphone-common/src/config/yamlengine.h @@ -40,14 +40,6 @@ namespace Conf { -class YamlEngineException : public std::exception -{ - - virtual const char *what() const throw() { - return "YamlEngineException occured"; - } -}; - class YamlEngine : public Engine { diff --git a/sflphone-common/src/config/yamlnode.h b/sflphone-common/src/config/yamlnode.h index 03ef54266fc309638707e5219ea8da6ec68ea0e2..ebfab90f77c77dd58c776042e095f3061e8ae037 100644 --- a/sflphone-common/src/config/yamlnode.h +++ b/sflphone-common/src/config/yamlnode.h @@ -34,7 +34,7 @@ #include <string> #include <list> #include <map> -#include <exception> +#include <stdexcept> namespace Conf { @@ -45,25 +45,6 @@ class YamlNode; typedef std::list<YamlNode *> Sequence; typedef std::map<std::string, YamlNode *> Mapping; -class YamlNodeException : public std::exception -{ - - public: - YamlNodeException (const std::string& str="") throw() : errstr (str) {} - - virtual ~YamlNodeException() throw() {} - - virtual const char *what() const throw() { - std::string expt ("YamlNodeException occured: "); - expt.append (errstr); - - return expt.c_str(); - } - private: - std::string errstr; - -}; - enum NodeType { DOCUMENT, SCALAR, MAPPING, SEQUENCE }; class YamlNode diff --git a/sflphone-common/src/sip/sipaccount.h b/sflphone-common/src/sip/sipaccount.h index 97897d18b6f435ddf1f5fa56aaae2e736574be09..de1ddfb4afadc2c1e465fb35c0524d1e1afe7c5d 100644 --- a/sflphone-common/src/sip/sipaccount.h +++ b/sflphone-common/src/sip/sipaccount.h @@ -105,24 +105,6 @@ class SIPVoIPLink; * @brief A SIP Account specify SIP specific functions and object (SIPCall/SIPVoIPLink) */ -class SipAccountException : public std::exception -{ - public: - SipAccountException (const std::string& str="") throw() : errstr (str) {} - - virtual ~SipAccountException() throw() {} - - virtual const char *what() const throw() { - std::string expt ("SipAccountException occured: "); - expt.append (errstr); - - return expt.c_str(); - } - private: - std::string errstr; - -}; - class CredentialItem { public: diff --git a/sflphone-common/src/sip/sipvoiplink.h b/sflphone-common/src/sip/sipvoiplink.h index f08be6fc25a9cfcddb58e42f933233132c08b769..f0b22eaa89080161d707ede9afa2e2a91faeb90e 100644 --- a/sflphone-common/src/sip/sipvoiplink.h +++ b/sflphone-common/src/sip/sipvoiplink.h @@ -62,22 +62,6 @@ class SIPCall; // To set the verbosity. From 0 (min) to 6 (max) #define PJ_LOG_LEVEL 0 -class SIPVoipLinkException : public std::exception -{ - public: - SIPVoipLinkException (const std::string& str="") throw() : errstr (str) {} - - virtual ~SIPVoipLinkException() throw() {} - - virtual const char *what() const throw() { - std::string expt ("UserAgent: SIPVoipLinkException occured: "); - expt.append (errstr); - return expt.c_str(); - } - private: - std::string errstr; -}; - /** * @file sipvoiplink.h * @brief Specific VoIPLink for SIP (SIP core for incoming and outgoing events).