From 67053e8e8e0afcd4720ff5b8d9e10ea0123ac1d3 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 22 Dec 2017 10:40:18 +0100 Subject: [PATCH] fix(MainDb): rename insertOrUpdateBasicChatRoom to insertOrUpdateImportedBasicChatRoom --- src/db/main-db-p.h | 2 +- src/db/main-db.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/db/main-db-p.h b/src/db/main-db-p.h index 16e5454e5..16d318617 100644 --- a/src/db/main-db-p.h +++ b/src/db/main-db-p.h @@ -53,7 +53,7 @@ private: long long insertSipAddress (const std::string &sipAddress); void insertContent (long long messageEventId, const Content &content); long long insertContentType (const std::string &contentType); - long long insertOrUpdateBasicChatRoom ( + long long insertOrUpdateImportedBasicChatRoom ( long long peerSipAddressId, long long localSipAddressId, const tm &creationTime diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp index 0a1f2fbc6..10b7b0882 100644 --- a/src/db/main-db.cpp +++ b/src/db/main-db.cpp @@ -213,7 +213,7 @@ static constexpr string &blobToString (string &in) { return q->getLastInsertId(); } - long long MainDbPrivate::insertOrUpdateBasicChatRoom ( + long long MainDbPrivate::insertOrUpdateImportedBasicChatRoom ( long long peerSipAddressId, long long localSipAddressId, const tm &creationTime @@ -2435,7 +2435,7 @@ static constexpr string &blobToString (string &in) { const long long &eventId = getLastInsertId(); const long long &localSipAddressId = d->insertSipAddress(message.get(LEGACY_MESSAGE_COL_LOCAL_ADDRESS)); const long long &remoteSipAddressId = d->insertSipAddress(message.get(LEGACY_MESSAGE_COL_REMOTE_ADDRESS)); - const long long &chatRoomId = d->insertOrUpdateBasicChatRoom( + const long long &chatRoomId = d->insertOrUpdateImportedBasicChatRoom( remoteSipAddressId, localSipAddressId, creationTime