From 9e7ad557894537aca6097c1c9840608b39a59187 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Tue, 14 Mar 2017 21:46:16 +0900 Subject: [PATCH] Rename a pamareter to be consistant through the APIs Change-Id: I5338edc46a0f2bbde50badb1cb2e1ab51a6a6f80 Signed-off-by: Mu-Woong Lee --- include/ContextStore.h | 2 +- src/client-dummy/ContextStore.cpp | 2 +- src/client/ContextStore.cpp | 2 +- src/client/PlatformManagedStore.cpp | 4 ++-- src/client/PlatformManagedStore.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/ContextStore.h b/include/ContextStore.h index 214c988..cf6c098 100644 --- a/include/ContextStore.h +++ b/include/ContextStore.h @@ -30,7 +30,7 @@ namespace ctx { virtual int insert(const std::string& columns, Tuple* record); virtual int insert(const std::string& columns, std::vector& records); - virtual int retrieve(const ContextStoreSearchQuery& query, std::vector& result); + virtual int retrieve(const ContextStoreSearchQuery& query, std::vector& records); virtual int remove(const std::string& selection); protected: diff --git a/src/client-dummy/ContextStore.cpp b/src/client-dummy/ContextStore.cpp index 3ac2af0..3f14d37 100644 --- a/src/client-dummy/ContextStore.cpp +++ b/src/client-dummy/ContextStore.cpp @@ -37,7 +37,7 @@ int ContextStore::insert(const std::string& columns, std::vector& record return E_SUPPORT; } -int ContextStore::retrieve(const ContextStoreSearchQuery& query, std::vector& result) +int ContextStore::retrieve(const ContextStoreSearchQuery& query, std::vector& records) { return E_SUPPORT; } diff --git a/src/client/ContextStore.cpp b/src/client/ContextStore.cpp index 3ac2af0..3f14d37 100644 --- a/src/client/ContextStore.cpp +++ b/src/client/ContextStore.cpp @@ -37,7 +37,7 @@ int ContextStore::insert(const std::string& columns, std::vector& record return E_SUPPORT; } -int ContextStore::retrieve(const ContextStoreSearchQuery& query, std::vector& result) +int ContextStore::retrieve(const ContextStoreSearchQuery& query, std::vector& records) { return E_SUPPORT; } diff --git a/src/client/PlatformManagedStore.cpp b/src/client/PlatformManagedStore.cpp index ed913af..57f41c4 100644 --- a/src/client/PlatformManagedStore.cpp +++ b/src/client/PlatformManagedStore.cpp @@ -59,7 +59,7 @@ int PlatformManagedStore::insert(const std::string& columns, std::vector return __proxy->call(METHOD_INSERT, param); } -int PlatformManagedStore::retrieve(const ContextStoreSearchQuery& query, std::vector& result) +int PlatformManagedStore::retrieve(const ContextStoreSearchQuery& query, std::vector& records) { IF_FAIL_RETURN(query.valid(), E_PARAM); @@ -74,7 +74,7 @@ int PlatformManagedStore::retrieve(const ContextStoreSearchQuery& query, std::ve GVariant* vals = NULL; g_variant_get(outParam, "(v)", &vals); - result = Tuple::buildFrom(vals); + records = Tuple::buildFrom(vals); return E_NONE; } diff --git a/src/client/PlatformManagedStore.h b/src/client/PlatformManagedStore.h index c5d0786..77c3d38 100644 --- a/src/client/PlatformManagedStore.h +++ b/src/client/PlatformManagedStore.h @@ -34,7 +34,7 @@ namespace ctx { int insert(const std::string& columns, Tuple* record); int insert(const std::string& columns, std::vector& records); - int retrieve(const ContextStoreSearchQuery& query, std::vector& result); + int retrieve(const ContextStoreSearchQuery& query, std::vector& records); int remove(const std::string& selection); private: -- 2.7.4