Fix coding style

Change-Id: Id87e899a07aefcbf2e0b88450088c8fa1bd62968
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/common/appcontrol_manager.cc b/src/common/appcontrol_manager.cc
index 1d39c9c46af99b946b7f8c26fd89a3111b628108..48901ee4536d7ca21af663d1d2c50d822d932790 100644 (file)
--- a/src/common/appcontrol_manager.cc
+++ b/src/common/appcontrol_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "appcontrol_manager.h"
+#include "common/appcontrol_manager.h"
 
 #include <aul.h>
 #include <aul_svc.h>
@@ -11,20 +11,21 @@
 #include "common/utils/logging.h"
 
 namespace capmgr {
-  int AppControlManager::LaunchApplication(const Capability& capability) {
-    int ret;
 
-    bundle* b = bundle_create();
-    aul_svc_set_operation(b, capability.name().c_str());
-
-    ret = aul_launch_app(capability.pkgid().c_str(), b);
-    if (ret < AUL_R_OK) {
-      LOG(ERROR) << "launch failed : " << ret;
-      bundle_free(b);
-      return ret;
-    }
+int AppControlManager::LaunchApplication(const Capability& capability) {
+  int ret;
+  bundle* b = bundle_create();
 
+  aul_svc_set_operation(b, capability.name().c_str());
+  ret = aul_launch_app(capability.pkgid().c_str(), b);
+  if (ret < AUL_R_OK) {
+    LOG(ERROR) << "launch failed : " << ret;
     bundle_free(b);
-    return 0;
+    return ret;
   }
+
+  bundle_free(b);
+  return 0;
+}
+
 }  // namespace capmgr

diff --git a/src/common/capability_manager.cc b/src/common/capability_manager.cc
index e276509087e434e1c6af92e383cc011e915b9fce..daeda95f8f0d9769bddc579db293564996f920be 100644 (file)
--- a/src/common/capability_manager.cc
+++ b/src/common/capability_manager.cc
@@ -9,6 +9,7 @@
 #include <pkgmgr-info.h>
 
 #include <iostream>
+#include <utility>
 
 #include "common/capability.h"
 #include "common/dbus_service.h"
@@ -89,15 +90,15 @@ const std::vector<Capability>& CapabilityManager::GetCapabilities() const {
 void CapabilityManager::GetList(GVariant **params) {
   GVariantBuilder* builder;
 
-  builder = g_variant_builder_new (G_VARIANT_TYPE ("a(sss)"));
+  builder = g_variant_builder_new(G_VARIANT_TYPE("a(sss)"));
   for (const auto& cap : list_) {
-    g_variant_builder_add (builder, "(sss)",
+    g_variant_builder_add(builder, "(sss)",
         cap.name().c_str(),
         cap.pkgid().c_str(),
         cap.appid().c_str());
   }
-  *params = g_variant_new ("a(sss)", builder);
-  g_variant_builder_unref (builder);
+  *params = g_variant_new("a(sss)", builder);
+  g_variant_builder_unref(builder);
 }
 
 bool CapabilityManager::AddCapability(const Capability& capability) {

diff --git a/src/common/connection_manager.h b/src/common/connection_manager.h
index be52a634bda60cab97e06d1cf3fc3622678bd359..825faea6b6170334b7950b648e75b2aae2d1a64d 100644 (file)
--- a/src/common/connection_manager.h
+++ b/src/common/connection_manager.h
@@ -18,8 +18,7 @@ class ConnectionManager {
   virtual void RegisterEndpoint() = 0;
   virtual void ExchangeCapabilities() = 0;
   virtual bool SendCapability(
-                 Capability* cap,
-                 std::function<void(Capability, int)> reply) = 0;
+      Capability* cap, std::function<void(Capability, int)> reply) = 0;
 
  protected:
   CapabilityManager* capmgr_;

diff --git a/src/common/dbus_service.cc b/src/common/dbus_service.cc
index a7cd587b6dd6c0263c7f94eb721875338661d278..d3334d9fa614e93e2ed7d22457a559b9cf61ca67 100644 (file)
--- a/src/common/dbus_service.cc
+++ b/src/common/dbus_service.cc
@@ -72,7 +72,7 @@ void DBusService::RegisterMethodHandler(const std::string& method,
 }
 
 void DBusService::RegisterSendAppcontrolHandler(const std::string& method,
-    std::function<bool(Capability*, std::function<void(Capability, int)>)> handler) {
+    std::function<bool(Capability*, AppControlHandler)> handler) {
   if (method == "SendRemoteAppControl")
     EventHandler().send_app_control_event.connect(handler);
 }
@@ -108,11 +108,10 @@ bool DBusService::HandleSendRemoteAppControl(GVariant* params,
 
   EventHandler().send_app_control_event(&cap,
       [=](Capability cap, int ret) {
-      LOG(INFO) << "RET: " << ret;
-
-      LOG(INFO) << "Success launch: " << cap.name();
-
-      g_dbus_method_invocation_return_value(invocation, g_variant_new("(b)", ret));
+        LOG(INFO) << "RET: " << ret;
+        LOG(INFO) << "Success launch: " << cap.name();
+        g_dbus_method_invocation_return_value(invocation,
+            g_variant_new("(b)", ret));
       });
   return true;
 }
@@ -135,15 +134,12 @@ void DBusService::HandleMethodCall(GDBusConnection* /* connection */,
   LOG(INFO) << "Incomming method call: " << method_name;
   if (g_strcmp0("DiscoverUnownedDevices", method_name) == 0) {
     r = HandleDiscoverUnownedDevices(parameters, invocation);
-  }
-  else if (g_strcmp0("ExchangeCapabilities", method_name) == 0) {
+  } else if (g_strcmp0("ExchangeCapabilities", method_name) == 0) {
     r = HandleExchangeCapabilities(parameters, invocation);
-  }
-  else if (g_strcmp0("GetRemoteCapabilities", method_name) == 0) {
+  } else if (g_strcmp0("GetRemoteCapabilities", method_name) == 0) {
     HandleGetRemoteCapabilities(parameters, invocation);
     return;
-  }
-  else if (g_strcmp0("SendRemoteAppControl", method_name) == 0) {
+  } else if (g_strcmp0("SendRemoteAppControl", method_name) == 0) {
     LOG(INFO) << " method call: " << method_name;
     HandleSendRemoteAppControl(parameters, invocation);
     return;

diff --git a/src/common/dbus_service.h b/src/common/dbus_service.h
index be480900fa3a09a7c0a14750f9fe716cf76badc0..87bc5aa3e750cc809aa67fbc3a88b8c63161959b 100644 (file)
--- a/src/common/dbus_service.h
+++ b/src/common/dbus_service.h
@@ -10,11 +10,15 @@
 
 #include <boost/signals2.hpp>
 
+#include <string>
+
 namespace capmgr {
 
 class Capability;
 
 class DBusService {
+  typedef std::function<void(Capability, int)> AppControlHandler;
+
  public:
   DBusService();
   ~DBusService();
@@ -22,7 +26,7 @@ class DBusService {
   static void RegisterMethodHandler(const std::string& method,
       std::function<void()> handler);
   static void RegisterSendAppcontrolHandler(const std::string& method,
-      std::function<bool(Capability*, std::function<void(Capability, int)>)> handler);
+      std::function<bool(Capability*, AppControlHandler)> handler);
   static void RegisterGetRemoteCapsHandler(const std::string& method,
       std::function<void(GVariant**)> handler);
 
@@ -31,7 +35,8 @@ class DBusService {
    public:
     boost::signals2::signal<void()> on_event;
     boost::signals2::signal<void()> on_event2;
-    boost::signals2::signal<bool(Capability*, std::function<void(Capability, int)>)> send_app_control_event;
+    boost::signals2::signal<bool(Capability*, AppControlHandler)>
+        send_app_control_event;
     boost::signals2::signal<void(GVariant**)> get_remote_caps_event;
   };
 

diff --git a/src/common/iotivity.cc b/src/common/iotivity.cc
index 5938e172c734961a5b7f0866cbd61def978f9839..14529e4240d02cbe76c562047be1d9a314a4d961 100644 (file)
--- a/src/common/iotivity.cc
+++ b/src/common/iotivity.cc
@@ -14,6 +14,7 @@
 #include <functional>
 #include <iostream>
 #include <string>
+#include <vector>
 
 #include "common/capability.h"
 #include "common/capability_manager.h"
@@ -25,7 +26,6 @@ namespace {
 const int kDiscoverTimeoutSec = 5;
 const int kUUIDLength = UUID_LENGTH;
 const char kResourceTypeName[] = "capmgr.capabilities";
-const std::string kResourceInterface = OC::DEFAULT_INTERFACE;
 
 FILE* ServerFopen(const char* /* unused */, const char* mode) {
   return fopen(SVR_DB_PATH, mode);
@@ -107,16 +107,18 @@ void Iotivity::ExchangeCapabilities() {
     GetResource(it.second);
 }
 
-bool Iotivity::SendCapability(Capability* cap, std::function<void(Capability, int)> reply) {
+bool Iotivity::SendCapability(Capability* cap,
+    std::function<void(Capability, int)> reply) {
   PutResource(cap, reply);
   return 0;
 }
 
-void Iotivity::PutResource(Capability* cap, std::function<void(Capability, int)> putCallback) {
-    LOG(INFO) << "Put Resource";
-  for (std::map<OC::OCResourceIdentifier, std::shared_ptr<OC::OCResource>>::iterator it=resource_list_.begin(); it!=resource_list_.end(); ++it) {
+void Iotivity::PutResource(Capability* cap,
+    std::function<void(Capability, int)> putCallback) {
+  LOG(INFO) << "Put Resource";
+  for (const auto& it : resource_list_) {
     std::shared_ptr<OC::OCResource> resource;
-    resource = it->second;
+    resource = it.second;
     OC::OCRepresentation rep;
 
     LOG(INFO) << "Putting.." << resource->uri();
@@ -126,12 +128,11 @@ void Iotivity::PutResource(Capability* cap, std::function<void(Capability, int)>
     OC::QueryParamsMap queryParamsMap;
     OCStackResult res = resource->put(rep, queryParamsMap,
         [=](const OC::HeaderOptions& opts, const OC::OCRepresentation& rep,
-          const int ec) {
-        LOG(INFO) << "From: " << rep.getUri() << " of " << rep.getHost();
-        LOG(INFO) << "PUT RESULT data: " << ec;
-
-        putCallback(dup, ec);
+            const int ec) {
+          LOG(INFO) << "From: " << rep.getUri() << " of " << rep.getHost();
+          LOG(INFO) << "PUT RESULT data: " << ec;
 
+          putCallback(dup, ec);
         });
 
     LOG(INFO) << "res: " << res;
@@ -143,7 +144,7 @@ void Iotivity::RegisterResource() {
   uint8_t property = OC_DISCOVERABLE | OC_OBSERVABLE | OC_SECURE;
 
   OCStackResult result = OC::OCPlatform::registerResource(resource_,
-      uri, kResourceTypeName, kResourceInterface,
+      uri, kResourceTypeName, OC::DEFAULT_INTERFACE,
       std::bind(&Iotivity::EntityCb, this, std::placeholders::_1),
       property);
   if (result != OC_STACK_OK)

diff --git a/src/common/iotivity.h b/src/common/iotivity.h
index 293d45a6c16e39a1ce910bc41e8356e12c79b57b..00e2b7f7458c9e810e1f7f972fdd9b65353e3bb4 100644 (file)
--- a/src/common/iotivity.h
+++ b/src/common/iotivity.h
@@ -14,6 +14,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 
 #include "common/connection_manager.h"
 
@@ -29,12 +30,14 @@ class Iotivity : public ConnectionManager {
   void FindDevices() override;
   void RegisterEndpoint() override;
   void ExchangeCapabilities() override;
-  bool SendCapability(Capability* cap, std::function<void(Capability, int)> reply) override;
+  bool SendCapability(
+      Capability* cap, std::function<void(Capability, int)> reply) override;
 
  private:
   void RegisterResource();
   void FindResource(const std::string& addr);
-  void PutResource(Capability* cap, std::function<void(Capability, int)> putCallback);
+  void PutResource(
+      Capability* cap, std::function<void(Capability, int)> putCallback);
   void DiscoverUnownedDevices();
   void OwnershipTransfer();
   void GetResource(std::shared_ptr<OC::OCResource> resource);

diff --git a/src/common/package_event_listener.cc b/src/common/package_event_listener.cc
index 198ae300d74fd4ddae8dfadb697bb7ff9ee9fbf9..74b1ce6fc331ab511c1772af0841f96fc0c77572 100644 (file)
--- a/src/common/package_event_listener.cc
+++ b/src/common/package_event_listener.cc
@@ -4,10 +4,10 @@
 
 #include "common/package_event_listener.h"
 
-#include <boost/signals2.hpp>
-
 #include <package-manager.h>
 
+#include <boost/signals2.hpp>
+
 #include <cstring>
 #include <functional>
 #include <map>

diff --git a/src/common/sqlite_connection.cc b/src/common/sqlite_connection.cc
index 246259543ede987814e6c45328409090643bb01e..c7b7ba9cecf9df04d5b4da9e5fc9c26d6631f2f1 100644 (file)
--- a/src/common/sqlite_connection.cc
+++ b/src/common/sqlite_connection.cc
@@ -7,6 +7,7 @@
 #include <sqlite3.h>
 
 #include <string>
+#include <utility>
 
 #include "common/sqlite_statement.h"
 #include "common/utils/logging.h"