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

feat(MainDb): remove static_cast on capabilities

Browse source
This commit is contained in:
Ronan Abhamon 2017-12-19 11:33:12 +01:00
parent f94554d7a5
commit fd191aa675
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,7 +229,7 @@ static constexpr string &blobToString (string &in) {
return id;
}
static const int capabilities = static_cast<int>(ChatRoom::Capabilities::Basic);
static const int capabilities = ChatRoom::CapabilitiesMask(ChatRoom::Capabilities::Basic);
lInfo() << "Insert new chat room in database: (peer=" << peerSipAddressId <<
", local=" << localSipAddressId << ", capabilities=" << capabilities << ").";
*session << "INSERT INTO chat_room ("
@ -261,7 +261,7 @@ static constexpr string &blobToString (string &in) {
", local=" << localSipAddressId << ").";
const tm &creationTime = Utils::getTimeTAsTm(chatRoom->getCreationTime());
const int &capabilities = static_cast<int>(chatRoom->getCapabilities());
const int &capabilities = chatRoom->getCapabilities();
const string &subject = chatRoom->getSubject();
const int &flags = chatRoom->hasBeenLeft();
*session << "INSERT INTO chat_room ("
@ -2059,13 +2059,13 @@ static constexpr string &blobToString (string &in) {
? row.get<unsigned int>(7, 0)
: static_cast<unsigned int>(row.get<int>(7, 0));
if (capabilities & static_cast<int>(ChatRoom::Capabilities::Basic)) {
if (capabilities & ChatRoom::CapabilitiesMask(ChatRoom::Capabilities::Basic)) {
chatRoom = core->getPrivate()->createBasicChatRoom(
chatRoomId,
capabilities & static_cast<int>(ChatRoom::Capabilities::RealTimeText)
capabilities & ChatRoom::CapabilitiesMask(ChatRoom::Capabilities::RealTimeText)
);
chatRoom->setSubject(subject);
} else if (capabilities & static_cast<int>(ChatRoom::Capabilities::Conference)) {
} else if (capabilities & ChatRoom::CapabilitiesMask(ChatRoom::Capabilities::Conference)) {
list<shared_ptr<Participant>> participants;
const long long &dbChatRoomId = d->resolveId(row, 0);