telepathy-qt: dbus-tubes: Merge the constructors in PendingDBusTube

[Dario Freddi]

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

Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Tue Jun 14 14:44:53 2011 +0200

dbus-tubes: Merge the constructors in PendingDBusTube

---

 TelepathyQt/pending-dbus-tube.cpp |   19 +------------------
 TelepathyQt/pending-dbus-tube.h   |    3 +--
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/TelepathyQt/pending-dbus-tube.cpp b/TelepathyQt/pending-dbus-tube.cpp
index 7ab56b6..e021364 100644
--- a/TelepathyQt/pending-dbus-tube.cpp
+++ b/TelepathyQt/pending-dbus-tube.cpp
@@ -64,24 +64,7 @@ PendingDBusTube::Private::~Private()
 
 PendingDBusTube::PendingDBusTube(
         PendingString *string,
-        const IncomingDBusTubeChannelPtr &object)
-    : PendingOperation(object)
-    , mPriv(new Private(this))
-{
-    mPriv->tube = object;
-
-    if (string->isFinished()) {
-        onConnectionFinished(string);
-    } else {
-        // Connect the pending void
-        connect(string, SIGNAL(finished(Tp::PendingOperation*)),
-                this, SLOT(onConnectionFinished(Tp::PendingOperation*)));
-    }
-}
-
-PendingDBusTube::PendingDBusTube(
-        PendingString *string,
-        const OutgoingDBusTubeChannelPtr &object)
+        const DBusTubeChannelPtr &object)
     : PendingOperation(object)
     , mPriv(new Private(this))
 {
diff --git a/TelepathyQt/pending-dbus-tube.h b/TelepathyQt/pending-dbus-tube.h
index b4301a4..45948ac 100644
--- a/TelepathyQt/pending-dbus-tube.h
+++ b/TelepathyQt/pending-dbus-tube.h
@@ -50,8 +50,7 @@ private Q_SLOTS:
                                         const QString &errorMessage);
 
 private:
-    PendingDBusTube(PendingString *string, const OutgoingDBusTubeChannelPtr &object);
-    PendingDBusTube(PendingString *string, const IncomingDBusTubeChannelPtr &object);
+    PendingDBusTube(PendingString *string, const DBusTubeChannelPtr &object);
     PendingDBusTube(const QString &errorName, const QString &errorMessage,
                          const DBusTubeChannelPtr &object);