From d1157af9ad2e9167c05688fbc0a478ce9a8ddc90 Mon Sep 17 00:00:00 2001 From: Michal Michalski Date: Tue, 10 Dec 2019 12:00:32 +0100 Subject: [PATCH] [messaging] MessageFolder alias has been removed. [Verification] code compiles. Signed-off-by: Michal Michalski Change-Id: I631a2a7ef9ecd0727857002d235c867a6175d1b6 --- src/messaging/DBus/MessageProxy.cpp | 2 +- src/messaging/folders_change_callback.cc | 2 +- src/messaging/message_folder.h | 3 +-- src/messaging/message_service.cc | 4 ++-- src/messaging/message_service.h | 6 +++--- src/messaging/message_storage_email.cc | 2 +- src/messaging/messaging_instance.cc | 2 +- src/messaging/messaging_native.cc | 8 +++----- src/messaging/messaging_native.h | 4 ++-- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/messaging/DBus/MessageProxy.cpp b/src/messaging/DBus/MessageProxy.cpp index ed918a2..3cfb9ec 100644 --- a/src/messaging/DBus/MessageProxy.cpp +++ b/src/messaging/DBus/MessageProxy.cpp @@ -252,7 +252,7 @@ PlatformResult MessageProxy::handleMailboxEvent(int account_id, int mailbox_id, eventFolder->service_type = MessageType::EMAIL; eventFolder->service_id = account_id; - auto folder = std::make_shared(createMessageFolder(std::to_string(mailbox_id))); + auto folder = std::make_shared(createMessageFolder(std::to_string(mailbox_id))); if (event != NOTI_MAILBOX_DELETE) { auto ret = native::EmailGetMailboxById(mailbox_id, *folder); if (ret.IsError()) { diff --git a/src/messaging/folders_change_callback.cc b/src/messaging/folders_change_callback.cc index c92d04b..d7d3299 100644 --- a/src/messaging/folders_change_callback.cc +++ b/src/messaging/folders_change_callback.cc @@ -53,7 +53,7 @@ void FoldersChangeCallback::Handler(const FolderPtrVector& folders, const char* } picojson::array array; - auto each = [&array](std::shared_ptr f) -> void { array.push_back(*f); }; + auto each = [&array](std::shared_ptr f) -> void { array.push_back(*f); }; for_each(filtered.begin(), filtered.end(), each); LoggerD("Calling:%s with:%zu added folders", action, filtered.size()); diff --git a/src/messaging/message_folder.h b/src/messaging/message_folder.h index 852d581..5daea21 100644 --- a/src/messaging/message_folder.h +++ b/src/messaging/message_folder.h @@ -45,8 +45,7 @@ picojson::value createMessageFolder(const std::string& id, const std::string& na const std::string& path = "", const std::string& parent_id = ""); -using MessageFolder = picojson::value; -typedef std::vector> FolderPtrVector; +typedef std::vector> FolderPtrVector; FolderPtrVector filterFolders(tizen::AbstractFilterPtr filter, const FolderPtrVector& source_folders); diff --git a/src/messaging/message_service.cc b/src/messaging/message_service.cc index 6f683e6..81055ac 100644 --- a/src/messaging/message_service.cc +++ b/src/messaging/message_service.cc @@ -234,11 +234,11 @@ SyncFolderCallbackData::~SyncFolderCallbackData() { ScopeLogger(); } -void SyncFolderCallbackData::setMessageFolder(std::shared_ptr message_folder) { +void SyncFolderCallbackData::setMessageFolder(std::shared_ptr message_folder) { m_message_folder = message_folder; } -std::shared_ptr SyncFolderCallbackData::getMessageFolder() const { +std::shared_ptr SyncFolderCallbackData::getMessageFolder() const { return m_message_folder; } diff --git a/src/messaging/message_service.h b/src/messaging/message_service.h index ca16baf..df0bee4 100644 --- a/src/messaging/message_service.h +++ b/src/messaging/message_service.h @@ -144,11 +144,11 @@ class SyncFolderCallbackData : public SyncCallbackData { using SyncCallbackData::SyncCallbackData; virtual ~SyncFolderCallbackData(); - void setMessageFolder(std::shared_ptr message_folder); - std::shared_ptr getMessageFolder() const; + void setMessageFolder(std::shared_ptr message_folder); + std::shared_ptr getMessageFolder() const; private: - std::shared_ptr m_message_folder; + std::shared_ptr m_message_folder; }; class MessageService { diff --git a/src/messaging/message_storage_email.cc b/src/messaging/message_storage_email.cc index 47700cc..d875ce3 100644 --- a/src/messaging/message_storage_email.cc +++ b/src/messaging/message_storage_email.cc @@ -219,7 +219,7 @@ static gboolean FindFoldersGlibTask(void* data) { return FALSE; } - std::vector folders; + picojson::array folders; PlatformResult ret = native::EmailGetMailboxList(params->account_id, folders); if (ret.IsError()) { ReportError(ret, &response); diff --git a/src/messaging/messaging_instance.cc b/src/messaging/messaging_instance.cc index 89dd5b8..0a5e057 100644 --- a/src/messaging/messaging_instance.cc +++ b/src/messaging/messaging_instance.cc @@ -345,7 +345,7 @@ void MessagingInstance::MessageServiceSyncFolder(const picojson::value& args, SyncFolderCallbackData* callback = new SyncFolderCallbackData(queue_, callbackId, *this); callback->setAccountId(id); - auto folder_ptr = std::make_shared(v_folder); + auto folder_ptr = std::make_shared(v_folder); callback->setMessageFolder(folder_ptr); callback->setLimit(limit); diff --git a/src/messaging/messaging_native.cc b/src/messaging/messaging_native.cc index 47b7a41..d3cd252 100644 --- a/src/messaging/messaging_native.cc +++ b/src/messaging/messaging_native.cc @@ -72,7 +72,7 @@ PlatformResult EmailGetMailboxList(int account_id, email_mailbox_t** mailboxes, return PlatformResult(); } -PlatformResult EmailGetMailboxList(int account_id, std::vector& folders) { +PlatformResult EmailGetMailboxList(int account_id, picojson::array& folders) { ScopeLogger(); email_mailbox_t* mailboxes = nullptr; int count = 0; @@ -87,15 +87,13 @@ PlatformResult EmailGetMailboxList(int account_id, std::vector& f } for (int i = 0; i < count; ++i) { - MessageFolder folder; - folder = ConvertMailboxToJson(mailboxes[i]); - folders.push_back(folder); + folders.push_back(ConvertMailboxToJson(mailboxes[i])); } return PlatformResult(); } -PlatformResult EmailGetMailboxById(int mailbox_id, MessageFolder& folder) { +PlatformResult EmailGetMailboxById(int mailbox_id, picojson::value& folder) { email_mailbox_t* mailbox = nullptr; int ret = email_get_mailbox_by_mailbox_id(mailbox_id, &mailbox); if (EMAIL_ERROR_NONE != ret) { diff --git a/src/messaging/messaging_native.h b/src/messaging/messaging_native.h index 24b26f4..231f7cc 100644 --- a/src/messaging/messaging_native.h +++ b/src/messaging/messaging_native.h @@ -34,8 +34,8 @@ namespace extension { namespace messaging { namespace native { -common::PlatformResult EmailGetMailboxList(int account_id, std::vector& folders); -common::PlatformResult EmailGetMailboxById(int mailbox_id, MessageFolder& folder); +common::PlatformResult EmailGetMailboxList(int account_id, picojson::array& folders); +common::PlatformResult EmailGetMailboxById(int mailbox_id, picojson::value& folder); } // namespace native } // namespace messaging -- 2.7.4