[telepathy-qt4/master] ChannelRequest: Use only one constructor that receives the QDBusConnection object.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Mon Jun 1 21:40:42 PDT 2009


---
 TelepathyQt4/channel-request.cpp |   16 ++--------------
 TelepathyQt4/channel-request.h   |    2 --
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/TelepathyQt4/channel-request.cpp b/TelepathyQt4/channel-request.cpp
index d668448..8cb310f 100644
--- a/TelepathyQt4/channel-request.cpp
+++ b/TelepathyQt4/channel-request.cpp
@@ -180,8 +180,8 @@ const Feature ChannelRequest::FeatureCore = Feature(ChannelRequest::staticMetaOb
 ChannelRequestPtr ChannelRequest::create(const QString &objectPath,
         const QVariantMap &immutableProperties)
 {
-    return ChannelRequestPtr(new ChannelRequest(objectPath,
-                immutableProperties));
+    return ChannelRequestPtr(new ChannelRequest(QDBusConnection::sessionBus(),
+                objectPath, immutableProperties));
 }
 
 ChannelRequestPtr ChannelRequest::create(const QDBusConnection &bus,
@@ -191,18 +191,6 @@ ChannelRequestPtr ChannelRequest::create(const QDBusConnection &bus,
                 immutableProperties));
 }
 
-ChannelRequest::ChannelRequest(const QString &objectPath,
-        const QVariantMap &immutableProperties)
-    : StatefulDBusProxy(QDBusConnection::sessionBus(),
-            "org.freedesktop.Telepathy.ChannelDispatcher",
-            objectPath),
-      OptionalInterfaceFactory<ChannelRequest>(this),
-      ReadyObject(this, FeatureCore),
-      mPriv(new Private(this))
-{
-    mPriv->extractMainProps(immutableProperties);
-}
-
 ChannelRequest::ChannelRequest(const QDBusConnection &bus,
         const QString &objectPath, const QVariantMap &immutableProperties)
     : StatefulDBusProxy(bus,
diff --git a/TelepathyQt4/channel-request.h b/TelepathyQt4/channel-request.h
index 752ba20..7334400 100644
--- a/TelepathyQt4/channel-request.h
+++ b/TelepathyQt4/channel-request.h
@@ -100,8 +100,6 @@ Q_SIGNALS:
     void succeeded();
 
 protected:
-    ChannelRequest(const QString &objectPath,
-            const QVariantMap &immutableProperties);
     ChannelRequest(const QDBusConnection &bus,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list