tizen 2.4 release

[framework/web/wrt-commons.git] / modules / dbus / include / dpl / dbus / dbus_client.h

diff --git a/modules_wearable/dbus/include/dpl/dbus/dbus_client.h b/modules/dbus/include/dpl/dbus/dbus_client.h
similarity index 93%
rename from modules_wearable/dbus/include/dpl/dbus/dbus_client.h
rename to modules/dbus/include/dpl/dbus/dbus_client.h
index 061ec46..0661e9a 100644 (file)
--- a/modules_wearable/dbus/include/dpl/dbus/dbus_client.h
+++ b/modules/dbus/include/dpl/dbus/dbus_client.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <dbus/dbus.h>
 #include <dpl/exception.h>
-#include <dpl/log/log.h>
+#include <dpl/log/wrt_log.h>
 #include <dpl/dbus/dbus_serialization.h>
 #include <dpl/dbus/dbus_deserialization.h>
 
@@ -77,7 +77,7 @@ class Client
         dbus_error_init(&error);
         m_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
         if (NULL == m_connection) {
-            LogPedantic("Couldn't get DBUS connection. Error: " <<
+            WrtLogD("Couldn't get DBUS connection. Error: %s",
                         error.message);
             dbus_error_free(&error);
             ThrowMsg(Exception::DBusClientException,
@@ -123,7 +123,7 @@ class Client
                 -1,
                 &error);
         if (NULL == ret) {
-            LogPedantic("Error sending DBUS message: " <<
+            WrtLogD("Error sending DBUS message: %s",
                         error.message);
             dbus_error_free(&error);
             ThrowMsg(Exception::DBusClientException,
@@ -138,7 +138,7 @@ class Client
         if (ret != NULL) {
             dbus_message_unref(ret);
         } else {
-            LogPedantic("Error getting DBUS response.");
+            WrtLogD("Error getting DBUS response.");
             ThrowMsg(Exception::DBusClientException,
                      "Error getting DBUS response.");
         }
@@ -152,7 +152,7 @@ class Client
         const Args& ... args)
     {
         if (!Serialization::serialize(argsIterator, invalue)) {
-            LogPedantic("Error in serialization.");
+            WrtLogD("Error in serialization.");
             ThrowMsg(Exception::DBusClientException,
                      "Error in serialization.");
         }
@@ -167,7 +167,7 @@ class Client
         const Args& ... args)
     {
         if (!Serialization::serialize(argsIterator, invalue)) {
-            LogPedantic("Error in serialization.");
+            WrtLogD("Error in serialization.");
             ThrowMsg(Exception::DBusClientException,
                      "Error in serialization.");
         }
@@ -181,7 +181,7 @@ class Client
         const T* invalue)
     {
         if (!Serialization::serialize(argsIterator, invalue)) {
-            LogPedantic("Error in serialization.");
+            WrtLogD("Error in serialization.");
             ThrowMsg(Exception::DBusClientException,
                      "Error in serialization.");
         }
@@ -211,7 +211,7 @@ class Client
         const Args& ... args)
     {
         if (!Deserialization::deserialize(responseIterator, out)) {
-            LogPedantic("Error in deserialization.");
+            WrtLogD("Error in deserialization.");
             ThrowMsg(Exception::DBusClientException,
                      "Error in deserialization.");
         }
@@ -222,7 +222,7 @@ class Client
     void returnFromCall(DBusMessageIter* responseIterator, T* out)
     {
         if (!Deserialization::deserialize(responseIterator, out)) {
-            LogPedantic("Error in deserialization.");
+            WrtLogD("Error in deserialization.");
             ThrowMsg(Exception::DBusClientException,
                      "Error in deserialization.");
         }