diff --git a/src/conference/conference.h b/src/conference/conference.h index 7d5a0af36..583a770c2 100644 --- a/src/conference/conference.h +++ b/src/conference/conference.h @@ -47,30 +47,30 @@ public: public: /* ConferenceInterface */ - virtual std::shared_ptr addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override; - virtual void addParticipants (const std::list
&addresses, const CallSessionParams *params, bool hasMedia) override; - virtual bool canHandleParticipants () const override; - virtual const std::string& getId () const override; - virtual int getNbParticipants () const override; - virtual std::list> getParticipants () const override; - virtual void removeParticipant (const std::shared_ptr &participant) override; - virtual void removeParticipants (const std::list> &participants) override; + std::shared_ptr addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override; + void addParticipants (const std::list
&addresses, const CallSessionParams *params, bool hasMedia) override; + bool canHandleParticipants () const override; + const std::string& getId () const override; + int getNbParticipants () const override; + std::list> getParticipants () const override; + void removeParticipant (const std::shared_ptr &participant) override; + void removeParticipants (const std::list> &participants) override; private: /* CallSessionListener */ - virtual void onAckBeingSent (const CallSession &session, LinphoneHeaders *headers) override; - virtual void onAckReceived (const CallSession &session, LinphoneHeaders *headers) override; - virtual void onCallSessionAccepted (const CallSession &session) override; - virtual void onCallSessionSetReleased (const CallSession &session) override; - virtual void onCallSessionSetTerminated (const CallSession &session) override; - virtual void onCallSessionStateChanged (const CallSession &session, LinphoneCallState state, const std::string &message) override; - virtual void onIncomingCallSessionStarted (const CallSession &session) override; - virtual void onEncryptionChanged (const CallSession &session, bool activated, const std::string &authToken) override; - virtual void onStatsUpdated (const LinphoneCallStats *stats) override; - virtual void onResetCurrentSession (const CallSession &session) override; - virtual void onSetCurrentSession (const CallSession &session) override; - virtual void onFirstVideoFrameDecoded (const CallSession &session) override; - virtual void onResetFirstVideoFrameDecoded (const CallSession &session) override; + void onAckBeingSent (const CallSession &session, LinphoneHeaders *headers) override; + void onAckReceived (const CallSession &session, LinphoneHeaders *headers) override; + void onCallSessionAccepted (const CallSession &session) override; + void onCallSessionSetReleased (const CallSession &session) override; + void onCallSessionSetTerminated (const CallSession &session) override; + void onCallSessionStateChanged (const CallSession &session, LinphoneCallState state, const std::string &message) override; + void onIncomingCallSessionStarted (const CallSession &session) override; + void onEncryptionChanged (const CallSession &session, bool activated, const std::string &authToken) override; + void onStatsUpdated (const LinphoneCallStats *stats) override; + void onResetCurrentSession (const CallSession &session) override; + void onSetCurrentSession (const CallSession &session) override; + void onFirstVideoFrameDecoded (const CallSession &session) override; + void onResetFirstVideoFrameDecoded (const CallSession &session) override; protected: explicit Conference (LinphoneCore *core, const Address &myAddress, CallListener *listener = nullptr); diff --git a/src/conference/local-conference.h b/src/conference/local-conference.h index 660081516..30e64229b 100644 --- a/src/conference/local-conference.h +++ b/src/conference/local-conference.h @@ -35,14 +35,14 @@ public: public: /* ConferenceInterface */ - virtual std::shared_ptr addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override; - virtual void addParticipants (const std::list
&addresses, const CallSessionParams *params, bool hasMedia) override; - virtual bool canHandleParticipants () const override; - virtual const std::string& getId () const override; - virtual int getNbParticipants () const override; - virtual std::list> getParticipants () const override; - virtual void removeParticipant (const std::shared_ptr &participant) override; - virtual void removeParticipants (const std::list> &participants) override; + std::shared_ptr addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override; + void addParticipants (const std::list
&addresses, const CallSessionParams *params, bool hasMedia) override; + bool canHandleParticipants () const override; + const std::string& getId () const override; + int getNbParticipants () const override; + std::list> getParticipants () const override; + void removeParticipant (const std::shared_ptr &participant) override; + void removeParticipants (const std::list> &participants) override; private: L_DISABLE_COPY(LocalConference); diff --git a/src/conference/remote-conference.h b/src/conference/remote-conference.h index c49f44c0b..ddafca6f1 100644 --- a/src/conference/remote-conference.h +++ b/src/conference/remote-conference.h @@ -36,16 +36,16 @@ protected: public: /* ConferenceInterface */ - virtual std::shared_ptr addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override; - virtual void removeParticipant (const std::shared_ptr &participant) override; + std::shared_ptr addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override; + void removeParticipant (const std::shared_ptr &participant) override; protected: /* ConferenceListener */ - virtual void onConferenceCreated (const Address &addr) override; - virtual void onConferenceTerminated (const Address &addr) override; - virtual void onParticipantAdded (const Address &addr) override; - virtual void onParticipantRemoved (const Address &addr) override; - virtual void onParticipantSetAdmin (const Address &addr, bool isAdmin) override; + void onConferenceCreated (const Address &addr) override; + void onConferenceTerminated (const Address &addr) override; + void onParticipantAdded (const Address &addr) override; + void onParticipantRemoved (const Address &addr) override; + void onParticipantSetAdmin (const Address &addr, bool isAdmin) override; private: L_DISABLE_COPY(RemoteConference);