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

fix(ChatRoom): rename some functions

Browse source
This commit is contained in:
Ronan Abhamon 2017-11-06 09:17:47 +01:00
parent a9c557ae37
commit cb045ce1b1
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/core-chat-room.cpp
View file

@ -64,7 +64,7 @@ static inline string resolveWorkaroundClientGroupChatRoomAddress (
// -----------------------------------------------------------------------------
shared_ptr<ChatRoom> CorePrivate::createChatRoom (const Address &peerAddress, bool isRtt) {
shared_ptr<ChatRoom> CorePrivate::createBasicChatRoom (const Address &peerAddress, bool isRtt) {
L_Q();
shared_ptr<ChatRoom> chatRoom;
@ -75,7 +75,7 @@ shared_ptr<ChatRoom> CorePrivate::createChatRoom (const Address &peerAddress, bo
chatRoom = make_shared<BasicChatRoom>(q->getSharedFromThis(), peerAddress);
ChatRoomPrivate *dChatRoom = chatRoom->getPrivate();
insertChatRoom(chatRoom);
dChatRoom->setState(ChatRoom::State::Instantiated);
dChatRoom->setState(ChatRoom::State::Created);
@ -176,7 +176,8 @@ shared_ptr<ChatRoom> Core::getOrCreateBasicChatRoom (const Address &peerAddress,
if (chatRoom)
return chatRoom;
chatRoom = d->createChatRoom(peerAddress, isRtt);
chatRoom = d->createBasicChatRoom(peerAddress, isRtt);
d->insertChatRoom(chatRoom);
d->insertChatRoomWithDb(chatRoom);
return chatRoom;

2
src/core/core-p.h
View file

@ -35,7 +35,7 @@ public:
void insertChatRoom (const std::shared_ptr<ChatRoom> &chatRoom);
void insertChatRoomWithDb (const std::shared_ptr<ChatRoom> &chatRoom);
std::shared_ptr<ChatRoom> createChatRoom (const Address &peerAddress, bool isRtt);
std::shared_ptr<ChatRoom> createBasicChatRoom (const Address &peerAddress, bool isRtt);
private:
void deleteChatRoom (const std::string &peerAddress);

2
src/db/main-db.cpp
View file

@ -1186,7 +1186,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : CoreAccessor(core), AbstractDb(*
(void)lastNotifyId;
if (capabilities & static_cast<int>(ChatRoom::Capabilities::Basic)) {
chatRoom = core->getPrivate()->createChatRoom(
chatRoom = core->getPrivate()->createBasicChatRoom(
Address(sipAddress),
capabilities & static_cast<int>(ChatRoom::Capabilities::RealTimeText)
);