Make the create<Subclass>() methods of the service-side API return a SharedPtr<Subclass>

This avoids unnecessary casting after the new instance has been created.

3 files changed, 25 insertions, 19 deletions

diff --git a/TelepathyQt/base-connection-manager.h b/TelepathyQt/base-connection-manager.h
index ca337a91..e7b1efb3 100644
--- a/TelepathyQt/base-connection-manager.h
+++ b/TelepathyQt/base-connection-manager.h
@@ -50,9 +50,9 @@ public:
                     QDBusConnection::sessionBus(), name));
     }
     template<typename BaseConnectionManagerSubclass>
-    static BaseConnectionManagerPtr create(const QString &name)
+    static SharedPtr<BaseConnectionManagerSubclass> create(const QString &name)
     {
-        return BaseConnectionManagerPtr(new BaseConnectionManagerSubclass(
+        return SharedPtr<BaseConnectionManagerSubclass>(new BaseConnectionManagerSubclass(
                     QDBusConnection::sessionBus(), name));
     }
     static BaseConnectionManagerPtr create(const QDBusConnection &dbusConnection,
@@ -61,10 +61,11 @@ public:
         return BaseConnectionManagerPtr(new BaseConnectionManager(dbusConnection, name));
     }
     template<typename BaseConnectionManagerSubclass>
-    static BaseConnectionManagerPtr create(const QDBusConnection &dbusConnection,
+    static SharedPtr<BaseConnectionManagerSubclass> create(const QDBusConnection &dbusConnection,
             const QString &name)
     {
-        return BaseConnectionManagerPtr(new BaseConnectionManagerSubclass(dbusConnection, name));
+        return SharedPtr<BaseConnectionManagerSubclass>(new BaseConnectionManagerSubclass(
+                    dbusConnection, name));
     }
 
     virtual ~BaseConnectionManager();
diff --git a/TelepathyQt/base-connection.h b/TelepathyQt/base-connection.h
index 732105b0..8f4235e5 100644
--- a/TelepathyQt/base-connection.h
+++ b/TelepathyQt/base-connection.h
@@ -51,10 +51,10 @@ public:
                     QDBusConnection::sessionBus(), cmName, protocolName, parameters));
     }
     template<typename BaseConnectionSubclass>
-    static BaseConnectionPtr create(const QString &cmName, const QString &protocolName,
-            const QVariantMap &parameters)
+    static SharedPtr<BaseConnectionSubclass> create(const QString &cmName,
+            const QString &protocolName, const QVariantMap &parameters)
     {
-        return BaseConnectionPtr(new BaseConnectionSubclass(
+        return SharedPtr<BaseConnectionSubclass>(new BaseConnectionSubclass(
                     QDBusConnection::sessionBus(), cmName, protocolName, parameters));
     }
     static BaseConnectionPtr create(const QDBusConnection &dbusConnection,
@@ -65,11 +65,11 @@ public:
                     dbusConnection, cmName, protocolName, parameters));
     }
     template<typename BaseConnectionSubclass>
-    static BaseConnectionPtr create(const QDBusConnection &dbusConnection,
+    static SharedPtr<BaseConnectionSubclass> create(const QDBusConnection &dbusConnection,
             const QString &cmName, const QString &protocolName,
             const QVariantMap &parameters)
     {
-        return BaseConnectionPtr(new BaseConnectionSubclass(
+        return SharedPtr<BaseConnectionSubclass>(new BaseConnectionSubclass(
                     dbusConnection, cmName, protocolName, parameters));
     }
 
diff --git a/TelepathyQt/base-protocol.h b/TelepathyQt/base-protocol.h
index a20d627f..c1a691ec 100644
--- a/TelepathyQt/base-protocol.h
+++ b/TelepathyQt/base-protocol.h
@@ -55,18 +55,20 @@ public:
         return BaseProtocolPtr(new BaseProtocol(QDBusConnection::sessionBus(), name));
     }
     template<typename BaseProtocolSubclass>
-    static BaseProtocolPtr create(const QString &name)
+    static SharedPtr<BaseProtocolSubclass> create(const QString &name)
     {
-        return BaseProtocolPtr(new BaseProtocolSubclass(QDBusConnection::sessionBus(), name));
+        return SharedPtr<BaseProtocolSubclass>(new BaseProtocolSubclass(
+                QDBusConnection::sessionBus(), name));
     }
     static BaseProtocolPtr create(const QDBusConnection &dbusConnection, const QString &name)
     {
         return BaseProtocolPtr(new BaseProtocol(dbusConnection, name));
     }
     template<typename BaseProtocolSubclass>
-    static BaseProtocolPtr create(const QDBusConnection &dbusConnection, const QString &name)
+    static SharedPtr<BaseProtocolSubclass> create(const QDBusConnection &dbusConnection,
+            const QString &name)
     {
-        return BaseProtocolPtr(new BaseProtocolSubclass(dbusConnection, name));
+        return SharedPtr<BaseProtocolSubclass>(new BaseProtocolSubclass(dbusConnection, name));
     }
 
     virtual ~BaseProtocol();
@@ -156,9 +158,10 @@ public:
         return BaseProtocolAddressingInterfacePtr(new BaseProtocolAddressingInterface());
     }
     template<typename BaseProtocolAddressingInterfaceSubclass>
-    static BaseProtocolAddressingInterfacePtr create()
+    static SharedPtr<BaseProtocolAddressingInterfaceSubclass> create()
     {
-        return BaseProtocolAddressingInterfacePtr(new BaseProtocolAddressingInterfaceSubclass());
+        return SharedPtr<BaseProtocolAddressingInterfaceSubclass>(
+                new BaseProtocolAddressingInterfaceSubclass());
     }
 
     virtual ~BaseProtocolAddressingInterface();
@@ -203,9 +206,10 @@ public:
         return BaseProtocolAvatarsInterfacePtr(new BaseProtocolAvatarsInterface());
     }
     template<typename BaseProtocolAvatarsInterfaceSubclass>
-    static BaseProtocolAvatarsInterfacePtr create()
+    static SharedPtr<BaseProtocolAvatarsInterfaceSubclass> create()
     {
-        return BaseProtocolAvatarsInterfacePtr(new BaseProtocolAvatarsInterfaceSubclass());
+        return SharedPtr<BaseProtocolAvatarsInterfaceSubclass>(
+                new BaseProtocolAvatarsInterfaceSubclass());
     }
 
     virtual ~BaseProtocolAvatarsInterface();
@@ -239,9 +243,10 @@ public:
         return BaseProtocolPresenceInterfacePtr(new BaseProtocolPresenceInterface());
     }
     template<typename BaseProtocolPresenceInterfaceSubclass>
-    static BaseProtocolPresenceInterfacePtr create()
+    static SharedPtr<BaseProtocolPresenceInterfaceSubclass> create()
     {
-        return BaseProtocolPresenceInterfacePtr(new BaseProtocolPresenceInterfaceSubclass());
+        return SharedPtr<BaseProtocolPresenceInterfaceSubclass>(
+                new BaseProtocolPresenceInterfaceSubclass());
     }
 
     virtual ~BaseProtocolPresenceInterface();