[messaging] Adjusting code to match our coding standard.

+ export message folder attributes constants
+ change CAPITAL_CASE to kCamelCase constants names format
+ reorder initialization of message folder attributes in createMessageFolder() to match
arguments order,
+ use named attribute constant instead of string literal

[Verification] code compiles.

Signed-off-by: Michal Michalski <m.michalski2@partner.samsung.com>
Change-Id: I52dcb4659d28cd952f8c823d100183c819fda93d

diff --git a/src/messaging/email_manager.cc b/src/messaging/email_manager.cc
index 52ec4e0..d7c43a6 100644 (file)
--- a/src/messaging/email_manager.cc
+++ b/src/messaging/email_manager.cc
@@ -729,7 +729,8 @@ void EmailManager::syncFolder(SyncFolderCallbackData* callback) {
 
   email_mailbox_t* mailbox = NULL;
 
-  const std::string folder_id_str = callback->getMessageFolder()->get("id").get<std::string>();
+  const std::string folder_id_str =
+      callback->getMessageFolder()->get(kMessageFolderId).get<std::string>();
   int folder_id = 0;
   std::istringstream(folder_id_str) >> folder_id;
 

diff --git a/src/messaging/message_folder.cc b/src/messaging/message_folder.cc
index 5ede30f..7e6dc2d 100644 (file)
--- a/src/messaging/message_folder.cc
+++ b/src/messaging/message_folder.cc
@@ -27,14 +27,14 @@ const char* MessageFolderTypeStr[] = {
     "INBOX", "OUTBOX", "DRAFTS", "SENTBOX",
 };
 
-const char* MESSAGE_FOLDER_ATTRIBUTE_ID = "id";
-const char* MESSAGE_FOLDER_ATTRIBUTE_PARENT_ID = "parentId";
-const char* MESSAGE_FOLDER_ATTRIBUTE_SERVICE_ID = "serviceId";
-const char* MESSAGE_FOLDER_ATTRIBUTE_CONTENT_TYPE = "contentType";
-const char* MESSAGE_FOLDER_ATTRIBUTE_NAME = "name";
-const char* MESSAGE_FOLDER_ATTRIBUTE_PATH = "path";
-const char* MESSAGE_FOLDER_ATTRIBUTE_TYPE = "type";
-const char* MESSAGE_FOLDER_ATTRIBUTE_SYNCHRONIZABLE = "synchronizable";
+const char* kMessageFolderContentType = "contentType";
+const char* kMessageFolderId = "id";
+const char* kMessageFolderName = "name";
+const char* kMessageFolderParentId = "parentId";
+const char* kMessageFolderPath = "path";
+const char* kMessageFolderServiceId = "serviceId";
+const char* kMessageFolderSynchronizable = "synchronizable";
+const char* kMessageFolderType = "type";
 
 picojson::value createMessageFolder(const std::string& id, const std::string& name,
                                     const std::string& service_id, const std::string& content_type,
@@ -42,14 +42,14 @@ picojson::value createMessageFolder(const std::string& id, const std::string& na
                                     const std::string& path, const std::string& parent_id) {
   auto json = picojson::value(picojson::object());
   auto& folder = json.get<picojson::object>();
-  folder[MESSAGE_FOLDER_ATTRIBUTE_ID] = picojson::value(id);
-  folder[MESSAGE_FOLDER_ATTRIBUTE_PARENT_ID] = picojson::value(parent_id);
-  folder[MESSAGE_FOLDER_ATTRIBUTE_SERVICE_ID] = picojson::value(service_id);
-  folder[MESSAGE_FOLDER_ATTRIBUTE_CONTENT_TYPE] = picojson::value(content_type);
-  folder[MESSAGE_FOLDER_ATTRIBUTE_NAME] = picojson::value(name);
-  folder[MESSAGE_FOLDER_ATTRIBUTE_PATH] = picojson::value(path);
-  folder[MESSAGE_FOLDER_ATTRIBUTE_TYPE] = picojson::value(type);
-  folder[MESSAGE_FOLDER_ATTRIBUTE_SYNCHRONIZABLE] = picojson::value(synchronizable);
+  folder[kMessageFolderId] = picojson::value(id);
+  folder[kMessageFolderName] = picojson::value(name);
+  folder[kMessageFolderServiceId] = picojson::value(service_id);
+  folder[kMessageFolderContentType] = picojson::value(content_type);
+  folder[kMessageFolderType] = picojson::value(type);
+  folder[kMessageFolderSynchronizable] = picojson::value(synchronizable);
+  folder[kMessageFolderPath] = picojson::value(path);
+  folder[kMessageFolderParentId] = picojson::value(parent_id);
   return json;
 }
 
@@ -65,13 +65,13 @@ FolderPtrVector filterFolders(tizen::AbstractFilterPtr filter,
   for (const auto& fp : source_folders) {
     if (filter->isMatching(*fp)) {
       LoggerD("folder id: %s, folder name: %s, match: yes",
-              fp->get(MESSAGE_FOLDER_ATTRIBUTE_ID).get<std::string>().c_str(),
-              fp->get(MESSAGE_FOLDER_ATTRIBUTE_NAME).get<std::string>().c_str());
+              fp->get(kMessageFolderId).get<std::string>().c_str(),
+              fp->get(kMessageFolderName).get<std::string>().c_str());
       filtered_folders.push_back(fp);
     } else {
       LoggerD("folder id: %s, folder name: %s, match: no",
-              fp->get(MESSAGE_FOLDER_ATTRIBUTE_ID).get<std::string>().c_str(),
-              fp->get(MESSAGE_FOLDER_ATTRIBUTE_NAME).get<std::string>().c_str());
+              fp->get(kMessageFolderId).get<std::string>().c_str(),
+              fp->get(kMessageFolderName).get<std::string>().c_str());
     }
   }
 

diff --git a/src/messaging/message_folder.h b/src/messaging/message_folder.h
index 5daea21..39f5365 100644 (file)
--- a/src/messaging/message_folder.h
+++ b/src/messaging/message_folder.h
@@ -45,6 +45,15 @@ picojson::value createMessageFolder(const std::string& id, const std::string& na
                                     const std::string& path = "",
                                     const std::string& parent_id = "");
 
+extern const char* kMessageFolderId;
+extern const char* kMessageFolderParentId;
+extern const char* kMessageFolderServiceId;
+extern const char* kMessageFolderContentType;
+extern const char* kMessageFolderName;
+extern const char* kMessageFolderPath;
+extern const char* kMessageFolderType;
+extern const char* kMessageFolderSynchronizable;
+
 typedef std::vector<std::shared_ptr<picojson::value>> FolderPtrVector;
 FolderPtrVector filterFolders(tizen::AbstractFilterPtr filter,
                               const FolderPtrVector& source_folders);

diff --git a/src/messaging/message_storage_short_msg.cc b/src/messaging/message_storage_short_msg.cc
index 3f87db2..d27b3d1 100644 (file)
--- a/src/messaging/message_storage_short_msg.cc
+++ b/src/messaging/message_storage_short_msg.cc
@@ -212,9 +212,9 @@ static gboolean findFoldersCB(void* data) {
   for (std::string type : MessageFolderTypeStr) {
     auto id = std::to_string(array.size() + 1);
     auto service_id = std::to_string(params->account_id);
-    auto json = createMessageFolder(id, type, service_id, params->message_type, type);
-    if (params->filter->isMatching(json)) {
-      array.push_back(json);
+    auto jsonFolder = createMessageFolder(id, type, service_id, params->message_type, type);
+    if (params->filter->isMatching(jsonFolder)) {
+      array.push_back(jsonFolder);
     }
   }