From 8f561b06b8f0a4c805fae8d9d7f4d24dfd5dcbbd Mon Sep 17 00:00:00 2001 From: Adam Banasiak Date: Mon, 15 Dec 2014 07:35:00 +0100 Subject: [PATCH] [Contact] Unify functions signatures Change-Id: I4b7e4f608cdc816a0fe22c212261219b9028a10f Signed-off-by: Adam Banasiak --- src/contact/addressbook.cc | 8 ++--- src/contact/addressbook.h | 8 ++--- src/contact/contact_instance.cc | 57 +++++++++++++++++++++++---------- src/contact/contact_manager.cc | 4 +-- src/contact/contact_manager.h | 4 +-- src/contact/person.cc | 4 +-- src/contact/person.h | 4 +-- 7 files changed, 56 insertions(+), 33 deletions(-) diff --git a/src/contact/addressbook.cc b/src/contact/addressbook.cc index b3191ac6..8d51bc56 100644 --- 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(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(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(args, "id")); diff --git a/src/contact/addressbook.h b/src/contact/addressbook.h index 84833244..d271e58c 100644 --- 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 b5279a12..57fa7994 100644 --- 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(args), val); + AddressBook::AddressBook_get(common::JsonCast(args), + val.get()); ReportSuccess(val, out); } void ContactInstance::AddressBook_add(const JsonValue& args, JsonObject& out) { JsonValue val{JsonObject{}}; - AddressBook::AddressBook_add(common::JsonCast(args), val); + AddressBook::AddressBook_add(common::JsonCast(args), + val.get()); ReportSuccess(val, out); } void ContactInstance::AddressBook_update(const JsonValue& args, JsonObject& out) { JsonValue val{JsonObject{}}; - AddressBook::AddressBook_update(common::JsonCast(args), val); + AddressBook::AddressBook_update(common::JsonCast(args), + val.get()); ReportSuccess(val, out); } void ContactInstance::AddressBook_remove(const JsonValue& args, JsonObject& out) { - AddressBook::AddressBook_remove(common::JsonCast(args)); + JsonValue val{JsonObject{}}; + AddressBook::AddressBook_remove(common::JsonCast(args), + val.get()); ReportSuccess(out); } void ContactInstance::AddressBook_find(const JsonValue& args, JsonObject& out) { - AddressBook::AddressBook_find(common::JsonCast(args)); + JsonValue val{JsonObject{}}; + AddressBook::AddressBook_find(common::JsonCast(args), + val.get()); ReportSuccess(out); } void ContactInstance::AddressBook_addGroup(const JsonValue& args, JsonObject& out) { JsonValue val{JsonObject{}}; - AddressBook::AddressBook_addGroup(common::JsonCast(args), val); + AddressBook::AddressBook_addGroup(common::JsonCast(args), + val.get()); ReportSuccess(val, out); } void ContactInstance::AddressBook_getGroup(const JsonValue& args, JsonObject& out) { JsonValue val{JsonObject{}}; - AddressBook::AddressBook_getGroup(common::JsonCast(args), val); + AddressBook::AddressBook_getGroup(common::JsonCast(args), + val.get()); ReportSuccess(val, out); } void ContactInstance::AddressBook_updateGroup(const JsonValue& args, JsonObject& out) { - AddressBook::AddressBook_updateGroup(common::JsonCast(args)); + JsonValue val{JsonObject{}}; + AddressBook::AddressBook_updateGroup(common::JsonCast(args), + val.get()); ReportSuccess(out); } void ContactInstance::AddressBook_removeGroup(const JsonValue& args, JsonObject& out) { - AddressBook::AddressBook_removeGroup(common::JsonCast(args)); + JsonValue val{JsonObject{}}; + AddressBook::AddressBook_removeGroup(common::JsonCast(args), + val.get()); ReportSuccess(out); } void ContactInstance::AddressBook_getGroups(const JsonValue& args, JsonObject& out) { JsonValue val{JsonObject{}}; - AddressBook::AddressBook_getGroups(common::JsonCast(args), val); + AddressBook::AddressBook_getGroups(common::JsonCast(args), + val.get()); ReportSuccess(val, out); } @@ -124,20 +138,23 @@ void ContactInstance::ContactManager_getAddressBook(const JsonValue& args, JsonObject& out) { JsonValue val{JsonObject{}}; ContactManager::ContactManager_getAddressBook( - common::JsonCast(args), val); + common::JsonCast(args), val.get()); ReportSuccess(val, out); } void ContactInstance::ContactManager_get(const JsonValue& args, JsonObject& out) { JsonValue val{JsonObject{}}; - ContactManager::ContactManager_get(common::JsonCast(args), val); + ContactManager::ContactManager_get(common::JsonCast(args), + val.get()); ReportSuccess(val, out); } void ContactInstance::ContactManager_update(const JsonValue& args, JsonObject& out) { - ContactManager::ContactManager_update(common::JsonCast(args)); + JsonValue val{JsonObject{}}; + ContactManager::ContactManager_update(common::JsonCast(args), + val.get()); 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(args)); + JsonValue val{JsonObject{}}; + ContactManager::ContactManager_remove(common::JsonCast(args), + val.get()); ReportSuccess(out); } @@ -166,17 +185,21 @@ void ContactInstance::ContactManager_importFromVCard(const JsonValue& args, JsonObject& out) { JsonValue val{JsonObject{}}; ContactManager::ContactManager_importFromVCard( - common::JsonCast(args), val); + common::JsonCast(args), val.get()); ReportSuccess(val, out); } void ContactInstance::Person_link(const JsonValue& args, JsonObject& out) { - Person::Person_link(common::JsonCast(args)); + JsonValue val{JsonObject{}}; + Person::Person_link(common::JsonCast(args), + val.get()); ReportSuccess(out); } void ContactInstance::Person_unlink(const JsonValue& args, JsonObject& out) { - Person::Person_unlink(common::JsonCast(args)); + JsonValue val{JsonObject{}}; + Person::Person_unlink(common::JsonCast(args), + val.get()); ReportSuccess(out); } diff --git a/src/contact/contact_manager.cc b/src/contact/contact_manager.cc index 697abb4a..283bada5 100644 --- 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(args, "person"); long person_id = common::stol(FromJson(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(args, "personId")); diff --git a/src/contact/contact_manager.h b/src/contact/contact_manager.h index 00a32e35..9434dd4e 100644 --- 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 6399decf..5b21f0b9 100644 --- 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(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(args, "id")); diff --git a/src/contact/person.h b/src/contact/person.h index 661b8f83..2f8c9660 100644 --- a/src/contact/person.h +++ b/src/contact/person.h @@ -41,8 +41,8 @@ typedef std::map 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 -- 2.34.1