mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(Conference): add override when necessary and cast correctly nb participants

Browse source
This commit is contained in:
Ronan Abhamon 2017-09-20 12:49:17 +02:00
parent b2a0cd770e
commit f64376cbc1
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/chat/client-group-chat-room.h
View file

@ -51,11 +51,11 @@ public:
private:
/* ConferenceListener */
void onConferenceCreated (const Address &addr);
void onConferenceTerminated (const Address &addr);
void onParticipantAdded (const Address &addr);
void onParticipantRemoved (const Address &addr);
void onParticipantSetAdmin (const Address &addr, bool isAdmin);
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_DECLARE_PRIVATE(ClientGroupChatRoom);

2
src/conference/conference.cpp
View file

@ -59,7 +59,7 @@ const string& Conference::getId () const {
}
int Conference::getNbParticipants () const {
return participants.size();
return static_cast<int>(participants.size());
}
list<shared_ptr<Participant>> Conference::getParticipants () const {

14
src/conference/remote-conference.h
View file

@ -36,16 +36,16 @@ protected:
public:
/* ConferenceInterface */
virtual std::shared_ptr<Participant> addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia);
virtual void removeParticipant (const std::shared_ptr<const Participant> &participant);
virtual std::shared_ptr<Participant> addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) override;
virtual void removeParticipant (const std::shared_ptr<const Participant> &participant) override;
protected:
/* ConferenceListener */
virtual void onConferenceCreated (const Address &addr);
virtual void onConferenceTerminated (const Address &addr);
virtual void onParticipantAdded (const Address &addr);
virtual void onParticipantRemoved (const Address &addr);
virtual void onParticipantSetAdmin (const Address &addr, bool isAdmin);
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;
private:
L_DISABLE_COPY(RemoteConference);