diff --git a/src/account.h b/src/account.h index 03012894c9a7726a342a5545fc88587a2250c5d0..d9e88beebc82d71a5b97b835a950d4c060339474 100644 --- a/src/account.h +++ b/src/account.h @@ -66,7 +66,7 @@ class VoipLinkException : public std::runtime_error { public: VoipLinkException(const std::string &str = "") : - std::runtime_error("VoipLinkException occured: " + str) {} + std::runtime_error("VoipLinkException occurred: " + str) {} }; /** diff --git a/src/im/instant_messaging.h b/src/im/instant_messaging.h index f95144ef07c96038e05da390012ed70a296ca854..5a2bed23cee2bf904fc11e9e75decdfc8b894e34 100644 --- a/src/im/instant_messaging.h +++ b/src/im/instant_messaging.h @@ -44,7 +44,7 @@ namespace ring { namespace InstantMessaging { struct InstantMessageException : std::runtime_error { InstantMessageException(const std::string& str="") : - std::runtime_error("InstantMessageException occured: " + str) {} + std::runtime_error("InstantMessageException occurred: " + str) {} }; /** diff --git a/src/media/audio/sound/audiofile.h b/src/media/audio/sound/audiofile.h index 527328a1820b0c021dfd0704be1c744fb6882563..8ccaf5d2c4f9f5860311d885ae2bea45729fdfb1 100644 --- a/src/media/audio/sound/audiofile.h +++ b/src/media/audio/sound/audiofile.h @@ -32,7 +32,7 @@ namespace ring { class AudioFileException : public std::runtime_error { public: AudioFileException(const std::string &str) : - std::runtime_error("AudioFile: AudioFileException occured: " + str) {} + std::runtime_error("AudioFile: AudioFileException occurred: " + str) {} }; /** diff --git a/src/media/video/video_rtp_session.cpp b/src/media/video/video_rtp_session.cpp index 3fed2c27a2f2bfa8979d55702e0181d8cd2e9d51..40d5f0ab74e01e2a4c557ab1001d5fafb6eba491 100644 --- a/src/media/video/video_rtp_session.cpp +++ b/src/media/video/video_rtp_session.cpp @@ -82,7 +82,7 @@ void VideoRtpSession::startSender() else RING_ERR("No valid new video parameters."); } catch (const std::exception& e) { - RING_ERR("Exception during retriving video parameters: %s", + RING_ERR("Exception during retrieving video parameters: %s", e.what()); } } else { diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp index b1dfd0926550792ebca2f7c887757de4ad4d75e8..b1edb6099ae6ea0d8282e96b79341545fbd90313 100644 --- a/src/ringdht/ringaccount.cpp +++ b/src/ringdht/ringaccount.cpp @@ -236,7 +236,7 @@ RingAccount::newOutgoingCall(const std::string& toUrl) if (auto call = weak_call.lock()) call->onFailure(); } else - RING_DBG("Succesfully put ICE descriptor on DHT"); + RING_DBG("Successfully put ICE descriptor on DHT"); shared_this->dht_.cancelPut(callkey, vid); } ); diff --git a/src/sip/pattern.h b/src/sip/pattern.h index 34b4f7009018ae60561cb1d9995a3088e858e01b..cb87e83f98b811855a3bb086c5e04de6e3f5ffb8 100644 --- a/src/sip/pattern.h +++ b/src/sip/pattern.h @@ -30,7 +30,7 @@ namespace ring { /** * Exception object that is thrown when - * an error occured while compiling the + * an error occurred while compiling the * regular expression. */ class CompileError : public std::invalid_argument { @@ -41,7 +41,7 @@ class CompileError : public std::invalid_argument { /** * Exception object that is thrown when - * an error occured while mathing a + * an error occurred while mathing a * pattern to an expression. */ class MatchError : public std::invalid_argument { diff --git a/src/sip/sdes_negotiator.cpp b/src/sip/sdes_negotiator.cpp index 9d8521278cad8dd6303aab7612fe01b739c7c021..e909075c48f7ad77f61b0742b0348f5513d5d956 100644 --- a/src/sip/sdes_negotiator.cpp +++ b/src/sip/sdes_negotiator.cpp @@ -69,7 +69,7 @@ SdesNegotiator::parse(const std::vector<std::string>& attributes) "(?P<mkiLength>[0-9]{1,3})\\;?)?", true)); } catch (const CompileError& exception) { - throw ParseError("A compile exception occured on a pattern."); + throw ParseError("A compile exception occurred on a pattern."); } // Take each line from the vector diff --git a/src/sip/sdes_negotiator.h b/src/sip/sdes_negotiator.h index c2e9a41c15f7daccc25ff1015f933128fc6e6b73..fd76d0204d4bc52e5153f9a1c57b4cc1bf1a7ec2 100644 --- a/src/sip/sdes_negotiator.h +++ b/src/sip/sdes_negotiator.h @@ -32,7 +32,7 @@ namespace ring { /** * General exception object that is thrown when - * an error occured with a regular expression + * an error occurred with a regular expression * operation. */ class ParseError : public std::invalid_argument { diff --git a/src/sip/sdp.h b/src/sip/sdp.h index 4fe27bde4a2557c7cb6306c98c05e5d9cf570ccc..10df6c97b3737b68c42bb995a585788f1e5f0dec 100644 --- a/src/sip/sdp.h +++ b/src/sip/sdp.h @@ -56,7 +56,7 @@ class AudioCodec; class SdpException : public std::runtime_error { public: SdpException(const std::string& str="") : - std::runtime_error("SDP: SdpException occured: " + str) {} + std::runtime_error("SDP: SdpException occurred: " + str) {} }; class Sdp { diff --git a/test/sdptest.h b/test/sdptest.h index 4dc93437ac6981a16c6b3d6b33b30c92faaa5eec..fd36a935ba9bce92c36bf3b78776bd54ec4e6087 100644 --- a/test/sdptest.h +++ b/test/sdptest.h @@ -62,7 +62,7 @@ class SdpSessionException : public std::exception { virtual ~SdpSessionException() throw() {} virtual const char *what() const throw() { - std::string expt("SdpSession: SdpSessionException occured: "); + std::string expt("SdpSession: SdpSessionException occurred: "); expt.append(errstr); return expt.c_str(); }