diff --git a/sflphone-common/libs/dbus-c++/src/connection.cpp b/sflphone-common/libs/dbus-c++/src/connection.cpp
index b7b6729726731f238347799ca5846b371b722fbb..0cc10df95143b90287770be421a87e8372ac3351 100644
--- a/sflphone-common/libs/dbus-c++/src/connection.cpp
+++ b/sflphone-common/libs/dbus-c++/src/connection.cpp
@@ -42,13 +42,11 @@
using namespace DBus;
Connection::Private::Private (DBusConnection *c, Server::Private *s)
- : conn (c) , dispatcher (0), server (s)
-{
+ : conn (c) , dispatcher (0), server (s) {
init();
}
-Connection::Private::Private (DBusBusType type)
-{
+Connection::Private::Private (DBusBusType type) {
InternalError e;
conn = dbus_bus_get_private (type, e);
@@ -58,8 +56,7 @@ Connection::Private::Private (DBusBusType type)
init();
}
-Connection::Private::~Private()
-{
+Connection::Private::~Private() {
debug_log ("terminating connection 0x%08x", conn);
detach_server();
@@ -79,8 +76,7 @@ Connection::Private::~Private()
dbus_connection_unref (conn);
}
-void Connection::Private::init()
-{
+void Connection::Private::init() {
dbus_connection_ref (conn);
dbus_connection_ref (conn); //todo: the library has to own another reference
@@ -94,8 +90,7 @@ void Connection::Private::init()
dbus_connection_set_exit_on_disconnect (conn, false); //why was this set to true??
}
-void Connection::Private::detach_server()
-{
+void Connection::Private::detach_server() {
/* Server::Private *tmp = server;
server = NULL;
@@ -115,8 +110,7 @@ void Connection::Private::detach_server()
}*/
}
-bool Connection::Private::do_dispatch()
-{
+bool Connection::Private::do_dispatch() {
debug_log ("dispatching on %p", conn);
if (!dbus_connection_get_is_connected (conn)) {
@@ -130,8 +124,7 @@ bool Connection::Private::do_dispatch()
return dbus_connection_dispatch (conn) != DBUS_DISPATCH_DATA_REMAINS;
}
-void Connection::Private::dispatch_status_stub (DBusConnection *dc, DBusDispatchStatus status, void *data)
-{
+void Connection::Private::dispatch_status_stub (DBusConnection *dc, DBusDispatchStatus status, void *data) {
Private *p = static_cast<Private *> (data);
switch (status) {
@@ -151,8 +144,7 @@ void Connection::Private::dispatch_status_stub (DBusConnection *dc, DBusDispatch
}
}
-DBusHandlerResult Connection::Private::message_filter_stub (DBusConnection *conn, DBusMessage *dmsg, void *data)
-{
+DBusHandlerResult Connection::Private::message_filter_stub (DBusConnection *conn, DBusMessage *dmsg, void *data) {
MessageSlot *slot = static_cast<MessageSlot *> (data);
Message msg = Message (new Message::Private (dmsg));
@@ -162,8 +154,7 @@ DBusHandlerResult Connection::Private::message_filter_stub (DBusConnection *conn
: DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
-bool Connection::Private::disconn_filter_function (const Message &msg)
-{
+bool Connection::Private::disconn_filter_function (const Message &msg) {
if (msg.is_signal (DBUS_INTERFACE_LOCAL,"Disconnected")) {
debug_log ("%p disconnected by local bus", conn);
dbus_connection_close (conn);
@@ -174,34 +165,28 @@ bool Connection::Private::disconn_filter_function (const Message &msg)
return false;
}
-DBusDispatchStatus Connection::Private::dispatch_status()
-{
+DBusDispatchStatus Connection::Private::dispatch_status() {
return dbus_connection_get_dispatch_status (conn);
}
-bool Connection::Private::has_something_to_dispatch()
-{
+bool Connection::Private::has_something_to_dispatch() {
return dispatch_status() == DBUS_DISPATCH_DATA_REMAINS;
}
-Connection Connection::SystemBus()
-{
+Connection Connection::SystemBus() {
return Connection (new Private (DBUS_BUS_SYSTEM));
}
-Connection Connection::SessionBus()
-{
+Connection Connection::SessionBus() {
return Connection (new Private (DBUS_BUS_SESSION));
}
-Connection Connection::ActivationBus()
-{
+Connection Connection::ActivationBus() {
return Connection (new Private (DBUS_BUS_STARTER));
}
-Connection::Connection (const char *address, bool priv)
-{
+Connection::Connection (const char *address, bool priv) {
InternalError e;
DBusConnection *conn = priv
? dbus_connection_open_private (address, e)
@@ -217,24 +202,20 @@ Connection::Connection (const char *address, bool priv)
}
Connection::Connection (Connection::Private *p)
- : _pvt (p)
-{
+ : _pvt (p) {
setup (default_dispatcher);
}
Connection::Connection (const Connection &c)
- : _pvt (c._pvt)
-{
+ : _pvt (c._pvt) {
dbus_connection_ref (_pvt->conn);
}
-Connection::~Connection()
-{
+Connection::~Connection() {
dbus_connection_unref (_pvt->conn);
}
-Dispatcher *Connection::setup (Dispatcher *dispatcher)
-{
+Dispatcher *Connection::setup (Dispatcher *dispatcher) {
debug_log ("registering stubs for connection %p", _pvt->conn);
if (!dispatcher) dispatcher = default_dispatcher;
@@ -268,13 +249,11 @@ Dispatcher *Connection::setup (Dispatcher *dispatcher)
return prev;
}
-bool Connection::operator == (const Connection &c) const
-{
+bool Connection::operator == (const Connection &c) const {
return _pvt->conn == c._pvt->conn;
}
-bool Connection::register_bus()
-{
+bool Connection::register_bus() {
InternalError e;
bool r = dbus_bus_register (_pvt->conn, e);
@@ -284,39 +263,32 @@ bool Connection::register_bus()
return r;
}
-bool Connection::connected() const
-{
+bool Connection::connected() const {
return dbus_connection_get_is_connected (_pvt->conn);
}
-void Connection::disconnect()
-{
+void Connection::disconnect() {
// dbus_connection_disconnect(_pvt->conn); // disappeared in 0.9x
dbus_connection_close (_pvt->conn);
}
-void Connection::exit_on_disconnect (bool exit)
-{
+void Connection::exit_on_disconnect (bool exit) {
dbus_connection_set_exit_on_disconnect (_pvt->conn, exit);
}
-bool Connection::unique_name (const char *n)
-{
+bool Connection::unique_name (const char *n) {
return dbus_bus_set_unique_name (_pvt->conn, n);
}
-const char *Connection::unique_name() const
-{
+const char *Connection::unique_name() const {
return dbus_bus_get_unique_name (_pvt->conn);
}
-void Connection::flush()
-{
+void Connection::flush() {
dbus_connection_flush (_pvt->conn);
}
-void Connection::add_match (const char *rule)
-{
+void Connection::add_match (const char *rule) {
InternalError e;
dbus_bus_add_match (_pvt->conn, rule, e);
@@ -326,8 +298,7 @@ void Connection::add_match (const char *rule)
if (e) throw Error (e);
}
-void Connection::remove_match (const char *rule)
-{
+void Connection::remove_match (const char *rule) {
InternalError e;
dbus_bus_remove_match (_pvt->conn, rule, e);
@@ -337,25 +308,21 @@ void Connection::remove_match (const char *rule)
if (e) throw Error (e);
}
-bool Connection::add_filter (MessageSlot &s)
-{
+bool Connection::add_filter (MessageSlot &s) {
debug_log ("%s: adding filter", unique_name());
return dbus_connection_add_filter (_pvt->conn, Private::message_filter_stub, &s, NULL);
}
-void Connection::remove_filter (MessageSlot &s)
-{
+void Connection::remove_filter (MessageSlot &s) {
debug_log ("%s: removing filter", unique_name());
dbus_connection_remove_filter (_pvt->conn, Private::message_filter_stub, &s);
}
-bool Connection::send (const Message &msg, unsigned int *serial)
-{
+bool Connection::send (const Message &msg, unsigned int *serial) {
return dbus_connection_send (_pvt->conn, msg._pvt->msg, serial);
}
-Message Connection::send_blocking (Message &msg, int timeout)
-{
+Message Connection::send_blocking (Message &msg, int timeout) {
DBusMessage *reply;
InternalError e;
@@ -366,8 +333,7 @@ Message Connection::send_blocking (Message &msg, int timeout)
return Message (new Message::Private (reply), false);
}
-PendingCall Connection::send_async (Message &msg, int timeout)
-{
+PendingCall Connection::send_async (Message &msg, int timeout) {
DBusPendingCall *pending;
if (!dbus_connection_send_with_reply (_pvt->conn, msg._pvt->msg, &pending, timeout)) {
@@ -377,8 +343,7 @@ PendingCall Connection::send_async (Message &msg, int timeout)
return PendingCall (new PendingCall::Private (pending));
}
-void Connection::request_name (const char *name, int flags)
-{
+void Connection::request_name (const char *name, int flags) {
InternalError e;
debug_log ("%s: registering bus name %s", unique_name(), name);
@@ -396,8 +361,7 @@ void Connection::request_name (const char *name, int flags)
}
}
-unsigned long Connection::sender_unix_uid (const char *sender)
-{
+unsigned long Connection::sender_unix_uid (const char *sender) {
InternalError e;
unsigned long ul = dbus_bus_get_unix_user (_pvt->conn, sender, e);
@@ -407,8 +371,7 @@ unsigned long Connection::sender_unix_uid (const char *sender)
return ul;
}
-bool Connection::has_name (const char *name)
-{
+bool Connection::has_name (const char *name) {
InternalError e;
bool b = dbus_bus_name_has_owner (_pvt->conn, name, e);
@@ -418,13 +381,11 @@ bool Connection::has_name (const char *name)
return b;
}
-const std::vector<std::string>& Connection::names()
-{
+const std::vector<std::string>& Connection::names() {
return _pvt->names;
}
-bool Connection::start_service (const char *name, unsigned long flags)
-{
+bool Connection::start_service (const char *name, unsigned long flags) {
InternalError e;
bool b = dbus_bus_start_service_by_name (_pvt->conn, name, flags, NULL, e);
diff --git a/sflphone-common/libs/dbus-c++/src/debug.cpp b/sflphone-common/libs/dbus-c++/src/debug.cpp
index 213a784d05a4a7672a86fc0825e8e0c83a4bdaf4..6ee5176ec5a2a77890980ee1023b4500744b6bfc 100644
--- a/sflphone-common/libs/dbus-c++/src/debug.cpp
+++ b/sflphone-common/libs/dbus-c++/src/debug.cpp
@@ -31,8 +31,7 @@
#include <cstdio>
#include <stdlib.h>
-static void _debug_log_default (const char *format, ...)
-{
+static void _debug_log_default (const char *format, ...) {
#ifdef DEBUG
static int debug_env = getenv ("DBUSXX_VERBOSE") ? 1 : 0;
diff --git a/sflphone-common/libs/dbus-c++/src/dispatcher.cpp b/sflphone-common/libs/dbus-c++/src/dispatcher.cpp
index e71bae99fd48a0309d9f6f1c30e57bd3da8ee90e..b333f43a6f3c3cdff290e90c4109dd729c2f794a 100644
--- a/sflphone-common/libs/dbus-c++/src/dispatcher.cpp
+++ b/sflphone-common/libs/dbus-c++/src/dispatcher.cpp
@@ -38,23 +38,19 @@ DBus::Dispatcher *DBus::default_dispatcher = NULL;
using namespace DBus;
Timeout::Timeout (Timeout::Internal *i)
- : _int (i)
-{
+ : _int (i) {
dbus_timeout_set_data ( (DBusTimeout *) i, this, NULL);
}
-int Timeout::interval() const
-{
+int Timeout::interval() const {
return dbus_timeout_get_interval ( (DBusTimeout *) _int);
}
-bool Timeout::enabled() const
-{
+bool Timeout::enabled() const {
return dbus_timeout_get_enabled ( (DBusTimeout *) _int);
}
-bool Timeout::handle()
-{
+bool Timeout::handle() {
return dbus_timeout_handle ( (DBusTimeout *) _int);
}
@@ -62,13 +58,11 @@ bool Timeout::handle()
*/
Watch::Watch (Watch::Internal *i)
- : _int (i)
-{
+ : _int (i) {
dbus_watch_set_data ( (DBusWatch *) i, this, NULL);
}
-int Watch::descriptor() const
-{
+int Watch::descriptor() const {
#if HAVE_WIN32
return dbus_watch_get_socket ( (DBusWatch*) _int);
#else
@@ -76,26 +70,22 @@ int Watch::descriptor() const
#endif
}
-int Watch::flags() const
-{
+int Watch::flags() const {
return dbus_watch_get_flags ( (DBusWatch *) _int);
}
-bool Watch::enabled() const
-{
+bool Watch::enabled() const {
return dbus_watch_get_enabled ( (DBusWatch *) _int);
}
-bool Watch::handle (int flags)
-{
+bool Watch::handle (int flags) {
return dbus_watch_handle ( (DBusWatch *) _int, flags);
}
/*
*/
-dbus_bool_t Dispatcher::Private::on_add_watch (DBusWatch *watch, void *data)
-{
+dbus_bool_t Dispatcher::Private::on_add_watch (DBusWatch *watch, void *data) {
Dispatcher *d = static_cast<Dispatcher *> (data);
Watch::Internal *w = reinterpret_cast<Watch::Internal *> (watch);
@@ -105,8 +95,7 @@ dbus_bool_t Dispatcher::Private::on_add_watch (DBusWatch *watch, void *data)
return true;
}
-void Dispatcher::Private::on_rem_watch (DBusWatch *watch, void *data)
-{
+void Dispatcher::Private::on_rem_watch (DBusWatch *watch, void *data) {
Dispatcher *d = static_cast<Dispatcher *> (data);
Watch *w = static_cast<Watch *> (dbus_watch_get_data (watch));
@@ -114,15 +103,13 @@ void Dispatcher::Private::on_rem_watch (DBusWatch *watch, void *data)
d->rem_watch (w);
}
-void Dispatcher::Private::on_toggle_watch (DBusWatch *watch, void *data)
-{
+void Dispatcher::Private::on_toggle_watch (DBusWatch *watch, void *data) {
Watch *w = static_cast<Watch *> (dbus_watch_get_data (watch));
w->toggle();
}
-dbus_bool_t Dispatcher::Private::on_add_timeout (DBusTimeout *timeout, void *data)
-{
+dbus_bool_t Dispatcher::Private::on_add_timeout (DBusTimeout *timeout, void *data) {
Dispatcher *d = static_cast<Dispatcher *> (data);
Timeout::Internal *t = reinterpret_cast<Timeout::Internal *> (timeout);
@@ -132,8 +119,7 @@ dbus_bool_t Dispatcher::Private::on_add_timeout (DBusTimeout *timeout, void *dat
return true;
}
-void Dispatcher::Private::on_rem_timeout (DBusTimeout *timeout, void *data)
-{
+void Dispatcher::Private::on_rem_timeout (DBusTimeout *timeout, void *data) {
Dispatcher *d = static_cast<Dispatcher *> (data);
Timeout *t = static_cast<Timeout *> (dbus_timeout_get_data (timeout));
@@ -141,23 +127,20 @@ void Dispatcher::Private::on_rem_timeout (DBusTimeout *timeout, void *data)
d->rem_timeout (t);
}
-void Dispatcher::Private::on_toggle_timeout (DBusTimeout *timeout, void *data)
-{
+void Dispatcher::Private::on_toggle_timeout (DBusTimeout *timeout, void *data) {
Timeout *t = static_cast<Timeout *> (dbus_timeout_get_data (timeout));
t->toggle();
}
-void Dispatcher::queue_connection (Connection::Private *cp)
-{
+void Dispatcher::queue_connection (Connection::Private *cp) {
_mutex_p.lock();
_pending_queue.push_back (cp);
_mutex_p.unlock();
}
-bool Dispatcher::has_something_to_dispatch()
-{
+bool Dispatcher::has_something_to_dispatch() {
_mutex_p.lock();
bool has_something = false;
@@ -173,8 +156,7 @@ bool Dispatcher::has_something_to_dispatch()
}
-void Dispatcher::dispatch_pending()
-{
+void Dispatcher::dispatch_pending() {
_mutex_p.lock();
// SEEME: dbus-glib is dispatching only one message at a time to not starve the loop/other things...
@@ -199,8 +181,7 @@ void Dispatcher::dispatch_pending()
_mutex_p.unlock();
}
-void DBus::_init_threading()
-{
+void DBus::_init_threading() {
#ifdef DBUS_HAS_THREADS_INIT_DEFAULT
dbus_threads_init_default();
#else
@@ -219,8 +200,7 @@ void DBus::_init_threading (
CondVarWaitTimeoutFn c4,
CondVarWakeOneFn c5,
CondVarWakeAllFn c6
-)
-{
+) {
#ifndef DBUS_HAS_RECURSIVE_MUTEX
DBusThreadFunctions functions = {
DBUS_THREAD_FUNCTIONS_MUTEX_NEW_MASK |
diff --git a/sflphone-common/libs/dbus-c++/src/ecore-integration.cpp b/sflphone-common/libs/dbus-c++/src/ecore-integration.cpp
index d18d4b1136cc2b43de1f4eaa22841cb4fb4c8f80..d18192f279c12879883cf0b38bc53da646480d6b 100644
--- a/sflphone-common/libs/dbus-c++/src/ecore-integration.cpp
+++ b/sflphone-common/libs/dbus-c++/src/ecore-integration.cpp
@@ -32,26 +32,22 @@
using namespace DBus;
Ecore::BusTimeout::BusTimeout (Timeout::Internal* ti)
- : Timeout (ti)
-{
+ : Timeout (ti) {
_enable();
}
-Ecore::BusTimeout::~BusTimeout()
-{
+Ecore::BusTimeout::~BusTimeout() {
_disable();
}
-void Ecore::BusTimeout::toggle()
-{
+void Ecore::BusTimeout::toggle() {
debug_log ("ecore: timeout %p toggled (%s)", this, Timeout::enabled() ? "on":"off");
if (Timeout::enabled()) _enable();
else _disable();
}
-int Ecore::BusTimeout::timeout_handler (void *data)
-{
+int Ecore::BusTimeout::timeout_handler (void *data) {
Ecore::BusTimeout* t = reinterpret_cast<Ecore::BusTimeout*> (data);
debug_log ("Ecore::BusTimeout::timeout_handler( void *data )");
@@ -61,37 +57,32 @@ int Ecore::BusTimeout::timeout_handler (void *data)
return 1; // 1 -> reshedule in ecore for next timer interval
}
-void Ecore::BusTimeout::_enable()
-{
+void Ecore::BusTimeout::_enable() {
debug_log ("Ecore::BusTimeout::_enable()");
_etimer = ecore_timer_add ( ( (double) Timeout::interval()) /1000, timeout_handler, this);
}
-void Ecore::BusTimeout::_disable()
-{
+void Ecore::BusTimeout::_disable() {
debug_log ("Ecore::BusTimeout::_disable()");
ecore_timer_del (_etimer);
}
-static bool watch_prepare (int *timeout)
-{
+static bool watch_prepare (int *timeout) {
debug_log ("ecore: watch_prepare");
*timeout = -1;
return false;
}
-static bool watch_check()
-{
+static bool watch_check() {
debug_log ("ecore: watch_check");
return true;
}
-static bool watch_dispatch (void *data)
-{
+static bool watch_dispatch (void *data) {
debug_log ("ecore: watch_dispatch");
bool cb = true;
@@ -100,26 +91,22 @@ static bool watch_dispatch (void *data)
}
Ecore::BusWatch::BusWatch (Watch::Internal* wi)
- : Watch (wi)
-{
+ : Watch (wi) {
_enable();
}
-Ecore::BusWatch::~BusWatch()
-{
+Ecore::BusWatch::~BusWatch() {
_disable();
}
-void Ecore::BusWatch::toggle()
-{
+void Ecore::BusWatch::toggle() {
debug_log ("ecore: watch %p toggled (%s)", this, Watch::enabled() ? "on":"off");
if (Watch::enabled()) _enable();
else _disable();
}
-int Ecore::BusWatch::watch_handler_read (void *data, Ecore_Fd_Handler *fdh)
-{
+int Ecore::BusWatch::watch_handler_read (void *data, Ecore_Fd_Handler *fdh) {
Ecore::BusWatch* w = reinterpret_cast<Ecore::BusWatch*> (data);
debug_log ("ecore: watch_handler_read");
@@ -133,8 +120,7 @@ int Ecore::BusWatch::watch_handler_read (void *data, Ecore_Fd_Handler *fdh)
return 1;
}
-int Ecore::BusWatch::watch_handler_error (void *data, Ecore_Fd_Handler *fdh)
-{
+int Ecore::BusWatch::watch_handler_error (void *data, Ecore_Fd_Handler *fdh) {
Ecore::BusWatch* w = reinterpret_cast<Ecore::BusWatch*> (data);
debug_log ("ecore: watch_handler_error");
@@ -146,8 +132,7 @@ int Ecore::BusWatch::watch_handler_error (void *data, Ecore_Fd_Handler *fdh)
return 1;
}
-void Ecore::BusWatch::_enable()
-{
+void Ecore::BusWatch::_enable() {
debug_log ("Ecore::BusWatch::_enable()");
int flags = Watch::flags();
@@ -169,18 +154,15 @@ void Ecore::BusWatch::_enable()
ecore_main_fd_handler_active_set (fd_handler_error, ECORE_FD_ERROR);
}
-void Ecore::BusWatch::_disable()
-{
+void Ecore::BusWatch::_disable() {
ecore_main_fd_handler_del (fd_handler_read);
ecore_main_fd_handler_del (fd_handler_error);
}
-void Ecore::BusDispatcher::attach()
-{
+void Ecore::BusDispatcher::attach() {
}
-Timeout* Ecore::BusDispatcher::add_timeout (Timeout::Internal* wi)
-{
+Timeout* Ecore::BusDispatcher::add_timeout (Timeout::Internal* wi) {
Timeout* t = new Ecore::BusTimeout (wi);
debug_log ("ecore: added timeout %p (%s)", t, t->enabled() ? "on":"off");
@@ -188,15 +170,13 @@ Timeout* Ecore::BusDispatcher::add_timeout (Timeout::Internal* wi)
return t;
}
-void Ecore::BusDispatcher::rem_timeout (Timeout* t)
-{
+void Ecore::BusDispatcher::rem_timeout (Timeout* t) {
debug_log ("ecore: removed timeout %p", t);
delete t;
}
-Watch* Ecore::BusDispatcher::add_watch (Watch::Internal* wi)
-{
+Watch* Ecore::BusDispatcher::add_watch (Watch::Internal* wi) {
Watch* w = new Ecore::BusWatch (wi);
debug_log ("ecore: added watch %p (%s) fd=%d flags=%d",
@@ -205,8 +185,7 @@ Watch* Ecore::BusDispatcher::add_watch (Watch::Internal* wi)
return w;
}
-void Ecore::BusDispatcher::rem_watch (Watch* w)
-{
+void Ecore::BusDispatcher::rem_watch (Watch* w) {
debug_log ("ecore: removed watch %p", w);
delete w;
diff --git a/sflphone-common/libs/dbus-c++/src/error.cpp b/sflphone-common/libs/dbus-c++/src/error.cpp
index 89d91d1f39d2d604f6de6313788530b2e5176ca7..ccb3da960fec2d0ace11c4e860d07cc69a15c3af 100644
--- a/sflphone-common/libs/dbus-c++/src/error.cpp
+++ b/sflphone-common/libs/dbus-c++/src/error.cpp
@@ -39,51 +39,41 @@ using namespace DBus;
*/
Error::Error()
- : _int (new InternalError)
-{}
+ : _int (new InternalError) {}
Error::Error (InternalError &i)
- : _int (new InternalError (i))
-{}
+ : _int (new InternalError (i)) {}
Error::Error (const char *name, const char *message)
- : _int (new InternalError)
-{
+ : _int (new InternalError) {
set (name, message);
}
Error::Error (Message &m)
- : _int (new InternalError)
-{
+ : _int (new InternalError) {
dbus_set_error_from_message (& (_int->error), m._pvt->msg);
}
-Error::~Error() throw()
-{
+Error::~Error() throw() {
}
-const char *Error::name() const
-{
+const char *Error::name() const {
return _int->error.name;
}
-const char *Error::message() const
-{
+const char *Error::message() const {
return _int->error.message;
}
-bool Error::is_set() const
-{
+bool Error::is_set() const {
return * (_int);
}
-void Error::set (const char *name, const char *message)
-{
+void Error::set (const char *name, const char *message) {
dbus_set_error_const (& (_int->error), name, message);
}
-const char *Error::what() const throw()
-{
+const char *Error::what() const throw() {
return _int->error.message;
}
diff --git a/sflphone-common/libs/dbus-c++/src/eventloop-integration.cpp b/sflphone-common/libs/dbus-c++/src/eventloop-integration.cpp
index 6947f28130fa5d27e4b83038246626c0a1b1ba9a..f367623e5f5b9fb887d5ff86fb0885fe295e062e 100644
--- a/sflphone-common/libs/dbus-c++/src/eventloop-integration.cpp
+++ b/sflphone-common/libs/dbus-c++/src/eventloop-integration.cpp
@@ -35,21 +35,18 @@
using namespace DBus;
BusTimeout::BusTimeout (Timeout::Internal *ti, BusDispatcher *bd)
- : Timeout (ti), DefaultTimeout (Timeout::interval(), true, bd)
-{
+ : Timeout (ti), DefaultTimeout (Timeout::interval(), true, bd) {
DefaultTimeout::enabled (Timeout::enabled());
}
-void BusTimeout::toggle()
-{
+void BusTimeout::toggle() {
debug_log ("timeout %p toggled (%s)", this, Timeout::enabled() ? "on":"off");
DefaultTimeout::enabled (Timeout::enabled());
}
BusWatch::BusWatch (Watch::Internal *wi, BusDispatcher *bd)
- : Watch (wi), DefaultWatch (Watch::descriptor(), 0, bd)
-{
+ : Watch (wi), DefaultWatch (Watch::descriptor(), 0, bd) {
int flags = POLLHUP | POLLERR;
if (Watch::flags() & DBUS_WATCH_READABLE)
@@ -63,15 +60,13 @@ BusWatch::BusWatch (Watch::Internal *wi, BusDispatcher *bd)
DefaultWatch::enabled (Watch::enabled());
}
-void BusWatch::toggle()
-{
+void BusWatch::toggle() {
debug_log ("watch %p toggled (%s)", this, Watch::enabled() ? "on":"off");
DefaultWatch::enabled (Watch::enabled());
}
-void BusDispatcher::enter()
-{
+void BusDispatcher::enter() {
debug_log ("entering dispatcher %p", this);
_running = true;
@@ -83,20 +78,17 @@ void BusDispatcher::enter()
debug_log ("leaving dispatcher %p", this);
}
-void BusDispatcher::leave()
-{
+void BusDispatcher::leave() {
_running = false;
terminate();
}
-void BusDispatcher::do_iteration()
-{
+void BusDispatcher::do_iteration() {
dispatch_pending();
dispatch();
}
-Timeout *BusDispatcher::add_timeout (Timeout::Internal *ti)
-{
+Timeout *BusDispatcher::add_timeout (Timeout::Internal *ti) {
BusTimeout *bt = new BusTimeout (ti, this);
bt->expired = new Callback<BusDispatcher, void, DefaultTimeout &> (this, &BusDispatcher::timeout_expired);
@@ -108,15 +100,13 @@ Timeout *BusDispatcher::add_timeout (Timeout::Internal *ti)
return bt;
}
-void BusDispatcher::rem_timeout (Timeout *t)
-{
+void BusDispatcher::rem_timeout (Timeout *t) {
debug_log ("removed timeout %p", t);
delete t;
}
-Watch *BusDispatcher::add_watch (Watch::Internal *wi)
-{
+Watch *BusDispatcher::add_watch (Watch::Internal *wi) {
BusWatch *bw = new BusWatch (wi, this);
bw->ready = new Callback<BusDispatcher, void, DefaultWatch &> (this, &BusDispatcher::watch_ready);
@@ -128,15 +118,13 @@ Watch *BusDispatcher::add_watch (Watch::Internal *wi)
return bw;
}
-void BusDispatcher::rem_watch (Watch *w)
-{
+void BusDispatcher::rem_watch (Watch *w) {
debug_log ("removed watch %p", w);
delete w;
}
-void BusDispatcher::timeout_expired (DefaultTimeout &et)
-{
+void BusDispatcher::timeout_expired (DefaultTimeout &et) {
debug_log ("timeout %p expired", &et);
BusTimeout *timeout = reinterpret_cast<BusTimeout *> (et.data());
@@ -144,8 +132,7 @@ void BusDispatcher::timeout_expired (DefaultTimeout &et)
timeout->handle();
}
-void BusDispatcher::watch_ready (DefaultWatch &ew)
-{
+void BusDispatcher::watch_ready (DefaultWatch &ew) {
BusWatch *watch = reinterpret_cast<BusWatch *> (ew.data());
debug_log ("watch %p ready, flags=%d state=%d",
diff --git a/sflphone-common/libs/dbus-c++/src/eventloop.cpp b/sflphone-common/libs/dbus-c++/src/eventloop.cpp
index f74cafeaa6385fb66bf45d96f64315c25f3ec0a8..94bf59b389069754f9d6a016a717d6abac8b0e1d 100644
--- a/sflphone-common/libs/dbus-c++/src/eventloop.cpp
+++ b/sflphone-common/libs/dbus-c++/src/eventloop.cpp
@@ -36,14 +36,12 @@
using namespace DBus;
-static double millis (timeval tv)
-{
+static double millis (timeval tv) {
return (tv.tv_sec *1000.0 + tv.tv_usec/1000.0);
}
DefaultTimeout::DefaultTimeout (int interval, bool repeat, DefaultMainLoop *ed)
- : _enabled (true), _interval (interval), _repeat (repeat), _expiration (0), _data (0), _disp (ed)
-{
+ : _enabled (true), _interval (interval), _repeat (repeat), _expiration (0), _data (0), _disp (ed) {
timeval now;
gettimeofday (&now, NULL);
@@ -54,57 +52,48 @@ DefaultTimeout::DefaultTimeout (int interval, bool repeat, DefaultMainLoop *ed)
_disp->_mutex_t.unlock();
}
-DefaultTimeout::~DefaultTimeout()
-{
+DefaultTimeout::~DefaultTimeout() {
_disp->_mutex_t.lock();
_disp->_timeouts.remove (this);
_disp->_mutex_t.unlock();
}
DefaultWatch::DefaultWatch (int fd, int flags, DefaultMainLoop *ed)
- : _enabled (true), _fd (fd), _flags (flags), _state (0), _data (0), _disp (ed)
-{
+ : _enabled (true), _fd (fd), _flags (flags), _state (0), _data (0), _disp (ed) {
_disp->_mutex_w.lock();
_disp->_watches.push_back (this);
_disp->_mutex_w.unlock();
}
-DefaultWatch::~DefaultWatch()
-{
+DefaultWatch::~DefaultWatch() {
_disp->_mutex_w.lock();
_disp->_watches.remove (this);
_disp->_mutex_w.unlock();
}
-DefaultMutex::DefaultMutex()
-{
+DefaultMutex::DefaultMutex() {
pthread_mutex_init (&_mutex, NULL);
}
-DefaultMutex::~DefaultMutex()
-{
+DefaultMutex::~DefaultMutex() {
pthread_mutex_destroy (&_mutex);
}
-void DefaultMutex::lock()
-{
+void DefaultMutex::lock() {
pthread_mutex_lock (&_mutex);
}
-void DefaultMutex::unlock()
-{
+void DefaultMutex::unlock() {
pthread_mutex_unlock (&_mutex);
}
-DefaultMainLoop::DefaultMainLoop()
-{
+DefaultMainLoop::DefaultMainLoop() {
if (pipe (_terminateFd) < 0) {
throw ErrorFailed ("unable to create unamed pipe");
}
}
-DefaultMainLoop::~DefaultMainLoop()
-{
+DefaultMainLoop::~DefaultMainLoop() {
_mutex_w.lock();
DefaultWatches::iterator wi = _watches.begin();
@@ -140,13 +129,11 @@ DefaultMainLoop::~DefaultMainLoop()
_mutex_t.unlock();
}
-void DefaultMainLoop::terminate()
-{
+void DefaultMainLoop::terminate() {
write (_terminateFd[1], " ", 1);
}
-void DefaultMainLoop::dispatch()
-{
+void DefaultMainLoop::dispatch() {
_mutex_w.lock();
int nfd = _watches.size() + 1;
diff --git a/sflphone-common/libs/dbus-c++/src/glib-integration.cpp b/sflphone-common/libs/dbus-c++/src/glib-integration.cpp
index 1739670bfc49bb7eaa79ed55b8113caf5a161d39..8785608fa7f15b5c507d9fb576492ab4b00a56c3 100644
--- a/sflphone-common/libs/dbus-c++/src/glib-integration.cpp
+++ b/sflphone-common/libs/dbus-c++/src/glib-integration.cpp
@@ -31,27 +31,23 @@
using namespace DBus;
Glib::BusTimeout::BusTimeout (Timeout::Internal *ti, GMainContext *ctx, int priority)
- : Timeout (ti), _ctx (ctx), _priority (priority), _source (NULL)
-{
+ : Timeout (ti), _ctx (ctx), _priority (priority), _source (NULL) {
if (Timeout::enabled())
_enable();
}
-Glib::BusTimeout::~BusTimeout()
-{
+Glib::BusTimeout::~BusTimeout() {
_disable();
}
-void Glib::BusTimeout::toggle()
-{
+void Glib::BusTimeout::toggle() {
debug_log ("glib: timeout %p toggled (%s)", this, Timeout::enabled() ? "on":"off");
if (Timeout::enabled()) _enable();
else _disable();
}
-gboolean Glib::BusTimeout::timeout_handler (gpointer data)
-{
+gboolean Glib::BusTimeout::timeout_handler (gpointer data) {
Glib::BusTimeout *t = reinterpret_cast<Glib::BusTimeout *> (data);
t->handle();
@@ -59,8 +55,7 @@ gboolean Glib::BusTimeout::timeout_handler (gpointer data)
return TRUE;
}
-void Glib::BusTimeout::_enable()
-{
+void Glib::BusTimeout::_enable() {
if (_source)
_disable(); // be sane
@@ -73,8 +68,7 @@ void Glib::BusTimeout::_enable()
g_source_attach (_source, _ctx);
}
-void Glib::BusTimeout::_disable()
-{
+void Glib::BusTimeout::_disable() {
if (_source) {
g_source_destroy (_source);
_source = NULL;
@@ -86,24 +80,21 @@ struct BusSource {
GPollFD poll;
};
-static gboolean watch_prepare (GSource *source, gint *timeout)
-{
+static gboolean watch_prepare (GSource *source, gint *timeout) {
//debug_log("glib: watch_prepare");
*timeout = -1;
return FALSE;
}
-static gboolean watch_check (GSource *source)
-{
+static gboolean watch_check (GSource *source) {
//debug_log("glib: watch_check");
BusSource *io = (BusSource *) source;
return io->poll.revents ? TRUE : FALSE;
}
-static gboolean watch_dispatch (GSource *source, GSourceFunc callback, gpointer data)
-{
+static gboolean watch_dispatch (GSource *source, GSourceFunc callback, gpointer data) {
debug_log ("glib: watch_dispatch");
gboolean cb = callback (data);
@@ -118,27 +109,23 @@ static GSourceFuncs watch_funcs = {
};
Glib::BusWatch::BusWatch (Watch::Internal *wi, GMainContext *ctx, int priority)
- : Watch (wi), _ctx (ctx), _priority (priority), _source (NULL)
-{
+ : Watch (wi), _ctx (ctx), _priority (priority), _source (NULL) {
if (Watch::enabled())
_enable();
}
-Glib::BusWatch::~BusWatch()
-{
+Glib::BusWatch::~BusWatch() {
_disable();
}
-void Glib::BusWatch::toggle()
-{
+void Glib::BusWatch::toggle() {
debug_log ("glib: watch %p toggled (%s)", this, Watch::enabled() ? "on":"off");
if (Watch::enabled()) _enable();
else _disable();
}
-gboolean Glib::BusWatch::watch_handler (gpointer data)
-{
+gboolean Glib::BusWatch::watch_handler (gpointer data) {
Glib::BusWatch *w = reinterpret_cast<Glib::BusWatch *> (data);
BusSource *io = (BusSource *) (w->_source);
@@ -162,8 +149,7 @@ gboolean Glib::BusWatch::watch_handler (gpointer data)
return TRUE;
}
-void Glib::BusWatch::_enable()
-{
+void Glib::BusWatch::_enable() {
if (_source)
_disable(); // be sane
@@ -202,8 +188,7 @@ void Glib::BusWatch::_enable()
g_source_attach (_source, _ctx);
}
-void Glib::BusWatch::_disable()
-{
+void Glib::BusWatch::_disable() {
if (!_source)
return;
@@ -228,8 +213,7 @@ struct DispatcherSource {
};
-static gboolean dispatcher_prepare (GSource *source, gint *timeout)
-{
+static gboolean dispatcher_prepare (GSource *source, gint *timeout) {
Dispatcher *dispatcher = ( (DispatcherSource*) source)->dispatcher;
*timeout = -1;
@@ -237,16 +221,14 @@ static gboolean dispatcher_prepare (GSource *source, gint *timeout)
return dispatcher->has_something_to_dispatch() ? TRUE:FALSE;
}
-static gboolean dispatcher_check (GSource *source)
-{
+static gboolean dispatcher_check (GSource *source) {
return FALSE;
}
static gboolean
dispatcher_dispatch (GSource *source,
GSourceFunc callback,
- gpointer user_data)
-{
+ gpointer user_data) {
Dispatcher *dispatcher = ( (DispatcherSource*) source)->dispatcher;
dispatcher->dispatch_pending();
@@ -261,12 +243,10 @@ static const GSourceFuncs dispatcher_funcs = {
};
Glib::BusDispatcher::BusDispatcher()
- : _ctx (NULL), _priority (G_PRIORITY_DEFAULT), _source (NULL)
-{
+ : _ctx (NULL), _priority (G_PRIORITY_DEFAULT), _source (NULL) {
}
-Glib::BusDispatcher::~BusDispatcher()
-{
+Glib::BusDispatcher::~BusDispatcher() {
if (_source) {
GSource *temp = _source;
_source = NULL;
@@ -279,8 +259,7 @@ Glib::BusDispatcher::~BusDispatcher()
g_main_context_unref (_ctx);
}
-void Glib::BusDispatcher::attach (GMainContext *ctx)
-{
+void Glib::BusDispatcher::attach (GMainContext *ctx) {
g_assert (_ctx == NULL); // just to be sane
_ctx = ctx ? ctx : g_main_context_default();
@@ -294,8 +273,7 @@ void Glib::BusDispatcher::attach (GMainContext *ctx)
g_source_attach (_source, _ctx);
}
-Timeout *Glib::BusDispatcher::add_timeout (Timeout::Internal *wi)
-{
+Timeout *Glib::BusDispatcher::add_timeout (Timeout::Internal *wi) {
Timeout *t = new Glib::BusTimeout (wi, _ctx, _priority);
debug_log ("glib: added timeout %p (%s)", t, t->enabled() ? "on":"off");
@@ -303,15 +281,13 @@ Timeout *Glib::BusDispatcher::add_timeout (Timeout::Internal *wi)
return t;
}
-void Glib::BusDispatcher::rem_timeout (Timeout *t)
-{
+void Glib::BusDispatcher::rem_timeout (Timeout *t) {
debug_log ("glib: removed timeout %p", t);
delete t;
}
-Watch *Glib::BusDispatcher::add_watch (Watch::Internal *wi)
-{
+Watch *Glib::BusDispatcher::add_watch (Watch::Internal *wi) {
Watch *w = new Glib::BusWatch (wi, _ctx, _priority);
debug_log ("glib: added watch %p (%s) fd=%d flags=%d",
@@ -320,14 +296,12 @@ Watch *Glib::BusDispatcher::add_watch (Watch::Internal *wi)
return w;
}
-void Glib::BusDispatcher::rem_watch (Watch *w)
-{
+void Glib::BusDispatcher::rem_watch (Watch *w) {
debug_log ("glib: removed watch %p", w);
delete w;
}
-void Glib::BusDispatcher::set_priority (int priority)
-{
+void Glib::BusDispatcher::set_priority (int priority) {
_priority = priority;
}
diff --git a/sflphone-common/libs/dbus-c++/src/interface.cpp b/sflphone-common/libs/dbus-c++/src/interface.cpp
index aefcd1dea91bde9fe54765990b219d4e1cde01cd..95c11efdc41ff5f0e739c00307f7a2c13e7a759c 100644
--- a/sflphone-common/libs/dbus-c++/src/interface.cpp
+++ b/sflphone-common/libs/dbus-c++/src/interface.cpp
@@ -33,29 +33,24 @@
using namespace DBus;
Interface::Interface (const std::string &name)
- : _name (name)
-{}
+ : _name (name) {}
-Interface::~Interface()
-{}
+Interface::~Interface() {}
-InterfaceAdaptor *AdaptorBase::find_interface (const std::string &name)
-{
+InterfaceAdaptor *AdaptorBase::find_interface (const std::string &name) {
InterfaceAdaptorTable::const_iterator ii = _interfaces.find (name);
return ii != _interfaces.end() ? ii->second : NULL;
}
InterfaceAdaptor::InterfaceAdaptor (const std::string &name)
- : Interface (name)
-{
+ : Interface (name) {
debug_log ("adding interface %s", name.c_str());
_interfaces[name] = this;
}
-Message InterfaceAdaptor::dispatch_method (const CallMessage &msg)
-{
+Message InterfaceAdaptor::dispatch_method (const CallMessage &msg) {
const char *name = msg.member();
MethodTable::iterator mi = _methods.find (name);
@@ -67,8 +62,7 @@ Message InterfaceAdaptor::dispatch_method (const CallMessage &msg)
}
}
-void InterfaceAdaptor::emit_signal (const SignalMessage &sig)
-{
+void InterfaceAdaptor::emit_signal (const SignalMessage &sig) {
SignalMessage &sig2 = const_cast<SignalMessage &> (sig);
if (sig2.interface() == NULL)
@@ -77,8 +71,7 @@ void InterfaceAdaptor::emit_signal (const SignalMessage &sig)
_emit_signal (sig2);
}
-Variant *InterfaceAdaptor::get_property (const std::string &name)
-{
+Variant *InterfaceAdaptor::get_property (const std::string &name) {
PropertyTable::iterator pti = _properties.find (name);
if (pti != _properties.end()) {
@@ -91,8 +84,7 @@ Variant *InterfaceAdaptor::get_property (const std::string &name)
return NULL;
}
-void InterfaceAdaptor::set_property (const std::string &name, Variant &value)
-{
+void InterfaceAdaptor::set_property (const std::string &name, Variant &value) {
PropertyTable::iterator pti = _properties.find (name);
if (pti != _properties.end()) {
@@ -112,23 +104,20 @@ void InterfaceAdaptor::set_property (const std::string &name, Variant &value)
throw ErrorFailed ("requested property not found");
}
-InterfaceProxy *ProxyBase::find_interface (const std::string &name)
-{
+InterfaceProxy *ProxyBase::find_interface (const std::string &name) {
InterfaceProxyTable::const_iterator ii = _interfaces.find (name);
return ii != _interfaces.end() ? ii->second : NULL;
}
InterfaceProxy::InterfaceProxy (const std::string &name)
- : Interface (name)
-{
+ : Interface (name) {
debug_log ("adding interface %s", name.c_str());
_interfaces[name] = this;
}
-bool InterfaceProxy::dispatch_signal (const SignalMessage &msg)
-{
+bool InterfaceProxy::dispatch_signal (const SignalMessage &msg) {
const char *name = msg.member();
SignalTable::iterator si = _signals.find (name);
@@ -145,8 +134,7 @@ bool InterfaceProxy::dispatch_signal (const SignalMessage &msg)
}
}
-Message InterfaceProxy::invoke_method (const CallMessage &call)
-{
+Message InterfaceProxy::invoke_method (const CallMessage &call) {
CallMessage &call2 = const_cast<CallMessage &> (call);
if (call.interface() == NULL)
@@ -155,8 +143,7 @@ Message InterfaceProxy::invoke_method (const CallMessage &call)
return _invoke_method (call2);
}
-bool InterfaceProxy::invoke_method_noreply (const CallMessage &call)
-{
+bool InterfaceProxy::invoke_method_noreply (const CallMessage &call) {
CallMessage &call2 = const_cast<CallMessage &> (call);
if (call.interface() == NULL)
diff --git a/sflphone-common/libs/dbus-c++/src/introspection.cpp b/sflphone-common/libs/dbus-c++/src/introspection.cpp
index 41f6439f4aad8eae013e776a3909c96ad95b1c37..15eb5fcc0df143c64b8bc287d0e8163e36b575a3 100644
--- a/sflphone-common/libs/dbus-c++/src/introspection.cpp
+++ b/sflphone-common/libs/dbus-c++/src/introspection.cpp
@@ -38,13 +38,11 @@ using namespace DBus;
static const char *introspectable_name = "org.freedesktop.DBus.Introspectable";
IntrospectableAdaptor::IntrospectableAdaptor()
- : InterfaceAdaptor (introspectable_name)
-{
+ : InterfaceAdaptor (introspectable_name) {
register_method (IntrospectableAdaptor, Introspect, Introspect);
}
-Message IntrospectableAdaptor::Introspect (const CallMessage &call)
-{
+Message IntrospectableAdaptor::Introspect (const CallMessage &call) {
debug_log ("requested introspection data");
std::ostringstream xml;
@@ -143,8 +141,7 @@ Message IntrospectableAdaptor::Introspect (const CallMessage &call)
return reply;
}
-IntrospectedInterface *const IntrospectableAdaptor::introspect() const
-{
+IntrospectedInterface *const IntrospectableAdaptor::introspect() const {
static IntrospectedArgument Introspect_args[] = {
{ "data", "s", false },
{ 0, 0, 0 }
@@ -169,11 +166,9 @@ IntrospectedInterface *const IntrospectableAdaptor::introspect() const
}
IntrospectableProxy::IntrospectableProxy()
- : InterfaceProxy (introspectable_name)
-{}
+ : InterfaceProxy (introspectable_name) {}
-std::string IntrospectableProxy::Introspect()
-{
+std::string IntrospectableProxy::Introspect() {
DBus::CallMessage call;
call.member ("Introspect");
diff --git a/sflphone-common/libs/dbus-c++/src/message.cpp b/sflphone-common/libs/dbus-c++/src/message.cpp
index 4f3425e08dc23c67edac9d849f717d5a2d29ef11..0daa307b15db81efeaea3a720c5a5afbe5fe4c72 100644
--- a/sflphone-common/libs/dbus-c++/src/message.cpp
+++ b/sflphone-common/libs/dbus-c++/src/message.cpp
@@ -38,233 +38,194 @@ using namespace DBus;
/*
*/
-int MessageIter::type()
-{
+int MessageIter::type() {
return dbus_message_iter_get_arg_type ( (DBusMessageIter *) &_iter);
}
-bool MessageIter::at_end()
-{
+bool MessageIter::at_end() {
return type() == DBUS_TYPE_INVALID;
}
-bool MessageIter::has_next()
-{
+bool MessageIter::has_next() {
return dbus_message_iter_has_next ( (DBusMessageIter *) &_iter);
}
-MessageIter &MessageIter::operator ++()
-{
+MessageIter &MessageIter::operator ++() {
dbus_message_iter_next ( (DBusMessageIter *) &_iter);
return (*this);
}
-MessageIter MessageIter::operator ++ (int)
-{
+MessageIter MessageIter::operator ++ (int) {
MessageIter copy (*this);
++ (*this);
return copy;
}
-bool MessageIter::append_basic (int type_id, void *value)
-{
+bool MessageIter::append_basic (int type_id, void *value) {
return dbus_message_iter_append_basic ( (DBusMessageIter *) &_iter, type_id, value);
}
-void MessageIter::get_basic (int type_id, void *ptr)
-{
+void MessageIter::get_basic (int type_id, void *ptr) {
if (type() != type_id)
throw ErrorInvalidArgs ("type mismatch");
dbus_message_iter_get_basic ( (DBusMessageIter *) _iter, ptr);
}
-bool MessageIter::append_byte (unsigned char b)
-{
+bool MessageIter::append_byte (unsigned char b) {
return append_basic (DBUS_TYPE_BYTE, &b);
}
-unsigned char MessageIter::get_byte()
-{
+unsigned char MessageIter::get_byte() {
unsigned char b;
get_basic (DBUS_TYPE_BYTE, &b);
return b;
}
-bool MessageIter::append_bool (bool b)
-{
+bool MessageIter::append_bool (bool b) {
dbus_bool_t db = b;
return append_basic (DBUS_TYPE_BOOLEAN, &db);
}
-bool MessageIter::get_bool()
-{
+bool MessageIter::get_bool() {
dbus_bool_t db;
get_basic (DBUS_TYPE_BOOLEAN, &db);
return (bool) db;
}
-bool MessageIter::append_int16 (signed short i)
-{
+bool MessageIter::append_int16 (signed short i) {
return append_basic (DBUS_TYPE_INT16, &i);
}
-signed short MessageIter::get_int16()
-{
+signed short MessageIter::get_int16() {
signed short i;
get_basic (DBUS_TYPE_INT16, &i);
return i;
}
-bool MessageIter::append_uint16 (unsigned short u)
-{
+bool MessageIter::append_uint16 (unsigned short u) {
return append_basic (DBUS_TYPE_UINT16, &u);
}
-unsigned short MessageIter::get_uint16()
-{
+unsigned short MessageIter::get_uint16() {
unsigned short u;
get_basic (DBUS_TYPE_UINT16, &u);
return u;
}
-bool MessageIter::append_int32 (signed int i)
-{
+bool MessageIter::append_int32 (signed int i) {
return append_basic (DBUS_TYPE_INT32, &i);
}
-signed int MessageIter::get_int32()
-{
+signed int MessageIter::get_int32() {
signed int i;
get_basic (DBUS_TYPE_INT32, &i);
return i;
}
-bool MessageIter::append_uint32 (unsigned int u)
-{
+bool MessageIter::append_uint32 (unsigned int u) {
return append_basic (DBUS_TYPE_UINT32, &u);
}
-unsigned int MessageIter::get_uint32()
-{
+unsigned int MessageIter::get_uint32() {
unsigned int u;
get_basic (DBUS_TYPE_UINT32, &u);
return u;
}
-signed long long MessageIter::get_int64()
-{
+signed long long MessageIter::get_int64() {
signed long long i;
get_basic (DBUS_TYPE_INT64, &i);
return i;
}
-bool MessageIter::append_int64 (signed long long i)
-{
+bool MessageIter::append_int64 (signed long long i) {
return append_basic (DBUS_TYPE_INT64, &i);
}
-unsigned long long MessageIter::get_uint64()
-{
+unsigned long long MessageIter::get_uint64() {
unsigned long long u;
get_basic (DBUS_TYPE_UINT64, &u);
return u;
}
-bool MessageIter::append_uint64 (unsigned long long u)
-{
+bool MessageIter::append_uint64 (unsigned long long u) {
return append_basic (DBUS_TYPE_UINT64, &u);
}
-double MessageIter::get_double()
-{
+double MessageIter::get_double() {
double d;
get_basic (DBUS_TYPE_DOUBLE, &d);
return d;
}
-bool MessageIter::append_double (double d)
-{
+bool MessageIter::append_double (double d) {
return append_basic (DBUS_TYPE_DOUBLE, &d);
}
-bool MessageIter::append_string (const char *chars)
-{
+bool MessageIter::append_string (const char *chars) {
return append_basic (DBUS_TYPE_STRING, &chars);
}
-const char *MessageIter::get_string()
-{
+const char *MessageIter::get_string() {
char *chars;
get_basic (DBUS_TYPE_STRING, &chars);
return chars;
}
-bool MessageIter::append_path (const char *chars)
-{
+bool MessageIter::append_path (const char *chars) {
return append_basic (DBUS_TYPE_OBJECT_PATH, &chars);
}
-const char *MessageIter::get_path()
-{
+const char *MessageIter::get_path() {
char *chars;
get_basic (DBUS_TYPE_OBJECT_PATH, &chars);
return chars;
}
-bool MessageIter::append_signature (const char *chars)
-{
+bool MessageIter::append_signature (const char *chars) {
return append_basic (DBUS_TYPE_SIGNATURE, &chars);
}
-const char *MessageIter::get_signature()
-{
+const char *MessageIter::get_signature() {
char *chars;
get_basic (DBUS_TYPE_SIGNATURE, &chars);
return chars;
}
-MessageIter MessageIter::recurse()
-{
+MessageIter MessageIter::recurse() {
MessageIter iter (msg());
dbus_message_iter_recurse ( (DBusMessageIter *) &_iter, (DBusMessageIter *) & (iter._iter));
return iter;
}
-char *MessageIter::signature() const
-{
+char *MessageIter::signature() const {
return dbus_message_iter_get_signature ( (DBusMessageIter *) &_iter);
}
-bool MessageIter::append_array (char type, const void *ptr, size_t length)
-{
+bool MessageIter::append_array (char type, const void *ptr, size_t length) {
return dbus_message_iter_append_fixed_array ( (DBusMessageIter *) &_iter, type, &ptr, length);
}
-int MessageIter::array_type()
-{
+int MessageIter::array_type() {
return dbus_message_iter_get_element_type ( (DBusMessageIter *) &_iter);
}
-int MessageIter::get_array (void *ptr)
-{
+int MessageIter::get_array (void *ptr) {
int length;
dbus_message_iter_get_fixed_array ( (DBusMessageIter *) &_iter, ptr, &length);
return length;
}
-bool MessageIter::is_array()
-{
+bool MessageIter::is_array() {
return dbus_message_iter_get_arg_type ( (DBusMessageIter *) &_iter) == DBUS_TYPE_ARRAY;
}
-bool MessageIter::is_dict()
-{
+bool MessageIter::is_dict() {
return is_array() && dbus_message_iter_get_element_type ( (DBusMessageIter *) _iter) == DBUS_TYPE_DICT_ENTRY;
}
-MessageIter MessageIter::new_array (const char *sig)
-{
+MessageIter MessageIter::new_array (const char *sig) {
MessageIter arr (msg());
dbus_message_iter_open_container (
(DBusMessageIter *) &_iter, DBUS_TYPE_ARRAY, sig, (DBusMessageIter *) & (arr._iter)
@@ -272,8 +233,7 @@ MessageIter MessageIter::new_array (const char *sig)
return arr;
}
-MessageIter MessageIter::new_variant (const char *sig)
-{
+MessageIter MessageIter::new_variant (const char *sig) {
MessageIter var (msg());
dbus_message_iter_open_container (
(DBusMessageIter *) _iter, DBUS_TYPE_VARIANT, sig, (DBusMessageIter *) & (var._iter)
@@ -281,8 +241,7 @@ MessageIter MessageIter::new_variant (const char *sig)
return var;
}
-MessageIter MessageIter::new_struct()
-{
+MessageIter MessageIter::new_struct() {
MessageIter stu (msg());
dbus_message_iter_open_container (
(DBusMessageIter *) _iter, DBUS_TYPE_STRUCT, NULL, (DBusMessageIter *) & (stu._iter)
@@ -290,8 +249,7 @@ MessageIter MessageIter::new_struct()
return stu;
}
-MessageIter MessageIter::new_dict_entry()
-{
+MessageIter MessageIter::new_dict_entry() {
MessageIter ent (msg());
dbus_message_iter_open_container (
(DBusMessageIter *) _iter, DBUS_TYPE_DICT_ENTRY, NULL, (DBusMessageIter *) & (ent._iter)
@@ -299,13 +257,11 @@ MessageIter MessageIter::new_dict_entry()
return ent;
}
-void MessageIter::close_container (MessageIter &container)
-{
+void MessageIter::close_container (MessageIter &container) {
dbus_message_iter_close_container ( (DBusMessageIter *) &_iter, (DBusMessageIter *) & (container._iter));
}
-static bool is_basic_type (int typecode)
-{
+static bool is_basic_type (int typecode) {
switch (typecode) {
case 'y':
@@ -338,8 +294,7 @@ static bool is_basic_type (int typecode)
}
}
-void MessageIter::copy_data (MessageIter &to)
-{
+void MessageIter::copy_data (MessageIter &to) {
for (MessageIter &from = *this; !from.at_end(); ++from) {
if (is_basic_type (from.type())) {
debug_log ("copying basic type: %c", from.type());
@@ -373,29 +328,24 @@ void MessageIter::copy_data (MessageIter &to)
*/
Message::Message()
- : _pvt (new Private)
-{
+ : _pvt (new Private) {
}
Message::Message (Message::Private *p, bool incref)
- : _pvt (p)
-{
+ : _pvt (p) {
if (_pvt->msg && incref) dbus_message_ref (_pvt->msg);
}
Message::Message (const Message &m)
- : _pvt (m._pvt)
-{
+ : _pvt (m._pvt) {
dbus_message_ref (_pvt->msg);
}
-Message::~Message()
-{
+Message::~Message() {
dbus_message_unref (_pvt->msg);
}
-Message &Message::operator = (const Message &m)
-{
+Message &Message::operator = (const Message &m) {
if (&m != this) {
dbus_message_unref (_pvt->msg);
_pvt = m._pvt;
@@ -405,14 +355,12 @@ Message &Message::operator = (const Message &m)
return *this;
}
-Message Message::copy()
-{
+Message Message::copy() {
Private *pvt = new Private (dbus_message_copy (_pvt->msg));
return Message (pvt);
}
-bool Message::append (int first_type, ...)
-{
+bool Message::append (int first_type, ...) {
va_list vl;
va_start (vl, first_type);
@@ -422,70 +370,57 @@ bool Message::append (int first_type, ...)
return b;
}
-void Message::terminate()
-{
+void Message::terminate() {
dbus_message_append_args (_pvt->msg, DBUS_TYPE_INVALID);
}
-int Message::type() const
-{
+int Message::type() const {
return dbus_message_get_type (_pvt->msg);
}
-int Message::serial() const
-{
+int Message::serial() const {
return dbus_message_get_serial (_pvt->msg);
}
-int Message::reply_serial() const
-{
+int Message::reply_serial() const {
return dbus_message_get_reply_serial (_pvt->msg);
}
-bool Message::reply_serial (int s)
-{
+bool Message::reply_serial (int s) {
return dbus_message_set_reply_serial (_pvt->msg, s);
}
-const char *Message::sender() const
-{
+const char *Message::sender() const {
return dbus_message_get_sender (_pvt->msg);
}
-bool Message::sender (const char *s)
-{
+bool Message::sender (const char *s) {
return dbus_message_set_sender (_pvt->msg, s);
}
-const char *Message::destination() const
-{
+const char *Message::destination() const {
return dbus_message_get_destination (_pvt->msg);
}
-bool Message::destination (const char *s)
-{
+bool Message::destination (const char *s) {
return dbus_message_set_destination (_pvt->msg, s);
}
-bool Message::is_error() const
-{
+bool Message::is_error() const {
return type() == DBUS_MESSAGE_TYPE_ERROR;
}
-bool Message::is_signal (const char *interface, const char *member) const
-{
+bool Message::is_signal (const char *interface, const char *member) const {
return dbus_message_is_signal (_pvt->msg, interface, member);
}
-MessageIter Message::writer()
-{
+MessageIter Message::writer() {
MessageIter iter (*this);
dbus_message_iter_init_append (_pvt->msg, (DBusMessageIter *) & (iter._iter));
return iter;
}
-MessageIter Message::reader() const
-{
+MessageIter Message::reader() const {
MessageIter iter (const_cast<Message &> (*this));
dbus_message_iter_init (_pvt->msg, (DBusMessageIter *) & (iter._iter));
return iter;
@@ -494,153 +429,129 @@ MessageIter Message::reader() const
/*
*/
-ErrorMessage::ErrorMessage()
-{
+ErrorMessage::ErrorMessage() {
_pvt->msg = dbus_message_new (DBUS_MESSAGE_TYPE_ERROR);
}
-ErrorMessage::ErrorMessage (const Message &to_reply, const char *name, const char *message)
-{
+ErrorMessage::ErrorMessage (const Message &to_reply, const char *name, const char *message) {
_pvt->msg = dbus_message_new_error (to_reply._pvt->msg, name, message);
}
-bool ErrorMessage::operator == (const ErrorMessage &m) const
-{
+bool ErrorMessage::operator == (const ErrorMessage &m) const {
return dbus_message_is_error (_pvt->msg, m.name());
}
-const char *ErrorMessage::name() const
-{
+const char *ErrorMessage::name() const {
return dbus_message_get_error_name (_pvt->msg);
}
-bool ErrorMessage::name (const char *n)
-{
+bool ErrorMessage::name (const char *n) {
return dbus_message_set_error_name (_pvt->msg, n);
}
/*
*/
-SignalMessage::SignalMessage (const char *name)
-{
+SignalMessage::SignalMessage (const char *name) {
_pvt->msg = dbus_message_new (DBUS_MESSAGE_TYPE_SIGNAL);
member (name);
}
-SignalMessage::SignalMessage (const char *path, const char *interface, const char *name)
-{
+SignalMessage::SignalMessage (const char *path, const char *interface, const char *name) {
_pvt->msg = dbus_message_new_signal (path, interface, name);
}
-bool SignalMessage::operator == (const SignalMessage &m) const
-{
+bool SignalMessage::operator == (const SignalMessage &m) const {
return dbus_message_is_signal (_pvt->msg, m.interface(), m.member());
}
const char *SignalMessage::interface() const {
- return dbus_message_get_interface (_pvt->msg);
- }
+ return dbus_message_get_interface (_pvt->msg);
+}
bool SignalMessage::interface (const char *i) {
return dbus_message_set_interface (_pvt->msg, i);
}
-const char *SignalMessage::member() const
-{
+const char *SignalMessage::member() const {
return dbus_message_get_member (_pvt->msg);
}
-bool SignalMessage::member (const char *m)
-{
+bool SignalMessage::member (const char *m) {
return dbus_message_set_member (_pvt->msg, m);
}
-const char *SignalMessage::path() const
-{
+const char *SignalMessage::path() const {
return dbus_message_get_path (_pvt->msg);
}
-char ** SignalMessage::path_split() const
-{
+char ** SignalMessage::path_split() const {
char ** p;
dbus_message_get_path_decomposed (_pvt->msg, &p); //todo: return as a std::vector ?
return p;
}
-bool SignalMessage::path (const char *p)
-{
+bool SignalMessage::path (const char *p) {
return dbus_message_set_path (_pvt->msg, p);
}
/*
*/
-CallMessage::CallMessage()
-{
+CallMessage::CallMessage() {
_pvt->msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL);
}
-CallMessage::CallMessage (const char *dest, const char *path, const char *iface, const char *method)
-{
+CallMessage::CallMessage (const char *dest, const char *path, const char *iface, const char *method) {
_pvt->msg = dbus_message_new_method_call (dest, path, iface, method);
}
-bool CallMessage::operator == (const CallMessage &m) const
-{
+bool CallMessage::operator == (const CallMessage &m) const {
return dbus_message_is_method_call (_pvt->msg, m.interface(), m.member());
}
const char *CallMessage::interface() const {
- return dbus_message_get_interface (_pvt->msg);
- }
+ return dbus_message_get_interface (_pvt->msg);
+}
bool CallMessage::interface (const char *i) {
return dbus_message_set_interface (_pvt->msg, i);
}
-const char *CallMessage::member() const
-{
+const char *CallMessage::member() const {
return dbus_message_get_member (_pvt->msg);
}
-bool CallMessage::member (const char *m)
-{
+bool CallMessage::member (const char *m) {
return dbus_message_set_member (_pvt->msg, m);
}
-const char *CallMessage::path() const
-{
+const char *CallMessage::path() const {
return dbus_message_get_path (_pvt->msg);
}
-char ** CallMessage::path_split() const
-{
+char ** CallMessage::path_split() const {
char ** p;
dbus_message_get_path_decomposed (_pvt->msg, &p);
return p;
}
-bool CallMessage::path (const char *p)
-{
+bool CallMessage::path (const char *p) {
return dbus_message_set_path (_pvt->msg, p);
}
-const char *CallMessage::signature() const
-{
+const char *CallMessage::signature() const {
return dbus_message_get_signature (_pvt->msg);
}
/*
*/
-ReturnMessage::ReturnMessage (const CallMessage &callee)
-{
+ReturnMessage::ReturnMessage (const CallMessage &callee) {
_pvt = new Private (dbus_message_new_method_return (callee._pvt->msg));
}
-const char *ReturnMessage::signature() const
-{
+const char *ReturnMessage::signature() const {
return dbus_message_get_signature (_pvt->msg);
}
diff --git a/sflphone-common/libs/dbus-c++/src/object.cpp b/sflphone-common/libs/dbus-c++/src/object.cpp
index 4fa8cd15d11a099afae8a3ccbf52cbe2d0f1da90..a54122fdc8d27ec10cd4a277467bb9ee94688751 100644
--- a/sflphone-common/libs/dbus-c++/src/object.cpp
+++ b/sflphone-common/libs/dbus-c++/src/object.cpp
@@ -40,12 +40,10 @@
using namespace DBus;
Object::Object (Connection &conn, const Path &path, const char *service)
- : _conn (conn), _path (path), _service (service ? service : "")
-{
+ : _conn (conn), _path (path), _service (service ? service : "") {
}
-Object::~Object()
-{
+Object::~Object() {
}
struct ObjectAdaptor::Private {
@@ -59,13 +57,11 @@ static DBusObjectPathVTable _vtable = {
NULL, NULL, NULL, NULL
};
-void ObjectAdaptor::Private::unregister_function_stub (DBusConnection *conn, void *data)
-{
+void ObjectAdaptor::Private::unregister_function_stub (DBusConnection *conn, void *data) {
//TODO: what do we have to do here ?
}
-DBusHandlerResult ObjectAdaptor::Private::message_function_stub (DBusConnection *, DBusMessage *dmsg, void *data)
-{
+DBusHandlerResult ObjectAdaptor::Private::message_function_stub (DBusConnection *, DBusMessage *dmsg, void *data) {
ObjectAdaptor *o = static_cast<ObjectAdaptor *> (data);
if (o) {
@@ -89,8 +85,7 @@ DBusHandlerResult ObjectAdaptor::Private::message_function_stub (DBusConnection
typedef std::map<Path, ObjectAdaptor *> ObjectAdaptorTable;
static ObjectAdaptorTable _adaptor_table;
-ObjectAdaptor *ObjectAdaptor::from_path (const Path &path)
-{
+ObjectAdaptor *ObjectAdaptor::from_path (const Path &path) {
ObjectAdaptorTable::iterator ati = _adaptor_table.find (path);
if (ati != _adaptor_table.end())
@@ -99,8 +94,7 @@ ObjectAdaptor *ObjectAdaptor::from_path (const Path &path)
return NULL;
}
-ObjectAdaptorPList ObjectAdaptor::from_path_prefix (const std::string &prefix)
-{
+ObjectAdaptorPList ObjectAdaptor::from_path_prefix (const std::string &prefix) {
ObjectAdaptorPList ali;
ObjectAdaptorTable::iterator ati = _adaptor_table.begin();
@@ -117,8 +111,7 @@ ObjectAdaptorPList ObjectAdaptor::from_path_prefix (const std::string &prefix)
return ali;
}
-ObjectPathList ObjectAdaptor::child_nodes_from_prefix (const std::string &prefix)
-{
+ObjectPathList ObjectAdaptor::child_nodes_from_prefix (const std::string &prefix) {
ObjectPathList ali;
ObjectAdaptorTable::iterator ati = _adaptor_table.begin();
@@ -143,18 +136,15 @@ ObjectPathList ObjectAdaptor::child_nodes_from_prefix (const std::string &prefix
}
ObjectAdaptor::ObjectAdaptor (Connection &conn, const Path &path)
- : Object (conn, path, conn.unique_name())
-{
+ : Object (conn, path, conn.unique_name()) {
register_obj();
}
-ObjectAdaptor::~ObjectAdaptor()
-{
+ObjectAdaptor::~ObjectAdaptor() {
unregister_obj();
}
-void ObjectAdaptor::register_obj()
-{
+void ObjectAdaptor::register_obj() {
debug_log ("registering local object %s", path().c_str());
if (!dbus_connection_register_object_path (conn()._pvt->conn, path().c_str(), &_vtable, this)) {
@@ -164,8 +154,7 @@ void ObjectAdaptor::register_obj()
_adaptor_table[path() ] = this;
}
-void ObjectAdaptor::unregister_obj()
-{
+void ObjectAdaptor::unregister_obj() {
_adaptor_table.erase (path());
debug_log ("unregistering local object %s", path().c_str());
@@ -173,8 +162,7 @@ void ObjectAdaptor::unregister_obj()
dbus_connection_unregister_object_path (conn()._pvt->conn, path().c_str());
}
-void ObjectAdaptor::_emit_signal (SignalMessage &sig)
-{
+void ObjectAdaptor::_emit_signal (SignalMessage &sig) {
sig.path (path().c_str());
conn().send (sig);
@@ -184,8 +172,7 @@ struct ReturnLaterError {
const Tag *tag;
};
-bool ObjectAdaptor::handle_message (const Message &msg)
-{
+bool ObjectAdaptor::handle_message (const Message &msg) {
switch (msg.type()) {
case DBUS_MESSAGE_TYPE_METHOD_CALL: {
@@ -221,14 +208,12 @@ bool ObjectAdaptor::handle_message (const Message &msg)
}
}
-void ObjectAdaptor::return_later (const Tag *tag)
-{
+void ObjectAdaptor::return_later (const Tag *tag) {
ReturnLaterError rle = { tag };
throw rle;
}
-void ObjectAdaptor::return_now (Continuation *ret)
-{
+void ObjectAdaptor::return_now (Continuation *ret) {
ret->_conn.send (ret->_return);
ContinuationMap::iterator di = _continuations.find (ret->_tag);
@@ -238,8 +223,7 @@ void ObjectAdaptor::return_now (Continuation *ret)
_continuations.erase (di);
}
-void ObjectAdaptor::return_error (Continuation *ret, const Error error)
-{
+void ObjectAdaptor::return_error (Continuation *ret, const Error error) {
ret->_conn.send (ErrorMessage (ret->_call, error.name(), error.message()));
ContinuationMap::iterator di = _continuations.find (ret->_tag);
@@ -249,16 +233,14 @@ void ObjectAdaptor::return_error (Continuation *ret, const Error error)
_continuations.erase (di);
}
-ObjectAdaptor::Continuation *ObjectAdaptor::find_continuation (const Tag *tag)
-{
+ObjectAdaptor::Continuation *ObjectAdaptor::find_continuation (const Tag *tag) {
ContinuationMap::iterator di = _continuations.find (tag);
return di != _continuations.end() ? di->second : NULL;
}
ObjectAdaptor::Continuation::Continuation (Connection &conn, const CallMessage &call, const Tag *tag)
- : _conn (conn), _call (call), _return (_call), _tag (tag)
-{
+ : _conn (conn), _call (call), _return (_call), _tag (tag) {
_writer = _return.writer(); //todo: verify
}
@@ -266,18 +248,15 @@ ObjectAdaptor::Continuation::Continuation (Connection &conn, const CallMessage &
*/
ObjectProxy::ObjectProxy (Connection &conn, const Path &path, const char *service)
- : Object (conn, path, service)
-{
+ : Object (conn, path, service) {
register_obj();
}
-ObjectProxy::~ObjectProxy()
-{
+ObjectProxy::~ObjectProxy() {
unregister_obj();
}
-void ObjectProxy::register_obj()
-{
+void ObjectProxy::register_obj() {
debug_log ("registering remote object %s", path().c_str());
_filtered = new Callback<ObjectProxy, bool, const Message &> (this, &ObjectProxy::handle_message);
@@ -293,8 +272,7 @@ void ObjectProxy::register_obj()
}
}
-void ObjectProxy::unregister_obj()
-{
+void ObjectProxy::unregister_obj() {
debug_log ("unregistering remote object %s", path().c_str());
InterfaceProxyTable::const_iterator ii = _interfaces.begin();
@@ -308,8 +286,7 @@ void ObjectProxy::unregister_obj()
conn().remove_filter (_filtered);
}
-Message ObjectProxy::_invoke_method (CallMessage &call)
-{
+Message ObjectProxy::_invoke_method (CallMessage &call) {
if (call.path() == NULL)
call.path (path().c_str());
@@ -319,8 +296,7 @@ Message ObjectProxy::_invoke_method (CallMessage &call)
return conn().send_blocking (call);
}
-bool ObjectProxy::_invoke_method_noreply (CallMessage &call)
-{
+bool ObjectProxy::_invoke_method_noreply (CallMessage &call) {
if (call.path() == NULL)
call.path (path().c_str());
@@ -330,8 +306,7 @@ bool ObjectProxy::_invoke_method_noreply (CallMessage &call)
return conn().send (call);
}
-bool ObjectProxy::handle_message (const Message &msg)
-{
+bool ObjectProxy::handle_message (const Message &msg) {
switch (msg.type()) {
case DBUS_MESSAGE_TYPE_SIGNAL: {
diff --git a/sflphone-common/libs/dbus-c++/src/pendingcall.cpp b/sflphone-common/libs/dbus-c++/src/pendingcall.cpp
index 775561c21c3a733e99b1f2c0c17c7a7558245936..172e3e6d3932bc50c7a708446bebbb5ee8a1c866 100644
--- a/sflphone-common/libs/dbus-c++/src/pendingcall.cpp
+++ b/sflphone-common/libs/dbus-c++/src/pendingcall.cpp
@@ -36,22 +36,19 @@
using namespace DBus;
PendingCall::Private::Private (DBusPendingCall *dpc)
- : call (dpc), dataslot (-1)
-{
+ : call (dpc), dataslot (-1) {
if (!dbus_pending_call_allocate_data_slot (&dataslot)) {
throw ErrorNoMemory ("Unable to allocate data slot");
}
}
-PendingCall::Private::~Private()
-{
+PendingCall::Private::~Private() {
if (dataslot != -1) {
dbus_pending_call_allocate_data_slot (&dataslot);
}
}
-void PendingCall::Private::notify_stub (DBusPendingCall *dpc, void *data)
-{
+void PendingCall::Private::notify_stub (DBusPendingCall *dpc, void *data) {
PendingCall::Private *pvt = static_cast<PendingCall::Private *> (data);
PendingCall pc (pvt);
@@ -59,26 +56,22 @@ void PendingCall::Private::notify_stub (DBusPendingCall *dpc, void *data)
}
PendingCall::PendingCall (PendingCall::Private *p)
- : _pvt (p)
-{
+ : _pvt (p) {
if (!dbus_pending_call_set_notify (_pvt->call, Private::notify_stub, p, NULL)) {
throw ErrorNoMemory ("Unable to initialize pending call");
}
}
PendingCall::PendingCall (const PendingCall &c)
- : _pvt (c._pvt)
-{
+ : _pvt (c._pvt) {
dbus_pending_call_ref (_pvt->call);
}
-PendingCall::~PendingCall()
-{
+PendingCall::~PendingCall() {
dbus_pending_call_unref (_pvt->call);
}
-PendingCall &PendingCall::operator = (const PendingCall &c)
-{
+PendingCall &PendingCall::operator = (const PendingCall &c) {
if (&c != this) {
dbus_pending_call_unref (_pvt->call);
_pvt = c._pvt;
@@ -88,40 +81,33 @@ PendingCall &PendingCall::operator = (const PendingCall &c)
return *this;
}
-bool PendingCall::completed()
-{
+bool PendingCall::completed() {
return dbus_pending_call_get_completed (_pvt->call);
}
-void PendingCall::cancel()
-{
+void PendingCall::cancel() {
dbus_pending_call_cancel (_pvt->call);
}
-void PendingCall::block()
-{
+void PendingCall::block() {
dbus_pending_call_block (_pvt->call);
}
-void PendingCall::data (void *p)
-{
+void PendingCall::data (void *p) {
if (!dbus_pending_call_set_data (_pvt->call, _pvt->dataslot, p, NULL)) {
throw ErrorNoMemory ("Unable to initialize data slot");
}
}
-void *PendingCall::data()
-{
+void *PendingCall::data() {
return dbus_pending_call_get_data (_pvt->call, _pvt->dataslot);
}
-Slot<void, PendingCall &>& PendingCall::slot()
-{
+Slot<void, PendingCall &>& PendingCall::slot() {
return _pvt->slot;
}
-Message PendingCall::steal_reply()
-{
+Message PendingCall::steal_reply() {
DBusMessage *dmsg = dbus_pending_call_steal_reply (_pvt->call);
if (!dmsg) {
diff --git a/sflphone-common/libs/dbus-c++/src/property.cpp b/sflphone-common/libs/dbus-c++/src/property.cpp
index e8b02fdaded719b0b8d9e763e0dc42e7e9f8b42c..0afccd9b4cc7e9e3c311ae35f803e98eda540fe0 100644
--- a/sflphone-common/libs/dbus-c++/src/property.cpp
+++ b/sflphone-common/libs/dbus-c++/src/property.cpp
@@ -35,14 +35,12 @@ using namespace DBus;
static const char *properties_name = "org.freedesktop.DBus.Properties";
PropertiesAdaptor::PropertiesAdaptor()
- : InterfaceAdaptor (properties_name)
-{
+ : InterfaceAdaptor (properties_name) {
register_method (PropertiesAdaptor, Get, Get);
register_method (PropertiesAdaptor, Set, Set);
}
-Message PropertiesAdaptor::Get (const CallMessage &call)
-{
+Message PropertiesAdaptor::Get (const CallMessage &call) {
MessageIter ri = call.reader();
std::string iface_name;
@@ -73,8 +71,7 @@ Message PropertiesAdaptor::Get (const CallMessage &call)
return reply;
}
-Message PropertiesAdaptor::Set (const CallMessage &call)
-{
+Message PropertiesAdaptor::Set (const CallMessage &call) {
MessageIter ri = call.reader();
std::string iface_name;
@@ -97,8 +94,7 @@ Message PropertiesAdaptor::Set (const CallMessage &call)
return reply;
}
-IntrospectedInterface *const PropertiesAdaptor::introspect() const
-{
+IntrospectedInterface *const PropertiesAdaptor::introspect() const {
static IntrospectedArgument Get_args[] = {
{ "interface_name", "s", true },
{ "property_name", "s", true },
@@ -132,19 +128,16 @@ IntrospectedInterface *const PropertiesAdaptor::introspect() const
}
PropertiesProxy::PropertiesProxy()
- : InterfaceProxy (properties_name)
-{
+ : InterfaceProxy (properties_name) {
}
-Variant PropertiesProxy::Get (const std::string &iface, const std::string &property)
-{
+Variant PropertiesProxy::Get (const std::string &iface, const std::string &property) {
//todo
Variant v;
return v;
}
-void PropertiesProxy::Set (const std::string &iface, const std::string &property, const Variant &value)
-{
+void PropertiesProxy::Set (const std::string &iface, const std::string &property, const Variant &value) {
//todo
}
diff --git a/sflphone-common/libs/dbus-c++/src/server.cpp b/sflphone-common/libs/dbus-c++/src/server.cpp
index b3dbfe267b96254e70a3bc9dee77f48bb66dc97d..f2bc5d293870c4e092ed7073fb21ce7954307b44 100644
--- a/sflphone-common/libs/dbus-c++/src/server.cpp
+++ b/sflphone-common/libs/dbus-c++/src/server.cpp
@@ -36,16 +36,13 @@
using namespace DBus;
Server::Private::Private (DBusServer *s)
- : server (s)
-{
+ : server (s) {
}
-Server::Private::~Private()
-{
+Server::Private::~Private() {
}
-void Server::Private::on_new_conn_cb (DBusServer *server, DBusConnection *conn, void *data)
-{
+void Server::Private::on_new_conn_cb (DBusServer *server, DBusConnection *conn, void *data) {
Server *s = static_cast<Server *> (data);
Connection nc (new Connection::Private (conn, s->_pvt.get()));
@@ -57,8 +54,7 @@ void Server::Private::on_new_conn_cb (DBusServer *server, DBusConnection *conn,
debug_log ("incoming connection 0x%08x", conn);
}
-Server::Server (const char *address)
-{
+Server::Server (const char *address) {
InternalError e;
DBusServer *server = dbus_server_listen (address, e);
@@ -80,13 +76,11 @@ Server::Server(const Server &s)
dbus_server_ref(_pvt->server);
}
*/
-Server::~Server()
-{
+Server::~Server() {
dbus_server_unref (_pvt->server);
}
-Dispatcher *Server::setup (Dispatcher *dispatcher)
-{
+Dispatcher *Server::setup (Dispatcher *dispatcher) {
debug_log ("registering stubs for server %p", _pvt->server);
Dispatcher *prev = _pvt->dispatcher;
@@ -114,18 +108,15 @@ Dispatcher *Server::setup (Dispatcher *dispatcher)
return prev;
}
-bool Server::operator == (const Server &s) const
-{
+bool Server::operator == (const Server &s) const {
return _pvt->server == s._pvt->server;
}
-bool Server::listening() const
-{
+bool Server::listening() const {
return dbus_server_get_is_connected (_pvt->server);
}
-void Server::disconnect()
-{
+void Server::disconnect() {
dbus_server_disconnect (_pvt->server);
}
diff --git a/sflphone-common/libs/dbus-c++/src/types.cpp b/sflphone-common/libs/dbus-c++/src/types.cpp
index d8100258e69f5251b46f9df4164ff7aaa248f038..9e16bde4bd4c07c2bb3ee05ac9e332241b9fd2ce 100644
--- a/sflphone-common/libs/dbus-c++/src/types.cpp
+++ b/sflphone-common/libs/dbus-c++/src/types.cpp
@@ -37,20 +37,17 @@
using namespace DBus;
Variant::Variant()
- : _msg (CallMessage()) // dummy message used as temporary storage for variant data
-{
+ : _msg (CallMessage()) { // dummy message used as temporary storage for variant data
}
Variant::Variant (MessageIter &it)
- : _msg (CallMessage())
-{
+ : _msg (CallMessage()) {
MessageIter vi = it.recurse();
MessageIter mi = _msg.writer();
vi.copy_data (mi);
}
-Variant &Variant::operator = (const Variant &v)
-{
+Variant &Variant::operator = (const Variant &v) {
if (&v != this) {
_msg = v._msg;
}
@@ -58,14 +55,12 @@ Variant &Variant::operator = (const Variant &v)
return *this;
}
-void Variant::clear()
-{
+void Variant::clear() {
CallMessage empty;
_msg = empty;
}
-const Signature Variant::signature() const
-{
+const Signature Variant::signature() const {
char *sigbuf = reader().signature();
Signature signature = sigbuf;
@@ -75,8 +70,7 @@ const Signature Variant::signature() const
return signature;
}
-MessageIter &operator << (MessageIter &iter, const Variant &val)
-{
+MessageIter &operator << (MessageIter &iter, const Variant &val) {
const Signature sig = val.signature();
MessageIter rit = val.reader();
@@ -89,8 +83,7 @@ MessageIter &operator << (MessageIter &iter, const Variant &val)
return iter;
}
-MessageIter &operator >> (MessageIter &iter, Variant &val)
-{
+MessageIter &operator >> (MessageIter &iter, Variant &val) {
if (iter.type() != DBUS_TYPE_VARIANT)
throw ErrorInvalidArgs ("variant type expected");
diff --git a/sflphone-common/libs/dbus-c++/tools/generate_adaptor.cpp b/sflphone-common/libs/dbus-c++/tools/generate_adaptor.cpp
index c8f0cd6abb4d08c3951e6ff8da50c80a005c4e70..98721703facb188a635bac1ddadea8e415a0e74a 100644
--- a/sflphone-common/libs/dbus-c++/tools/generate_adaptor.cpp
+++ b/sflphone-common/libs/dbus-c++/tools/generate_adaptor.cpp
@@ -39,8 +39,7 @@ extern const char *dbus_includes;
/*! Generate adaptor code for a XML introspection
*/
-void generate_adaptor (Xml::Document &doc, const char *filename)
-{
+void generate_adaptor (Xml::Document &doc, const char *filename) {
ostringstream body;
ostringstream head;
vector <string> include_vector;
diff --git a/sflphone-common/libs/dbus-c++/tools/generate_proxy.cpp b/sflphone-common/libs/dbus-c++/tools/generate_proxy.cpp
index 288dfa4845ec403439fced710c63a3a56747dbca..95987f45c7a308d682cf43ef5fba2ae263b53bc3 100644
--- a/sflphone-common/libs/dbus-c++/tools/generate_proxy.cpp
+++ b/sflphone-common/libs/dbus-c++/tools/generate_proxy.cpp
@@ -39,8 +39,7 @@ extern const char *dbus_includes;
/*! Generate proxy code for a XML introspection
*/
-void generate_proxy (Xml::Document &doc, const char *filename)
-{
+void generate_proxy (Xml::Document &doc, const char *filename) {
ostringstream body;
ostringstream head;
vector <string> include_vector;
diff --git a/sflphone-common/libs/dbus-c++/tools/generator_utils.cpp b/sflphone-common/libs/dbus-c++/tools/generator_utils.cpp
index 9b5a364966a7631eeea48a7c2b421bd7737082e9..3549632ece299ee4f496d1a4bc53bb3b0c8d4cf3 100644
--- a/sflphone-common/libs/dbus-c++/tools/generator_utils.cpp
+++ b/sflphone-common/libs/dbus-c++/tools/generator_utils.cpp
@@ -42,22 +42,19 @@ const char *dbus_includes = "\n\
#include <cassert>\n\
";
- void underscorize (string &str)
- {
+ void underscorize (string &str) {
for (unsigned int i = 0; i < str.length(); ++i) {
if (!isalpha (str[i]) && !isdigit (str[i])) str[i] = '_';
}
}
- string stub_name (string name)
- {
+ string stub_name (string name) {
underscorize (name);
return "_" + name + "_stub";
}
- const char *atomic_type_to_string (char t)
- {
+ const char *atomic_type_to_string (char t) {
static struct {
char type;
@@ -88,8 +85,7 @@ const char *dbus_includes = "\n\
return atos[i].name;
}
- void _parse_signature (const string &signature, string &type, unsigned int &i)
- {
+ void _parse_signature (const string &signature, string &type, unsigned int &i) {
for (; i < signature.length(); ++i) {
switch (signature[i]) {
@@ -164,8 +160,7 @@ const char *dbus_includes = "\n\
}
}
- string signature_to_type (const string &signature)
- {
+ string signature_to_type (const string &signature) {
string type;
unsigned int i = 0;
_parse_signature (signature, type, i);
diff --git a/sflphone-common/libs/dbus-c++/tools/introspect.cpp b/sflphone-common/libs/dbus-c++/tools/introspect.cpp
index 88a767396139d976588c1d26464cceaa9153c6bb..7459007d548c921cf8c84d5c1374634d5645e115 100644
--- a/sflphone-common/libs/dbus-c++/tools/introspect.cpp
+++ b/sflphone-common/libs/dbus-c++/tools/introspect.cpp
@@ -32,8 +32,7 @@ static bool systembus;
static char *path;
static char *service;
-void niam (int sig)
-{
+void niam (int sig) {
DBus::Connection conn = systembus ? DBus::Connection::SystemBus() : DBus::Connection::SessionBus();
IntrospectedObject io (conn, path, service);
@@ -43,8 +42,7 @@ void niam (int sig)
dispatcher.leave();
}
-int main (int argc, char ** argv)
-{
+int main (int argc, char ** argv) {
signal (SIGTERM, niam);
signal (SIGINT, niam);
signal (SIGALRM, niam);
diff --git a/sflphone-common/libs/dbus-c++/tools/xml.cpp b/sflphone-common/libs/dbus-c++/tools/xml.cpp
index 2ba8635a3c9508d2f73e5cdeda87f84d7ed0b76c..0393f587ca85d0cf41bdf25071ba4c646172a636 100644
--- a/sflphone-common/libs/dbus-c++/tools/xml.cpp
+++ b/sflphone-common/libs/dbus-c++/tools/xml.cpp
@@ -28,8 +28,7 @@
#include <expat.h>
-std::istream &operator >> (std::istream &in, DBus::Xml::Document &doc)
-{
+std::istream &operator >> (std::istream &in, DBus::Xml::Document &doc) {
std::stringbuf xmlbuf;
in.get (xmlbuf, '\0');
doc.from_xml (xmlbuf.str());
@@ -37,8 +36,7 @@ std::istream &operator >> (std::istream &in, DBus::Xml::Document &doc)
return in;
}
-std::ostream &operator << (std::ostream &out, const DBus::Xml::Document &doc)
-{
+std::ostream &operator << (std::ostream &out, const DBus::Xml::Document &doc) {
return out << doc.to_xml();
}
@@ -46,8 +44,7 @@ using namespace DBus;
using namespace DBus::Xml;
-Error::Error (const char *error, int line, int column)
-{
+Error::Error (const char *error, int line, int column) {
std::ostringstream estream;
estream << "line " << line << ", column " << column << ": " << error;
@@ -56,8 +53,7 @@ Error::Error (const char *error, int line, int column)
}
Node::Node (const char *n, const char ** a)
- : name (n)
-{
+ : name (n) {
if (a)
for (int i = 0; a[i]; i += 2) {
_attrs[a[i]] = a[i+1];
@@ -66,8 +62,7 @@ Node::Node (const char *n, const char ** a)
}
}
-Nodes Nodes::operator[] (const std::string &key)
-{
+Nodes Nodes::operator[] (const std::string &key) {
Nodes result;
for (iterator i = begin(); i != end(); ++i) {
@@ -79,8 +74,7 @@ Nodes Nodes::operator[] (const std::string &key)
return result;
}
-Nodes Nodes::select (const std::string &attr, const std::string &value)
-{
+Nodes Nodes::select (const std::string &attr, const std::string &value) {
Nodes result;
for (iterator i = begin(); i != end(); ++i) {
@@ -91,8 +85,7 @@ Nodes Nodes::select (const std::string &attr, const std::string &value)
return result;
}
-Nodes Node::operator[] (const std::string &key)
-{
+Nodes Node::operator[] (const std::string &key) {
Nodes result;
if (key.length() == 0) return result;
@@ -105,24 +98,21 @@ Nodes Node::operator[] (const std::string &key)
return result;
}
-std::string Node::get (const std::string &attribute)
-{
+std::string Node::get (const std::string &attribute) {
if (_attrs.find (attribute) != _attrs.end())
return _attrs[attribute];
else
return "";
}
-void Node::set (const std::string &attribute, std::string value)
-{
+void Node::set (const std::string &attribute, std::string value) {
if (value.length())
_attrs[attribute] = value;
else
_attrs.erase (value);
}
-std::string Node::to_xml() const
-{
+std::string Node::to_xml() const {
std::string xml;
int depth = 0;
@@ -131,8 +121,7 @@ std::string Node::to_xml() const
return xml;
}
-void Node::_raw_xml (std::string &xml, int &depth) const
-{
+void Node::_raw_xml (std::string &xml, int &depth) const {
xml.append (depth *2, ' ');
xml.append ("<"+name);
@@ -167,18 +156,15 @@ void Node::_raw_xml (std::string &xml, int &depth) const
}
Document::Document()
- : root (0), _depth (0)
-{
+ : root (0), _depth (0) {
}
Document::Document (const std::string &xml)
- : root (0), _depth (0)
-{
+ : root (0), _depth (0) {
from_xml (xml);
}
-Document::~Document()
-{
+Document::~Document() {
delete root;
}
@@ -192,8 +178,7 @@ struct Document::Expat {
static void end_element_handler (void *data, const XML_Char *name);
};
-void Document::from_xml (const std::string &xml)
-{
+void Document::from_xml (const std::string &xml) {
_depth = 0;
delete root;
root = 0;
@@ -234,23 +219,19 @@ void Document::from_xml (const std::string &xml)
}
}
-std::string Document::to_xml() const
-{
+std::string Document::to_xml() const {
return root->to_xml();
}
void Document::Expat::start_doctype_decl_handler (
void *data, const XML_Char *name, const XML_Char *sysid, const XML_Char *pubid, int has_internal_subset
-)
-{
+) {
}
-void Document::Expat::end_doctype_decl_handler (void *data)
-{
+void Document::Expat::end_doctype_decl_handler (void *data) {
}
-void Document::Expat::start_element_handler (void *data, const XML_Char *name, const XML_Char **atts)
-{
+void Document::Expat::start_element_handler (void *data, const XML_Char *name, const XML_Char **atts) {
Document *doc = (Document *) data;
//debug_log("xml:%d -> %s", doc->_depth, name);
@@ -272,8 +253,7 @@ void Document::Expat::start_element_handler (void *data, const XML_Char *name, c
doc->_depth++;
}
-void Document::Expat::character_data_handler (void *data, const XML_Char *chars, int len)
-{
+void Document::Expat::character_data_handler (void *data, const XML_Char *chars, int len) {
Document *doc = (Document *) data;
Node *nod = doc->root;
@@ -294,8 +274,7 @@ void Document::Expat::character_data_handler (void *data, const XML_Char *chars,
nod->cdata = std::string (chars, x, y+1);
}
-void Document::Expat::end_element_handler (void *data, const XML_Char *name)
-{
+void Document::Expat::end_element_handler (void *data, const XML_Char *name) {
Document *doc = (Document *) data;
//debug_log("xml:%d <- %s", doc->_depth, name);
diff --git a/sflphone-common/libs/dbus-c++/tools/xml2cpp.cpp b/sflphone-common/libs/dbus-c++/tools/xml2cpp.cpp
index 3284d766753fdeb3baa39de951c56df43a88cea4..300a21d6cdc17e0ed1bec4467256d8c831abc198 100644
--- a/sflphone-common/libs/dbus-c++/tools/xml2cpp.cpp
+++ b/sflphone-common/libs/dbus-c++/tools/xml2cpp.cpp
@@ -42,8 +42,7 @@ using namespace DBus;
//typedef map<string,string> TypeCache;
-void usage (const char *argv0)
-{
+void usage (const char *argv0) {
cerr << endl << "Usage: " << argv0 << " <xmlfile> [ --proxy=<outfile.h> ] [ --adaptor=<outfile.h> ]"
<< endl << endl;
exit (-1);
@@ -62,8 +61,7 @@ bool is_atomic_type(const string &type)
return type.length() == 1 && char_to_atomic_type(type[0]) != DBUS_TYPE_INVALID;
}*/
-int main (int argc, char ** argv)
-{
+int main (int argc, char ** argv) {
if (argc < 2) {
usage (argv[0]);
}
@@ -82,11 +80,10 @@ int main (int argc, char ** argv)
if (!strncmp (argv[a], "--proxy=", 8)) {
proxy_mode = true;
proxy = argv[a] +8;
- } else
- if (!strncmp (argv[a], "--adaptor=", 10)) {
- adaptor_mode = true;
- adaptor = argv[a] +10;
- }
+ } else if (!strncmp (argv[a], "--adaptor=", 10)) {
+ adaptor_mode = true;
+ adaptor = argv[a] +10;
+ }
}
if (!proxy_mode && !adaptor_mode) usage (argv[0]);
diff --git a/sflphone-common/libs/utilspp/singleton/LifetimeLibrary.cpp b/sflphone-common/libs/utilspp/singleton/LifetimeLibrary.cpp
index 7f7afac3b23beb5eeeba4ee3c951a1dca5d81c48..6e71baddaad90bc1922457fcae4791c3b53cea3d 100644
--- a/sflphone-common/libs/utilspp/singleton/LifetimeLibrary.cpp
+++ b/sflphone-common/libs/utilspp/singleton/LifetimeLibrary.cpp
@@ -4,17 +4,14 @@
utilspp::LifetimeLibraryImpl::LifetimeLibraryImpl()
:
mTrackerArray (NULL),
- mNbElements (0)
-{}
+ mNbElements (0) {}
-utilspp::LifetimeLibraryImpl::~LifetimeLibraryImpl()
-{
+utilspp::LifetimeLibraryImpl::~LifetimeLibraryImpl() {
terminate();
}
void
-utilspp::LifetimeLibraryImpl::add (utilspp::PrivateMembers::LifetimeTracker *tracker)
-{
+utilspp::LifetimeLibraryImpl::add (utilspp::PrivateMembers::LifetimeTracker *tracker) {
utilspp::PrivateMembers::TrackerArray newArray = static_cast<
utilspp::PrivateMembers::TrackerArray > (std::realloc (mTrackerArray,
mNbElements + 1));
@@ -39,8 +36,7 @@ utilspp::LifetimeLibraryImpl::add (utilspp::PrivateMembers::LifetimeTracker *tra
};
void
-utilspp::LifetimeLibraryImpl::terminate()
-{
+utilspp::LifetimeLibraryImpl::terminate() {
//The number of elements MUST always be equal or over zero.
assert (mNbElements >= 0);
@@ -64,8 +60,7 @@ utilspp::LifetimeLibraryImpl::terminate()
}
unsigned int
-utilspp::getLongevity (utilspp::LifetimeLibraryImpl *)
-{
+utilspp::getLongevity (utilspp::LifetimeLibraryImpl *) {
return 0;
}
diff --git a/sflphone-common/libs/utilspp/singleton/PrivateMembers.cpp b/sflphone-common/libs/utilspp/singleton/PrivateMembers.cpp
index 194fbda664470c36a6f0d4264c8058726d82139d..a033e0c54c6255fca5144b7963c50ea2ace9ab07 100644
--- a/sflphone-common/libs/utilspp/singleton/PrivateMembers.cpp
+++ b/sflphone-common/libs/utilspp/singleton/PrivateMembers.cpp
@@ -10,24 +10,20 @@ int utilspp::PrivateMembers::mNbElements = 0;
utilspp::PrivateMembers::LifetimeTracker::LifetimeTracker (unsigned int
longevity)
:
- mLongevity (longevity)
-{}
+ mLongevity (longevity) {}
-utilspp::PrivateMembers::LifetimeTracker::~LifetimeTracker()
-{}
+utilspp::PrivateMembers::LifetimeTracker::~LifetimeTracker() {}
bool
utilspp::PrivateMembers::LifetimeTracker::compare (
const LifetimeTracker *l,
const LifetimeTracker *r
-)
-{
+) {
return l->mLongevity < r->mLongevity;
}
void
-utilspp::PrivateMembers::atExitFunc()
-{
+utilspp::PrivateMembers::atExitFunc() {
assert ( (mTrackerArray != NULL) &&
(mNbElements > 0));
diff --git a/sflphone-common/src/config/config.h b/sflphone-common/src/config/config.h
old mode 100755
new mode 100644
diff --git a/sflphone-common/src/dbus/callmanager.cpp b/sflphone-common/src/dbus/callmanager.cpp
index 4a12567c8bc8e9b0d9c8d1db873438a8e346e406..f8d17e629080ac786e9b90cb4b311dedf2c19efe 100644
--- a/sflphone-common/src/dbus/callmanager.cpp
+++ b/sflphone-common/src/dbus/callmanager.cpp
@@ -49,8 +49,8 @@ CallManager::CallManager (DBus::Connection& connection)
void
CallManager::placeCall (const std::string& accountID,
const std::string& callID,
- const std::string& to)
-{ // Check if a destination number is available
+ const std::string& to) // Check if a destination number is available
+{
if (to == "") _debug ("No number entered - Call stopped");
else Manager::instance().outgoingCall (accountID, callID, to);