[Contact] Unify functions signatures

Change-Id: I4b7e4f608cdc816a0fe22c212261219b9028a10f
Signed-off-by: Adam Banasiak <a.banasiak@samsung.com>

diff --git a/src/contact/addressbook.cc b/src/contact/addressbook.cc
index b3191ac60f9df6032461dbf7d6745348117abbc4..8d51bc56fed4e2e36e7fe9f80f8c92fa27152945 100644 (file)
--- a/src/contact/addressbook.cc
+++ b/src/contact/addressbook.cc
@@ -162,7 +162,7 @@ void AddressBook_update(const JsonObject& args, JsonObject& out) {
   ContactUtil::UpdateAdditionalInformation(contacts_record_ptr, &out);
 }
 
-void AddressBook_remove(const JsonObject& args) {
+void AddressBook_remove(const JsonObject& args, JsonObject&) {
   ContactUtil::CheckDBConnection();
 
   long contact_id = common::stol(FromJson<JsonString>(args, "id"));
@@ -195,7 +195,7 @@ void AddressBook_batchFunc(/*NativeFunction impl, */const char* single_arg_name,
   throw common::NotFoundException("Not implemented");
 }
 
-void AddressBook_find(const JsonObject& args) {
+void AddressBook_find(const JsonObject& args, JsonObject&) {
   ContactUtil::CheckDBConnection();
 
   // @todo implement
@@ -268,7 +268,7 @@ void AddressBook_getGroup(const JsonObject& args, JsonObject& out) {
   ContactUtil::ImportContactGroupFromContactsRecord(contacts_record, &out);
 }
 
-void AddressBook_updateGroup(const JsonObject& args) {
+void AddressBook_updateGroup(const JsonObject& args, JsonObject&) {
   ContactUtil::CheckDBConnection();
 
   const JsonObject& group = FromJson<JsonObject>(args, "group");
@@ -322,7 +322,7 @@ void AddressBook_updateGroup(const JsonObject& args) {
   ContactUtil::ErrorChecker(err, "Problem during db_update_record");
 }
 
-void AddressBook_removeGroup(const JsonObject& args) {
+void AddressBook_removeGroup(const JsonObject& args, JsonObject&) {
   ContactUtil::CheckDBConnection();
 
   long id = common::stol(FromJson<JsonString>(args, "id"));

diff --git a/src/contact/addressbook.h b/src/contact/addressbook.h
index 8483324426b01a210b34968b98c7dc1bdd62e225..d271e58c2c23c46be2143f65405a1500bddb28f6 100644 (file)
--- a/src/contact/addressbook.h
+++ b/src/contact/addressbook.h
@@ -27,12 +27,12 @@ namespace AddressBook {
 void AddressBook_get(const JsonObject& args, JsonObject& out);
 void AddressBook_add(const JsonObject& args, JsonObject& out);
 void AddressBook_update(const JsonObject& args, JsonObject& out);
-void AddressBook_remove(const JsonObject& args);
-void AddressBook_find(const JsonObject& args);
+void AddressBook_remove(const JsonObject& args, JsonObject&);
+void AddressBook_find(const JsonObject& args, JsonObject&);
 void AddressBook_addGroup(const JsonObject& args, JsonObject& out);
 void AddressBook_getGroup(const JsonObject& args, JsonObject& out);
-void AddressBook_updateGroup(const JsonObject& args);
-void AddressBook_removeGroup(const JsonObject& args);
+void AddressBook_updateGroup(const JsonObject& args, JsonObject&);
+void AddressBook_removeGroup(const JsonObject& args, JsonObject&);
 void AddressBook_getGroups(const JsonObject& args, JsonObject& out);
 void AddressBook_startListening(int* current_state, const JsonObject& args,
                                 JsonObject& out);

diff --git a/src/contact/contact_instance.cc b/src/contact/contact_instance.cc
index b5279a12e11b286830e657560e10c54b70ae212e..57fa7994a548b7b0df1eeca8cd9b6e964e8d6209 100644 (file)
--- a/src/contact/contact_instance.cc
+++ b/src/contact/contact_instance.cc
@@ -54,64 +54,78 @@ ContactInstance::~ContactInstance() {}
 
 void ContactInstance::AddressBook_get(const JsonValue& args, JsonObject& out) {
   JsonValue val{JsonObject{}};
-  AddressBook::AddressBook_get(common::JsonCast<JsonObject>(args), val);
+  AddressBook::AddressBook_get(common::JsonCast<JsonObject>(args),
+                               val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
 void ContactInstance::AddressBook_add(const JsonValue& args, JsonObject& out) {
   JsonValue val{JsonObject{}};
-  AddressBook::AddressBook_add(common::JsonCast<JsonObject>(args), val);
+  AddressBook::AddressBook_add(common::JsonCast<JsonObject>(args),
+                               val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
 void ContactInstance::AddressBook_update(const JsonValue& args,
                                          JsonObject& out) {
   JsonValue val{JsonObject{}};
-  AddressBook::AddressBook_update(common::JsonCast<JsonObject>(args), val);
+  AddressBook::AddressBook_update(common::JsonCast<JsonObject>(args),
+                                  val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
 void ContactInstance::AddressBook_remove(const JsonValue& args,
                                          JsonObject& out) {
-  AddressBook::AddressBook_remove(common::JsonCast<JsonObject>(args));
+  JsonValue val{JsonObject{}};
+  AddressBook::AddressBook_remove(common::JsonCast<JsonObject>(args),
+                                  val.get<JsonObject>());
   ReportSuccess(out);
 }
 
 void ContactInstance::AddressBook_find(const JsonValue& args, JsonObject& out) {
-  AddressBook::AddressBook_find(common::JsonCast<JsonObject>(args));
+  JsonValue val{JsonObject{}};
+  AddressBook::AddressBook_find(common::JsonCast<JsonObject>(args),
+                                val.get<JsonObject>());
   ReportSuccess(out);
 }
 
 void ContactInstance::AddressBook_addGroup(const JsonValue& args,
                                            JsonObject& out) {
   JsonValue val{JsonObject{}};
-  AddressBook::AddressBook_addGroup(common::JsonCast<JsonObject>(args), val);
+  AddressBook::AddressBook_addGroup(common::JsonCast<JsonObject>(args),
+                                    val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
 void ContactInstance::AddressBook_getGroup(const JsonValue& args,
                                            JsonObject& out) {
   JsonValue val{JsonObject{}};
-  AddressBook::AddressBook_getGroup(common::JsonCast<JsonObject>(args), val);
+  AddressBook::AddressBook_getGroup(common::JsonCast<JsonObject>(args),
+                                    val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
 void ContactInstance::AddressBook_updateGroup(const JsonValue& args,
                                               JsonObject& out) {
-  AddressBook::AddressBook_updateGroup(common::JsonCast<JsonObject>(args));
+  JsonValue val{JsonObject{}};
+  AddressBook::AddressBook_updateGroup(common::JsonCast<JsonObject>(args),
+                                       val.get<JsonObject>());
   ReportSuccess(out);
 }
 
 void ContactInstance::AddressBook_removeGroup(const JsonValue& args,
                                               JsonObject& out) {
-  AddressBook::AddressBook_removeGroup(common::JsonCast<JsonObject>(args));
+  JsonValue val{JsonObject{}};
+  AddressBook::AddressBook_removeGroup(common::JsonCast<JsonObject>(args),
+                                       val.get<JsonObject>());
   ReportSuccess(out);
 }
 
 void ContactInstance::AddressBook_getGroups(const JsonValue& args,
                                             JsonObject& out) {
   JsonValue val{JsonObject{}};
-  AddressBook::AddressBook_getGroups(common::JsonCast<JsonObject>(args), val);
+  AddressBook::AddressBook_getGroups(common::JsonCast<JsonObject>(args),
+                                     val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
@@ -124,20 +138,23 @@ void ContactInstance::ContactManager_getAddressBook(const JsonValue& args,
                                                     JsonObject& out) {
   JsonValue val{JsonObject{}};
   ContactManager::ContactManager_getAddressBook(
-      common::JsonCast<JsonObject>(args), val);
+      common::JsonCast<JsonObject>(args), val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
 void ContactInstance::ContactManager_get(const JsonValue& args,
                                          JsonObject& out) {
   JsonValue val{JsonObject{}};
-  ContactManager::ContactManager_get(common::JsonCast<JsonObject>(args), val);
+  ContactManager::ContactManager_get(common::JsonCast<JsonObject>(args),
+                                     val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
 void ContactInstance::ContactManager_update(const JsonValue& args,
                                             JsonObject& out) {
-  ContactManager::ContactManager_update(common::JsonCast<JsonObject>(args));
+  JsonValue val{JsonObject{}};
+  ContactManager::ContactManager_update(common::JsonCast<JsonObject>(args),
+                                        val.get<JsonObject>());
   ReportSuccess(out);
 }
 
@@ -148,7 +165,9 @@ void ContactInstance::ContactManager_updateBatch(const JsonValue& args,
 
 void ContactInstance::ContactManager_remove(const JsonValue& args,
                                             JsonObject& out) {
-  ContactManager::ContactManager_remove(common::JsonCast<JsonObject>(args));
+  JsonValue val{JsonObject{}};
+  ContactManager::ContactManager_remove(common::JsonCast<JsonObject>(args),
+                                        val.get<JsonObject>());
   ReportSuccess(out);
 }
 
@@ -166,17 +185,21 @@ void ContactInstance::ContactManager_importFromVCard(const JsonValue& args,
                                                      JsonObject& out) {
   JsonValue val{JsonObject{}};
   ContactManager::ContactManager_importFromVCard(
-      common::JsonCast<JsonObject>(args), val);
+      common::JsonCast<JsonObject>(args), val.get<JsonObject>());
   ReportSuccess(val, out);
 }
 
 void ContactInstance::Person_link(const JsonValue& args, JsonObject& out) {
-  Person::Person_link(common::JsonCast<JsonObject>(args));
+  JsonValue val{JsonObject{}};
+  Person::Person_link(common::JsonCast<JsonObject>(args),
+                      val.get<JsonObject>());
   ReportSuccess(out);
 }
 
 void ContactInstance::Person_unlink(const JsonValue& args, JsonObject& out) {
-  Person::Person_unlink(common::JsonCast<JsonObject>(args));
+  JsonValue val{JsonObject{}};
+  Person::Person_unlink(common::JsonCast<JsonObject>(args),
+                        val.get<JsonObject>());
   ReportSuccess(out);
 }
 

diff --git a/src/contact/contact_manager.cc b/src/contact/contact_manager.cc
index 697abb4ac7680f879838ba115b7b7a84e09e2104..283bada56dee694c72cea443f3be72263ef0b11e 100644 (file)
--- a/src/contact/contact_manager.cc
+++ b/src/contact/contact_manager.cc
@@ -107,7 +107,7 @@ void ContactManager_get(const JsonObject& args, JsonObject& out) {
   ContactManager_get_internal(person_id, &out);
 }
 
-void ContactManager_update(const JsonObject& args) {
+void ContactManager_update(const JsonObject& args, JsonObject&) {
   ContactUtil::CheckDBConnection();
   const JsonObject& person = FromJson<JsonObject>(args, "person");
   long person_id = common::stol(FromJson<JsonString>(person, "id"));
@@ -136,7 +136,7 @@ void ContactManager_update(const JsonObject& args) {
   }
 }
 
-void ContactManager_remove(const JsonObject& args) {
+void ContactManager_remove(const JsonObject& args, JsonObject&) {
   ContactUtil::CheckDBConnection();
   long person_id = common::stol(FromJson<JsonString>(args, "personId"));
 

diff --git a/src/contact/contact_manager.h b/src/contact/contact_manager.h
index 00a32e35880d9ce999ed5dc5a4d158dd569c72d4..9434dd4e9d18eaad86b01f551c504d9b1baee737 100644 (file)
--- a/src/contact/contact_manager.h
+++ b/src/contact/contact_manager.h
@@ -31,12 +31,12 @@ void ContactManager_getAddressBook(const JsonObject& args, JsonObject& out);
 
 void ContactManager_get(const JsonObject& args, JsonObject& out);
 
-void ContactManager_update(const JsonObject& args);
+void ContactManager_update(const JsonObject& args, JsonObject&);
 
 void ContactManager_updateBatch(const JsonObject& /*args*/,
                                 JsonObject& /*out*/);
 
-void ContactManager_remove(const JsonObject& args);
+void ContactManager_remove(const JsonObject& args, JsonObject&);
 
 void ContactManager_removeBatch(const JsonObject& /*args*/,
                                 JsonObject& /*out*/);

diff --git a/src/contact/person.cc b/src/contact/person.cc
index 6399decf38af77f20b66005684e9dd03571b5b36..5b21f0b9f28c15c94d7ac59f6b4b2f480b1ba829 100644 (file)
--- a/src/contact/person.cc
+++ b/src/contact/person.cc
@@ -37,7 +37,7 @@ static const PersonPropertyMap personPropertyMap = {
     {"displayContactId",        { _contacts_person.display_contact_id,  kPrimitiveTypeId } },
 };
 
-void Person_link(const JsonObject& args) {
+void Person_link(const JsonObject& args, JsonObject&) {
   ContactUtil::CheckDBConnection();
 
   long id = common::stol(FromJson<JsonString>(args, "id"));
@@ -59,7 +59,7 @@ void Person_link(const JsonObject& args) {
   ContactUtil::ErrorChecker(err, "Error during executing person link()");
 }
 
-void Person_unlink(const JsonObject& args) {
+void Person_unlink(const JsonObject& args, JsonObject&) {
   ContactUtil::CheckDBConnection();
 
   long contact_id = common::stol(FromJson<JsonString>(args, "id"));

diff --git a/src/contact/person.h b/src/contact/person.h
index 661b8f83b17d242e16da0aba7a69a3730afddd5e..2f8c96605e026a7c1605bb8e97c92f9c3626753b 100644 (file)
--- a/src/contact/person.h
+++ b/src/contact/person.h
@@ -41,8 +41,8 @@ typedef std::map<std::string, PersonProperty> PersonPropertyMap;
 
 const PersonProperty& PersonProperty_fromString(const std::string& name);
 
-void Person_link(const JsonObject& args);
-void Person_unlink(const JsonObject& args);
+void Person_link(const JsonObject& args, JsonObject&);
+void Person_unlink(const JsonObject& args, JsonObject&);
 
 }  // Person
 }  // contact