From e9805213e275c5ce666e2b3571855c2917a082bd Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 4 Dec 2017 15:49:47 +0100 Subject: [PATCH] fix(conference): replace getNbParticipants to participantCount --- src/c-wrapper/api/c-chat-room.cpp | 2 +- src/chat/chat-room/basic-chat-room.cpp | 2 +- src/chat/chat-room/basic-chat-room.h | 2 +- src/chat/chat-room/client-group-chat-room.cpp | 4 ++-- src/chat/chat-room/client-group-chat-room.h | 2 +- src/chat/chat-room/server-group-chat-room-stub.cpp | 2 +- src/chat/chat-room/server-group-chat-room.h | 2 +- src/conference/conference-interface.h | 2 +- src/conference/conference.cpp | 2 +- src/conference/conference.h | 2 +- src/core/core-chat-room.cpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/c-wrapper/api/c-chat-room.cpp b/src/c-wrapper/api/c-chat-room.cpp index 1702d188d..133704ade 100644 --- a/src/c-wrapper/api/c-chat-room.cpp +++ b/src/c-wrapper/api/c-chat-room.cpp @@ -287,7 +287,7 @@ LinphoneParticipant *linphone_chat_room_get_me (const LinphoneChatRoom *cr) { } int linphone_chat_room_get_nb_participants (const LinphoneChatRoom *cr) { - return L_GET_CPP_PTR_FROM_C_OBJECT(cr)->getNbParticipants(); + return L_GET_CPP_PTR_FROM_C_OBJECT(cr)->getParticipantCount(); } bctbx_list_t *linphone_chat_room_get_participants (const LinphoneChatRoom *cr) { diff --git a/src/chat/chat-room/basic-chat-room.cpp b/src/chat/chat-room/basic-chat-room.cpp index 885fc025d..3ee9aca79 100644 --- a/src/chat/chat-room/basic-chat-room.cpp +++ b/src/chat/chat-room/basic-chat-room.cpp @@ -90,7 +90,7 @@ shared_ptr BasicChatRoom::getMe () const { return nullptr; } -int BasicChatRoom::getNbParticipants () const { +int BasicChatRoom::getParticipantCount () const { return 1; } diff --git a/src/chat/chat-room/basic-chat-room.h b/src/chat/chat-room/basic-chat-room.h index 18f5531d5..e761ca791 100644 --- a/src/chat/chat-room/basic-chat-room.h +++ b/src/chat/chat-room/basic-chat-room.h @@ -48,7 +48,7 @@ public: std::shared_ptr findParticipant (const IdentityAddress &addr) const override; std::shared_ptr getMe () const override; - int getNbParticipants () const override; + int getParticipantCount () const override; const std::list> &getParticipants () const override; void setParticipantAdminStatus (std::shared_ptr &participant, bool isAdmin) override; diff --git a/src/chat/chat-room/client-group-chat-room.cpp b/src/chat/chat-room/client-group-chat-room.cpp index d0bce5c94..508853d53 100644 --- a/src/chat/chat-room/client-group-chat-room.cpp +++ b/src/chat/chat-room/client-group-chat-room.cpp @@ -204,8 +204,8 @@ shared_ptr ClientGroupChatRoom::getMe () const { return RemoteConference::getMe(); } -int ClientGroupChatRoom::getNbParticipants () const { - return RemoteConference::getNbParticipants(); +int ClientGroupChatRoom::getParticipantCount () const { + return RemoteConference::getParticipantCount(); } const list> &ClientGroupChatRoom::getParticipants () const { diff --git a/src/chat/chat-room/client-group-chat-room.h b/src/chat/chat-room/client-group-chat-room.h index 41f201961..8513633ea 100644 --- a/src/chat/chat-room/client-group-chat-room.h +++ b/src/chat/chat-room/client-group-chat-room.h @@ -66,7 +66,7 @@ public: std::shared_ptr findParticipant (const IdentityAddress &addr) const override; std::shared_ptr getMe () const override; - int getNbParticipants () const override; + int getParticipantCount () const override; const std::list> &getParticipants () const override; void setParticipantAdminStatus (std::shared_ptr &participant, bool isAdmin) override; diff --git a/src/chat/chat-room/server-group-chat-room-stub.cpp b/src/chat/chat-room/server-group-chat-room-stub.cpp index cb16dfd7c..0b0a8e8bf 100644 --- a/src/chat/chat-room/server-group-chat-room-stub.cpp +++ b/src/chat/chat-room/server-group-chat-room-stub.cpp @@ -122,7 +122,7 @@ shared_ptr ServerGroupChatRoom::getMe () const { return nullptr; } -int ServerGroupChatRoom::getNbParticipants () const { +int ServerGroupChatRoom::getParticipantCount () const { return 0; } diff --git a/src/chat/chat-room/server-group-chat-room.h b/src/chat/chat-room/server-group-chat-room.h index 8dec5ee67..d70442513 100644 --- a/src/chat/chat-room/server-group-chat-room.h +++ b/src/chat/chat-room/server-group-chat-room.h @@ -64,7 +64,7 @@ public: std::shared_ptr findParticipant (const IdentityAddress &addr) const override; std::shared_ptr getMe () const override; - int getNbParticipants () const override; + int getParticipantCount () const override; const std::list> &getParticipants () const override; void setParticipantAdminStatus (std::shared_ptr &participant, bool isAdmin) override; diff --git a/src/conference/conference-interface.h b/src/conference/conference-interface.h index db6b505c9..f7b8fd829 100644 --- a/src/conference/conference-interface.h +++ b/src/conference/conference-interface.h @@ -43,7 +43,7 @@ public: virtual std::shared_ptr findParticipant (const IdentityAddress &addr) const = 0; virtual const IdentityAddress &getConferenceAddress () const = 0; virtual std::shared_ptr getMe () const = 0; - virtual int getNbParticipants () const = 0; + virtual int getParticipantCount () const = 0; virtual const std::list> &getParticipants () const = 0; virtual const std::string &getSubject () const = 0; virtual void join () = 0; diff --git a/src/conference/conference.cpp b/src/conference/conference.cpp index 15424caef..5d50eaa6f 100644 --- a/src/conference/conference.cpp +++ b/src/conference/conference.cpp @@ -83,7 +83,7 @@ shared_ptr Conference::getMe () const { return d->me; } -int Conference::getNbParticipants () const { +int Conference::getParticipantCount () const { L_D(); return static_cast(d->participants.size()); } diff --git a/src/conference/conference.h b/src/conference/conference.h index de8e29de4..2db432305 100644 --- a/src/conference/conference.h +++ b/src/conference/conference.h @@ -54,7 +54,7 @@ public: std::shared_ptr findParticipant (const IdentityAddress &addr) const override; const IdentityAddress &getConferenceAddress () const override; std::shared_ptr getMe () const override; - int getNbParticipants () const override; + int getParticipantCount () const override; const std::list> &getParticipants () const override; const std::string &getSubject () const override; void join () override; diff --git a/src/core/core-chat-room.cpp b/src/core/core-chat-room.cpp index 3c86e1f03..bf75776d8 100644 --- a/src/core/core-chat-room.cpp +++ b/src/core/core-chat-room.cpp @@ -135,7 +135,7 @@ shared_ptr Core::findOneToOneChatRoom ( L_D(); for (const auto &chatRoom : d->chatRooms) { if ( - chatRoom->getNbParticipants() == 1 && + chatRoom->getParticipantCount() == 1 && chatRoom->getLocalAddress() == localAddress && participantAddress == chatRoom->getParticipants().front()->getAddress() )