From fd191aa675bf991a9852c1e760dd5fdef8bf0b1b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 19 Dec 2017 11:33:12 +0100 Subject: [PATCH] feat(MainDb): remove static_cast on capabilities --- src/db/main-db.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp index c2f3e96ba..e0a116ee5 100644 --- a/src/db/main-db.cpp +++ b/src/db/main-db.cpp @@ -229,7 +229,7 @@ static constexpr string &blobToString (string &in) { return id; } - static const int capabilities = static_cast(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(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(7, 0) : static_cast(row.get(7, 0)); - if (capabilities & static_cast(ChatRoom::Capabilities::Basic)) { + if (capabilities & ChatRoom::CapabilitiesMask(ChatRoom::Capabilities::Basic)) { chatRoom = core->getPrivate()->createBasicChatRoom( chatRoomId, - capabilities & static_cast(ChatRoom::Capabilities::RealTimeText) + capabilities & ChatRoom::CapabilitiesMask(ChatRoom::Capabilities::RealTimeText) ); chatRoom->setSubject(subject); - } else if (capabilities & static_cast(ChatRoom::Capabilities::Conference)) { + } else if (capabilities & ChatRoom::CapabilitiesMask(ChatRoom::Capabilities::Conference)) { list> participants; const long long &dbChatRoomId = d->resolveId(row, 0);