Merge commit 'origin/master'

2 files changed, 26 insertions, 3 deletions

diff --git a/libdbus-qeventloop/dbusconnectioneventloop.cpp b/libdbus-qeventloop/dbusconnectioneventloop.cpp
index 9d7a255..2c040b2 100644
--- a/libdbus-qeventloop/dbusconnectioneventloop.cpp
+++ b/libdbus-qeventloop/dbusconnectioneventloop.cpp
@@ -241,7 +241,7 @@ void DBUSConnectionEventLoop::wakeupMain(void *data)
 }
 
 // The initialization point
-bool DBUSConnectionEventLoop::initConnection(DBusConnection* conn)
+bool DBUSConnectionEventLoop::addConnection(DBusConnection* conn)
 {
     bool rc;
 
diff --git a/libdbus-qeventloop/dbusconnectioneventloop.h b/libdbus-qeventloop/dbusconnectioneventloop.h
index 6f8d8e7..993c5c1 100644
--- a/libdbus-qeventloop/dbusconnectioneventloop.h
+++ b/libdbus-qeventloop/dbusconnectioneventloop.h
@@ -41,6 +41,11 @@
 class QSocketNotifier;
 class QTimerEvent;
 
+/**
+* This class is handling dbus notifications with QT events. QEventLoop must
+*  be handled in order to handle dbus events.
+* Usage: DBUSConnectionEventLoop myLoop; myLoop.addConnection(bus);
+*/
 class DBUSConnectionEventLoop : public QObject
 {
 	Q_OBJECT
@@ -52,8 +57,15 @@ public:
     virtual ~DBUSConnectionEventLoop();
 
 public:
-	bool initConnection(DBusConnection* conn);
-
+    /**
+     * Add new dbus connection into handler.
+     * \return true if everything went well.
+     */
+	bool addConnection(DBusConnection* conn);
+
+    /**
+     * Helper class for dbus watcher
+     */
     class Watcher
     {
     public:
@@ -68,8 +80,19 @@ public:
     typedef QHash<int, DBusTimeout*> 	Timeouts;
     typedef QList<DBusConnection*>		Connections;
 
+    /**
+     * DBusWatcher objects
+     */
     Watchers 	watchers;
+
+    /**
+     * DBusTimeout objects
+     */
     Timeouts 	timeouts;
+
+    /**
+     * DBusConnection objects
+     */
     Connections	connections;
 
 public slots: