From 0b606b76e679c587fb14c2472de1b809954f29bf Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Mon, 7 Sep 2009 15:17:44 +0000 Subject: XEP-0054: vcard-temp implementation and other code cleanups --- source/QXmppClient.cpp | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'source/QXmppClient.cpp') diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp index 7fcfe1fb..1403b393 100644 --- a/source/QXmppClient.cpp +++ b/source/QXmppClient.cpp @@ -34,12 +34,12 @@ QXmppClient::QXmppClient(QObject *parent) { m_stream = new QXmppStream(this); - bool check = connect(m_stream, SIGNAL(messageReceived(const QXmppMessage&)), this, - SIGNAL(messageReceived(const QXmppMessage&))); + bool check = connect(m_stream, SIGNAL(messageReceived(const QXmppMessage&)), + this, SIGNAL(messageReceived(const QXmppMessage&))); Q_ASSERT(check); - check = connect(m_stream, SIGNAL(presenceReceived(const QXmppPresence&)), this, - SIGNAL(presenceReceived(const QXmppPresence&))); + check = connect(m_stream, SIGNAL(presenceReceived(const QXmppPresence&)), + this, SIGNAL(presenceReceived(const QXmppPresence&))); Q_ASSERT(check); check = connect(m_stream, SIGNAL(iqReceived(const QXmppIq&)), this, @@ -70,8 +70,10 @@ QXmppConfiguration& QXmppClient::getConfiguration() return m_config; } -void QXmppClient::connectToServer(const QString& host, const QString& user, const QString& passwd, - const QString& domain, int port, const QXmppPresence& initialPresence) +void QXmppClient::connectToServer(const QString& host, const QString& user, + const QString& passwd, const QString& domain, + int port, + const QXmppPresence& initialPresence) { m_config.setHost(host); m_config.setUser(user); @@ -84,7 +86,8 @@ void QXmppClient::connectToServer(const QString& host, const QString& user, cons m_stream->connect(); } -void QXmppClient::connectToServer(const QXmppConfiguration& config, const QXmppPresence& initialPresence) +void QXmppClient::connectToServer(const QXmppConfiguration& config, + const QXmppPresence& initialPresence) { m_config = config; @@ -172,18 +175,20 @@ QXmppReconnectionManager* QXmppClient::getReconnectionManager() return m_reconnectionManager; } -bool QXmppClient::setReconnectionManager(QXmppReconnectionManager* reconnectionManager) +bool QXmppClient::setReconnectionManager(QXmppReconnectionManager* + reconnectionManager) { if(m_reconnectionManager) delete m_reconnectionManager; m_reconnectionManager = reconnectionManager; - bool check = connect(this, SIGNAL(connected()), m_reconnectionManager, SLOT(connected())); + bool check = connect(this, SIGNAL(connected()), m_reconnectionManager, + SLOT(connected())); Q_ASSERT(check); - check = connect(this, SIGNAL(error(QXmppClient::Error)), m_reconnectionManager, - SLOT(error(QXmppClient::Error))); + check = connect(this, SIGNAL(error(QXmppClient::Error)), + m_reconnectionManager, SLOT(error(QXmppClient::Error))); Q_ASSERT(check); } @@ -191,3 +196,8 @@ QAbstractSocket::SocketError QXmppClient::getSocketError() { return m_stream->getSocketError(); } + +QXmppVCardManager& QXmppClient::getVCardManager() +{ + return m_stream->getVCardManager(); +} -- cgit v1.2.3