From: coderhyme <jhyo.kim@samsung.com>
Date: Fri, 12 Jun 2015 07:30:51 +0000 (+0900)
Subject: Remove unnecessary using-declarations from PrimitiveResource
X-Git-Tag: 1.2.0+RC1~1430^2~128
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1914fbbd87f37c143215107e358ad405a906ca37;p=platform%2Fupstream%2Fiotivity.git

Remove unnecessary using-declarations from PrimitiveResource

Change-Id: I204c9972ec1ba42d2e16d070ba1012f3b5b09cb1
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1301
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
---

diff --git a/service/basis/common/primitiveResource/src/PrimitiveResource.cpp b/service/basis/common/primitiveResource/src/PrimitiveResource.cpp
index c63ced6..a66469e 100755
--- a/service/basis/common/primitiveResource/src/PrimitiveResource.cpp
+++ b/service/basis/common/primitiveResource/src/PrimitiveResource.cpp
@@ -26,22 +26,11 @@
 
 #include <OCPlatform.h>
 
-using OC::QueryParamsMap;
-using OC::OCRepresentation;
-using OC::ObserveType;
-
-using std::bind;
-using std::shared_ptr;
-using std::vector;
-using std::string;
-
-using namespace std::placeholders;
-
 namespace
 {
     using namespace OIC::Service;
 
-    ResponseStatement createResponseStatement(const OCRepresentation& ocRepresentation)
+    ResponseStatement createResponseStatement(const OC::OCRepresentation& ocRepresentation)
     {
         return ResponseStatement::create(
                 ResourceAttributesConverter::fromOCRepresentation(ocRepresentation));
@@ -54,6 +43,7 @@ namespace OIC
 {
     namespace Service
     {
+        using namespace std::placeholders;
 
         PrimitiveResource::PrimitiveResource(const BaseResourcePtr& ocResource) :
                 m_ocResource{ ocResource }
@@ -67,18 +57,20 @@ namespace OIC
 
         void PrimitiveResource::requestGet(GetCallback callback)
         {
-            m_ocResource->get(QueryParamsMap(), bind(callback, _1, bind(createResponseStatement, _2), _3));
+            m_ocResource->get(OC::QueryParamsMap(),
+                    std::bind(callback, _1, std::bind(createResponseStatement, _2), _3));
         }
 
         void PrimitiveResource::requestSet(const ResourceAttributes& attrs, SetCallback callback)
         {
-            m_ocResource->put(ResourceAttributesConverter::toOCRepresentation(attrs), QueryParamsMap{},
-                    bind(callback, _1, bind(createResponseStatement, _2), _3));
+            m_ocResource->put(ResourceAttributesConverter::toOCRepresentation(attrs),
+                    OC::QueryParamsMap{},
+                    std::bind(callback, _1, std::bind(createResponseStatement, _2), _3));
         }
 
         void PrimitiveResource::requestObserve(ObserveCallback callback)
         {
-            m_ocResource->observe(ObserveType::ObserveAll, QueryParamsMap{},
+            m_ocResource->observe(OC::ObserveType::ObserveAll, OC::QueryParamsMap{},
                     bind(callback, _1, bind(createResponseStatement, _2), _3, _4));
         }
 
@@ -92,22 +84,22 @@ namespace OIC
             return m_ocResource->isObservable();
         }
 
-        string PrimitiveResource::getUri() const
+        std::string PrimitiveResource::getUri() const
         {
             return m_ocResource->uri();
         }
 
-        string PrimitiveResource::getHost() const
+        std::string PrimitiveResource::getHost() const
         {
             return m_ocResource->host();
         }
 
-        vector< string > PrimitiveResource::getTypes() const
+        std::vector< std::string > PrimitiveResource::getTypes() const
         {
             return m_ocResource->getResourceTypes();
         }
 
-        vector< string > PrimitiveResource::getInterfaces() const
+        std::vector< std::string > PrimitiveResource::getInterfaces() const
         {
             return m_ocResource->getResourceInterfaces();
         }