aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2010-12-13 14:19:28 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2010-12-13 14:19:28 +0000
commit2438fdc4517bec48b9207c4c0b177957d4c7b023 (patch)
treedca747116bfcd50f6cae5744aa2f1710d47e2da8 /src
parent165729e2647e9337f18a0c81230ba914698fdf26 (diff)
downloadqxmpp-2438fdc4517bec48b9207c4c0b177957d4c7b023.tar.gz
remove "client" argument from QXmppCallManager constructor
Diffstat (limited to 'src')
-rw-r--r--src/QXmppCallManager.cpp18
-rw-r--r--src/QXmppCallManager.h9
2 files changed, 18 insertions, 9 deletions
diff --git a/src/QXmppCallManager.cpp b/src/QXmppCallManager.cpp
index 28ff0f71..042d03b0 100644
--- a/src/QXmppCallManager.cpp
+++ b/src/QXmppCallManager.cpp
@@ -281,16 +281,10 @@ bool QXmppCallManagerPrivate::sendRequest(QXmppCall *call, const QXmppJingleIq &
/// Constructs a QXmppCallManager object to handle incoming and outgoing
/// Voice-Over-IP calls.
///
-/// \param client
-QXmppCallManager::QXmppCallManager(QXmppClient *client)
+QXmppCallManager::QXmppCallManager()
{
d = new QXmppCallManagerPrivate(this);
-
- bool check = connect(client, SIGNAL(iqReceived(QXmppIq)),
- this, SLOT(iqReceived(QXmppIq)));
- Q_ASSERT(check);
- Q_UNUSED(check);
}
/// Destroys the QXmppCallManager object.
@@ -326,6 +320,16 @@ bool QXmppCallManager::handleStanza(const QDomElement &element)
return false;
}
+void QXmppCallManager::setClient(QXmppClient *client)
+{
+ QXmppClientExtension::setClient(client);
+
+ bool check = connect(client, SIGNAL(iqReceived(QXmppIq)),
+ this, SLOT(iqReceived(QXmppIq)));
+ Q_ASSERT(check);
+ Q_UNUSED(check);
+}
+
/// Initiates a new outgoing call to the specified recipient.
///
/// \param jid
diff --git a/src/QXmppCallManager.h b/src/QXmppCallManager.h
index 26d6f382..83c34f62 100644
--- a/src/QXmppCallManager.h
+++ b/src/QXmppCallManager.h
@@ -134,7 +134,7 @@ private:
/// the QXmppClient instance as follows:
///
/// \code
-/// QXmppCallManager *manager = new QXmppCallManager(client);
+/// QXmppCallManager *manager = new QXmppCallManager;
/// client->addExtension(manager);
/// \endcode
///
@@ -145,7 +145,7 @@ class QXmppCallManager : public QXmppClientExtension
Q_OBJECT
public:
- QXmppCallManager(QXmppClient *client);
+ QXmppCallManager();
~QXmppCallManager();
QXmppCall *call(const QString &jid);
@@ -161,6 +161,11 @@ signals:
/// To refuse the call, invoke the call's QXmppCall::hangup() method.
void callReceived(QXmppCall *call);
+protected:
+ /// \cond
+ void setClient(QXmppClient* client);
+ /// \endcond
+
private slots:
void callDestroyed(QObject *object);
void callStateChanged(QXmppCall::State state);