Commit 8d9028f6 authored by Alexandre Lision's avatar Alexandre Lision Committed by Guillaume Roguez

compilation: fix warnings

Add override marker to explicit from where functions come from

Issue: #80598
Change-Id: I957afd713de22016220786145471d87c211064c8
parent 6aeafbd0
...@@ -136,7 +136,7 @@ class IAXCall : public Call ...@@ -136,7 +136,7 @@ class IAXCall : public Call
bool offhold() override; bool offhold() override;
//TODO: implement mute for IAX //TODO: implement mute for IAX
void muteMedia(const std::string& /*mediaType*/, bool /*isMuted*/) {} void muteMedia(const std::string& /*mediaType*/, bool /*isMuted*/) override {}
//TODO: implement restartMedia for IAX //TODO: implement restartMedia for IAX
void restartMediaSender() override {} void restartMediaSender() override {}
......
...@@ -97,7 +97,7 @@ class SIPAccount : public SIPAccountBase { ...@@ -97,7 +97,7 @@ class SIPAccount : public SIPAccountBase {
~SIPAccount(); ~SIPAccount();
const char* getAccountType() const { const char* getAccountType() const override {
return ACCOUNT_TYPE; return ACCOUNT_TYPE;
} }
...@@ -116,32 +116,32 @@ class SIPAccount : public SIPAccountBase { ...@@ -116,32 +116,32 @@ class SIPAccount : public SIPAccountBase {
/** /**
* Returns true if this is the IP2IP account * Returns true if this is the IP2IP account
*/ */
bool isIP2IP() const; bool isIP2IP() const override;
/** /**
* Serialize internal state of this account for configuration * Serialize internal state of this account for configuration
* @param out Emitter to which state will be saved * @param out Emitter to which state will be saved
*/ */
virtual void serialize(YAML::Emitter &out); virtual void serialize(YAML::Emitter &out) override;
/** /**
* Populate the internal state for this account based on info stored in the configuration file * Populate the internal state for this account based on info stored in the configuration file
* @param The configuration node for this account * @param The configuration node for this account
*/ */
virtual void unserialize(const YAML::Node &node); virtual void unserialize(const YAML::Node &node) override;
/** /**
* Return an map containing the internal state of this account. Client application can use this method to manage * Return an map containing the internal state of this account. Client application can use this method to manage
* account info. * account info.
* @return A map containing the account information. * @return A map containing the account information.
*/ */
virtual std::map<std::string, std::string> getAccountDetails() const; virtual std::map<std::string, std::string> getAccountDetails() const override;
/** /**
* Retrieve volatile details such as recent registration errors * Retrieve volatile details such as recent registration errors
* @return std::map< std::string, std::string > The account volatile details * @return std::map< std::string, std::string > The account volatile details
*/ */
virtual std::map<std::string, std::string> getVolatileAccountDetails() const; virtual std::map<std::string, std::string> getVolatileAccountDetails() const override;
/** /**
* Return the information for the default IP to IP account * Return the information for the default IP to IP account
...@@ -157,17 +157,17 @@ class SIPAccount : public SIPAccountBase { ...@@ -157,17 +157,17 @@ class SIPAccount : public SIPAccountBase {
/** /**
* Actually useless, since config loading is done in init() * Actually useless, since config loading is done in init()
*/ */
void loadConfig(); void loadConfig() override;
/** /**
* Initialize the SIP voip link with the account parameters and send registration * Initialize the SIP voip link with the account parameters and send registration
*/ */
void doRegister(); void doRegister() override;
/** /**
* Send unregistration. * Send unregistration.
*/ */
void doUnregister(std::function<void(bool)> cb = std::function<void(bool)>()); void doUnregister(std::function<void(bool)> cb = std::function<void(bool)>()) override;
/** /**
* Start the keep alive function, once started, the account will be registered periodically * Start the keep alive function, once started, the account will be registered periodically
...@@ -321,7 +321,7 @@ class SIPAccount : public SIPAccountBase { ...@@ -321,7 +321,7 @@ class SIPAccount : public SIPAccountBase {
return tlsListenerPort_; return tlsListenerPort_;
} }
pj_str_t getStunServerName() const { pj_str_t getStunServerName() const override {
return stunServerName_; return stunServerName_;
} }
...@@ -333,7 +333,7 @@ class SIPAccount : public SIPAccountBase { ...@@ -333,7 +333,7 @@ class SIPAccount : public SIPAccountBase {
* file, that can be used directly by PJSIP to initialize * file, that can be used directly by PJSIP to initialize
* an alternate UDP transport. * an alternate UDP transport.
*/ */
pj_uint16_t getStunPort() const { pj_uint16_t getStunPort() const override {
return stunPort_; return stunPort_;
} }
...@@ -341,7 +341,7 @@ class SIPAccount : public SIPAccountBase { ...@@ -341,7 +341,7 @@ class SIPAccount : public SIPAccountBase {
* @return bool Tells if current transport for that * @return bool Tells if current transport for that
* account is set to OTHER. * account is set to OTHER.
*/ */
bool isStunEnabled() const { bool isStunEnabled() const override {
return stunEnabled_; return stunEnabled_;
} }
...@@ -364,7 +364,7 @@ class SIPAccount : public SIPAccountBase { ...@@ -364,7 +364,7 @@ class SIPAccount : public SIPAccountBase {
* @return pj_str_t "To" uri based on @param username * @return pj_str_t "To" uri based on @param username
* @param username A string formatted as : "username" * @param username A string formatted as : "username"
*/ */
std::string getToUri(const std::string& username) const; std::string getToUri(const std::string& username) const override;
/** /**
* In the current version of Ring, "srv" uri is obtained in the preformated * In the current version of Ring, "srv" uri is obtained in the preformated
...@@ -380,7 +380,7 @@ class SIPAccount : public SIPAccountBase { ...@@ -380,7 +380,7 @@ class SIPAccount : public SIPAccountBase {
* Get the contact header for * Get the contact header for
* @return pj_str_t The contact header based on account information * @return pj_str_t The contact header based on account information
*/ */
pj_str_t getContactHeader(pjsip_transport* = nullptr); pj_str_t getContactHeader(pjsip_transport* = nullptr) override;
std::string getServiceRoute() const { std::string getServiceRoute() const {
...@@ -389,15 +389,15 @@ class SIPAccount : public SIPAccountBase { ...@@ -389,15 +389,15 @@ class SIPAccount : public SIPAccountBase {
bool hasServiceRoute() const { return not serviceRoute_.empty(); } bool hasServiceRoute() const { return not serviceRoute_.empty(); }
virtual bool isTlsEnabled() const { virtual bool isTlsEnabled() const override {
return tlsEnable_; return tlsEnable_;
} }
virtual sip_utils::KeyExchangeProtocol getSrtpKeyExchange() const { virtual sip_utils::KeyExchangeProtocol getSrtpKeyExchange() const override {
return srtpKeyExchange_; return srtpKeyExchange_;
} }
virtual bool getSrtpFallback() const { virtual bool getSrtpFallback() const override {
return srtpFallback_; return srtpFallback_;
} }
...@@ -483,7 +483,7 @@ class SIPAccount : public SIPAccountBase { ...@@ -483,7 +483,7 @@ class SIPAccount : public SIPAccountBase {
* Implementation of Account::newOutgoingCall() * Implementation of Account::newOutgoingCall()
* Note: keep declaration before newOutgoingCall template. * Note: keep declaration before newOutgoingCall template.
*/ */
std::shared_ptr<Call> newOutgoingCall(const std::string& toUrl); std::shared_ptr<Call> newOutgoingCall(const std::string& toUrl) override;
/** /**
* Create outgoing SIPCall. * Create outgoing SIPCall.
...@@ -504,11 +504,11 @@ class SIPAccount : public SIPAccountBase { ...@@ -504,11 +504,11 @@ class SIPAccount : public SIPAccountBase {
* This type can be any base class of SIPCall class (included). * This type can be any base class of SIPCall class (included).
*/ */
std::shared_ptr<SIPCall> std::shared_ptr<SIPCall>
newIncomingCall(const std::string& from); newIncomingCall(const std::string& from) override;
void onRegister(pjsip_regc_cbparam *param); void onRegister(pjsip_regc_cbparam *param);
virtual void sendTextMessage(const std::string& /* to */, const std::string& /* message */); virtual void sendTextMessage(const std::string& /* to */, const std::string& /* message */) override;
private: private:
void doRegister1_(); void doRegister1_();
...@@ -518,7 +518,7 @@ class SIPAccount : public SIPAccountBase { ...@@ -518,7 +518,7 @@ class SIPAccount : public SIPAccountBase {
* Set the internal state for this account, mainly used to manage account details from the client application. * Set the internal state for this account, mainly used to manage account details from the client application.
* @param The map containing the account information. * @param The map containing the account information.
*/ */
void setAccountDetails(const std::map<std::string, std::string> &details); void setAccountDetails(const std::map<std::string, std::string> &details) override;
NON_COPYABLE(SIPAccount); NON_COPYABLE(SIPAccount);
......
...@@ -247,19 +247,19 @@ public: ...@@ -247,19 +247,19 @@ public:
void onTextMessage(const std::string& from, const std::string& msg); void onTextMessage(const std::string& from, const std::string& msg);
protected: protected:
virtual void serialize(YAML::Emitter &out); virtual void serialize(YAML::Emitter &out) override;
virtual void serializeTls(YAML::Emitter &out); virtual void serializeTls(YAML::Emitter &out);
virtual void unserialize(const YAML::Node &node); virtual void unserialize(const YAML::Node &node) override;
virtual void setAccountDetails(const std::map<std::string, std::string> &details); virtual void setAccountDetails(const std::map<std::string, std::string> &details) override;
virtual std::map<std::string, std::string> getAccountDetails() const; virtual std::map<std::string, std::string> getAccountDetails() const override;
/** /**
* Retrieve volatile details such as recent registration errors * Retrieve volatile details such as recent registration errors
* @return std::map< std::string, std::string > The account volatile details * @return std::map< std::string, std::string > The account volatile details
*/ */
virtual std::map<std::string, std::string> getVolatileAccountDetails() const; virtual std::map<std::string, std::string> getVolatileAccountDetails() const override;
/** /**
* Voice over IP Link contains a listener thread and calls * Voice over IP Link contains a listener thread and calls
......
...@@ -211,13 +211,13 @@ class SIPCall : public Call ...@@ -211,13 +211,13 @@ class SIPCall : public Call
void openPortsUPnP(); void openPortsUPnP();
void muteMedia(const std::string& mediaType, bool isMuted); void muteMedia(const std::string& mediaType, bool isMuted) override;
void restartMediaSender() override; void restartMediaSender() override;
bool useVideoCodec(const AccountVideoCodecInfo* codec) const override; bool useVideoCodec(const AccountVideoCodecInfo* codec) const override;
virtual std::map<std::string, std::string> getDetails() const; virtual std::map<std::string, std::string> getDetails() const override;
bool initIceTransport(bool master, unsigned channel_num=4) override; bool initIceTransport(bool master, unsigned channel_num=4) override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment