telepathy-qt: BaseConnection: Merged two pair of create() methods.

[Alexandr Akulich]

Module: telepathy-qt
Branch: master
Commit: bbeba4e00e52f0cfdb78283d1d882eed973fa4fc
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=bbeba4e00e52f0cfdb78283d1d882eed973fa4fc

Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Tue Apr 21 09:57:06 2015 +0500

BaseConnection: Merged two pair of create() methods.

Made dbusConnection argument be optional with the default QDBusConnection::sessionBus().

Reviewed-by: David Edmundson

---

 TelepathyQt/base-connection.h |   23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/TelepathyQt/base-connection.h b/TelepathyQt/base-connection.h
index 2452087..c1b39f1 100644
--- a/TelepathyQt/base-connection.h
+++ b/TelepathyQt/base-connection.h
@@ -48,26 +48,17 @@ class TP_QT_EXPORT BaseConnection : public DBusService
 
 public:
     static BaseConnectionPtr create(const QString &cmName, const QString &protocolName,
-                                    const QVariantMap &parameters) {
-        return BaseConnectionPtr(new BaseConnection(
-                                     QDBusConnection::sessionBus(), cmName, protocolName, parameters));
-    }
-    template<typename BaseConnectionSubclass>
-    static SharedPtr<BaseConnectionSubclass> create(const QString &cmName,
-            const QString &protocolName, const QVariantMap &parameters) {
-        return SharedPtr<BaseConnectionSubclass>(new BaseConnectionSubclass(
-                    QDBusConnection::sessionBus(), cmName, protocolName, parameters));
-    }
-    static BaseConnectionPtr create(const QDBusConnection &dbusConnection,
-                                    const QString &cmName, const QString &protocolName,
-                                    const QVariantMap &parameters) {
+                                    const QVariantMap &parameters,
+                                    const QDBusConnection &dbusConnection = QDBusConnection::sessionBus())
+    {
         return BaseConnectionPtr(new BaseConnection(
                                      dbusConnection, cmName, protocolName, parameters));
     }
     template<typename BaseConnectionSubclass>
-    static SharedPtr<BaseConnectionSubclass> create(const QDBusConnection &dbusConnection,
-            const QString &cmName, const QString &protocolName,
-            const QVariantMap &parameters) {
+    static SharedPtr<BaseConnectionSubclass> create(const QString &cmName,
+            const QString &protocolName, const QVariantMap &parameters,
+            const QDBusConnection &dbusConnection = QDBusConnection::sessionBus())
+    {
         return SharedPtr<BaseConnectionSubclass>(new BaseConnectionSubclass(
                     dbusConnection, cmName, protocolName, parameters));
     }