[telepathy-qt4/master] ClientRegistrar: Unite the create methods and use a default bus parameter.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/client-registrar.cpp |   18 +-----------------
 TelepathyQt4/client-registrar.h   |    4 ++--
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/TelepathyQt4/client-registrar.cpp b/TelepathyQt4/client-registrar.cpp
index ca615b0..4c68ea4 100644
--- a/TelepathyQt4/client-registrar.cpp
+++ b/TelepathyQt4/client-registrar.cpp
@@ -321,7 +321,7 @@ struct ClientRegistrar::Private
  *
  * You can also provide a D-Bus connection as a QDBusConnection:
  *
- * \code ClientRegistrarPtr cr = ClientRegistrar::create(QDBusConnection::sessionBus()); \endcode
+ * \code ClientRegistrarPtr cr = ClientRegistrar::create(QDBusConnection::systemBus()); \endcode
  *
  * \subsection registering_sec Registering a client
  *
@@ -349,22 +349,6 @@ struct ClientRegistrar::Private
 QHash<QPair<QString, QString>, ClientRegistrar*> ClientRegistrar::registrarForConnection;
 
 /**
- * Create a new client registrar object using QDBusConnection::sessionBus().
- *
- * ClientRegistrar instances are unique per D-Bus connection. The returned
- * ClientRegistrarPtr will point to the same ClientRegistrar instance on
- * successive calls, unless the instance had already been destroyed, in which
- * case a new instance will be returned.
- *
- * \return A ClientRegistrarPtr object pointing to the ClientRegistrar.
- */
-ClientRegistrarPtr ClientRegistrar::create()
-{
-    QDBusConnection bus = QDBusConnection::sessionBus();
-    return create(bus);
-}
-
-/**
  * Create a new client registrar object using the given \a bus.
  *
  * ClientRegistrar instances are unique per D-Bus connection. The returned
diff --git a/TelepathyQt4/client-registrar.h b/TelepathyQt4/client-registrar.h
index 80b2a70..bf896ee 100644
--- a/TelepathyQt4/client-registrar.h
+++ b/TelepathyQt4/client-registrar.h
@@ -42,8 +42,8 @@ class ClientRegistrar : public QObject, public RefCounted
     Q_DISABLE_COPY(ClientRegistrar)
 
 public:
-    static ClientRegistrarPtr create();
-    static ClientRegistrarPtr create(const QDBusConnection &bus);
+    static ClientRegistrarPtr create(
+            const QDBusConnection &bus = QDBusConnection::sessionBus());
     ~ClientRegistrar();
 
     QDBusConnection dbusConnection() const;
-- 
1.5.6.5