- coding style

diff --git a/dbus/DBusConnection.cc b/dbus/DBusConnection.cc
index a29165222e4ac35ce1128cb03ee5d759dbac47b7..145d1d3d0c3aa42ea791cb9b57000c3fcf3a77e6 100644 (file)
--- a/dbus/DBusConnection.cc
+++ b/dbus/DBusConnection.cc
@@ -146,6 +146,7 @@ namespace DBus
     Connection::pop_message()
     {
        boost::lock_guard<boost::mutex> lock(mutex);
+
        return dbus_connection_pop_message(conn);
     }
 

diff --git a/dbus/DBusConnection.h b/dbus/DBusConnection.h
index bdd6b624c59fe7b80b867bbe534e0de9b274e02f..e54c07692d67d547eaaaa93020cc1c39cb81df7d 100644 (file)
--- a/dbus/DBusConnection.h
+++ b/dbus/DBusConnection.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef SNAPPER_DBUSCONNECTION_H
-#define SNAPPER_DBUSCONNECTION_H
+#ifndef SNAPPER_DBUS_CONNECTION_H
+#define SNAPPER_DBUS_CONNECTION_H
 
 
 #include <dbus/dbus.h>

diff --git a/dbus/DBusMainLoop.cc b/dbus/DBusMainLoop.cc
index 909dd449e3fd7f8d82f0bc779dedb1c9e8c3c545..a354f59a305ca029ab295f964552d2004c4c2ff0 100644 (file)
--- a/dbus/DBusMainLoop.cc
+++ b/dbus/DBusMainLoop.cc
@@ -30,7 +30,7 @@ namespace DBus
 {
 
     MainLoop::Watch::Watch(DBusWatch* dbus_watch)
-       : dbus_watch(dbus_watch), enabled(false), fd(-1), events(0)
+       : dbus_watch(dbus_watch)
     {
        enabled = dbus_watch_get_enabled(dbus_watch);
        fd = dbus_watch_get_unix_fd(dbus_watch);
@@ -44,7 +44,7 @@ namespace DBus
 
 
     MainLoop::Timeout::Timeout(DBusTimeout* dbus_timeout)
-       : dbus_timeout(dbus_timeout), enabled(false), interval(0)
+       : dbus_timeout(dbus_timeout)
     {
        enabled = dbus_timeout_get_enabled(dbus_timeout);
        interval = dbus_timeout_get_interval(dbus_timeout);

diff --git a/dbus/DBusMainLoop.h b/dbus/DBusMainLoop.h
index 15786578c8bae7b80e8026e919c460ce45c2c000..444d4ebf9dea1ab3d42f31724cab24136c1c4462 100644 (file)
--- a/dbus/DBusMainLoop.h
+++ b/dbus/DBusMainLoop.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef SNAPPER_DBUSMAINLOOP_H
-#define SNAPPER_DBUSMAINLOOP_H
+#ifndef SNAPPER_DBUS_MAIN_LOOP_H
+#define SNAPPER_DBUS_MAIN_LOOP_H
 
 
 #include <dbus/dbus.h>
@@ -64,9 +64,9 @@ namespace DBus
            Watch(DBusWatch* dbus_watch);
 
            DBusWatch* dbus_watch;
-           bool enabled;
-           int fd;
-           short events;
+           bool enabled = false;
+           int fd = -1;
+           short events = 0;
        };
 
        struct Timeout
@@ -74,8 +74,8 @@ namespace DBus
            Timeout(DBusTimeout* dbus_timeout);
 
            DBusTimeout* dbus_timeout;
-           bool enabled;
-           int interval;
+           bool enabled = false;
+           int interval = 0;
        };
 
        vector<Watch> watches;

diff --git a/dbus/DBusMessage.h b/dbus/DBusMessage.h
index 33cf0fb12f55324d58a9725854ac3812af0d66d0..d3d89912d434b427a8f188b3128f6c1f5ce7c9c2 100644 (file)
--- a/dbus/DBusMessage.h
+++ b/dbus/DBusMessage.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef SNAPPER_DBUSMESSAGE_H
-#define SNAPPER_DBUSMESSAGE_H
+#ifndef SNAPPER_DBUS_MESSAGE_H
+#define SNAPPER_DBUS_MESSAGE_H
 
 
 #include <dbus/dbus.h>

diff --git a/dbus/DBusPipe.h b/dbus/DBusPipe.h
index b5b181c667e185462d17bd2d0586f6959b0b153e..13a15a6124b7e84814abdf65944867994614a2f4 100644 (file)
--- a/dbus/DBusPipe.h
+++ b/dbus/DBusPipe.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef SNAPPER_DBUSPIPE_H
-#define SNAPPER_DBUSPIPE_H
+#ifndef SNAPPER_DBUS_PIPE_H
+#define SNAPPER_DBUS_PIPE_H
 
 
 #include <boost/noncopyable.hpp>