From 85f21d766ef6e3c9574887a98d4b20070e7bd277 Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Mon, 27 Sep 2010 19:22:12 +0000 Subject: remove unnecessary stream argument in handleStanza funtion --- src/QXmppArchiveManager.cpp | 4 +- src/QXmppArchiveManager.h | 2 +- src/QXmppCallManager.cpp | 4 +- src/QXmppCallManager.h | 2 +- src/QXmppClient.cpp | 2 +- src/QXmppClientExtension.h | 2 +- src/QXmppDiscoveryManager.cpp | 358 ++++++++++++++++++++--------------------- src/QXmppDiscoveryManager.h | 2 +- src/QXmppEntityTimeManager.cpp | 4 +- src/QXmppEntityTimeManager.h | 2 +- src/QXmppMucManager.cpp | 4 +- src/QXmppMucManager.h | 2 +- src/QXmppRosterManager.cpp | 4 +- src/QXmppRosterManager.h | 2 +- src/QXmppTransferManager.cpp | 4 +- src/QXmppTransferManager.h | 2 +- src/QXmppVCardManager.cpp | 4 +- src/QXmppVCardManager.h | 2 +- src/QXmppVersionManager.cpp | 4 +- src/QXmppVersionManager.h | 2 +- 20 files changed, 198 insertions(+), 214 deletions(-) (limited to 'src') diff --git a/src/QXmppArchiveManager.cpp b/src/QXmppArchiveManager.cpp index 55fe65ef..e6aa5fc6 100644 --- a/src/QXmppArchiveManager.cpp +++ b/src/QXmppArchiveManager.cpp @@ -42,10 +42,8 @@ void QXmppArchiveManager::archivePrefIqReceived(const QXmppArchivePrefIq &prefIq Q_UNUSED(prefIq); } -bool QXmppArchiveManager::handleStanza(QXmppStream *stream, const QDomElement &element) +bool QXmppArchiveManager::handleStanza(const QDomElement &element) { - Q_UNUSED(stream); - if (element.tagName() != "iq") return false; diff --git a/src/QXmppArchiveManager.h b/src/QXmppArchiveManager.h index 5c01074c..10008000 100644 --- a/src/QXmppArchiveManager.h +++ b/src/QXmppArchiveManager.h @@ -50,7 +50,7 @@ public: void retrieveCollection(const QString &jid, const QDateTime &start, int max = 0); /// \cond - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); /// \endcond signals: diff --git a/src/QXmppCallManager.cpp b/src/QXmppCallManager.cpp index 6853e1bb..f312ab6d 100644 --- a/src/QXmppCallManager.cpp +++ b/src/QXmppCallManager.cpp @@ -426,10 +426,8 @@ QStringList QXmppCallManager::discoveryFeatures() const << ns_jingle_ice_udp; // XEP-0176 : Jingle ICE-UDP Transport Method } -bool QXmppCallManager::handleStanza(QXmppStream *stream, const QDomElement &element) +bool QXmppCallManager::handleStanza(const QDomElement &element) { - Q_UNUSED(stream); - if(element.tagName() == "iq") { // XEP-0166: Jingle diff --git a/src/QXmppCallManager.h b/src/QXmppCallManager.h index 358a09a9..35361ec2 100644 --- a/src/QXmppCallManager.h +++ b/src/QXmppCallManager.h @@ -186,7 +186,7 @@ public: /// \cond QStringList discoveryFeatures() const; - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); /// \endcond signals: diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp index b971af65..5ee06699 100644 --- a/src/QXmppClient.cpp +++ b/src/QXmppClient.cpp @@ -571,7 +571,7 @@ void QXmppClient::slotElementReceived(const QDomElement &element, bool &handled) { foreach (QXmppClientExtension *extension, d->extensions) { - if (extension->handleStanza(d->stream, element)) + if (extension->handleStanza(element)) { handled = true; return; diff --git a/src/QXmppClientExtension.h b/src/QXmppClientExtension.h index 2a5dccb6..e6326688 100644 --- a/src/QXmppClientExtension.h +++ b/src/QXmppClientExtension.h @@ -46,7 +46,7 @@ public: virtual ~QXmppClientExtension(); virtual QStringList discoveryFeatures() const; - virtual bool handleStanza(QXmppStream *stream, const QDomElement &stanza) = 0; + virtual bool handleStanza(const QDomElement &stanza) = 0; signals: /// This signal is emitted to send logging messages. diff --git a/src/QXmppDiscoveryManager.cpp b/src/QXmppDiscoveryManager.cpp index 6c061dd7..8c4a8512 100644 --- a/src/QXmppDiscoveryManager.cpp +++ b/src/QXmppDiscoveryManager.cpp @@ -1,179 +1,179 @@ -/* - * Copyright (C) 2008-2010 The QXmpp developers - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - -#include "QXmppDiscoveryManager.h" - -#include -#include - -#include "QXmppClient.h" -#include "QXmppConstants.h" -#include "QXmppDiscoveryIq.h" -#include "QXmppStream.h" -#include "QXmppGlobal.h" - -QXmppDiscoveryManager::QXmppDiscoveryManager() : QXmppClientExtension(), - m_clientCategory("client"), - m_clientType("pc"), - m_clientName(QString("%1 %2").arg(qApp->applicationName(), qApp->applicationVersion())) -{ - if(qApp->applicationName().isEmpty() && qApp->applicationVersion().isEmpty()) - { - m_clientName = QString("%1 %2").arg("Based on QXmpp", QXmppVersion()); - } -} - -bool QXmppDiscoveryManager::handleStanza(QXmppStream *stream, const QDomElement &element) -{ - if (element.tagName() == "iq" && QXmppDiscoveryIq::isDiscoveryIq(element)) - { - QXmppDiscoveryIq receivedIq; - receivedIq.parse(element); - - if(receivedIq.type() == QXmppIq::Get && - receivedIq.queryType() == QXmppDiscoveryIq::InfoQuery && - (receivedIq.queryNode().isEmpty() || receivedIq.queryNode().startsWith(QString(capabilities_node)))) - { - // respond to query - QXmppDiscoveryIq qxmppFeatures = capabilities(); - qxmppFeatures.setId(receivedIq.id()); - qxmppFeatures.setTo(receivedIq.from()); - qxmppFeatures.setQueryNode(receivedIq.queryNode()); - stream->sendPacket(qxmppFeatures); - } - else if(receivedIq.queryType() == QXmppDiscoveryIq::InfoQuery) - emit infoReceived(receivedIq); - else if(receivedIq.queryType() == QXmppDiscoveryIq::ItemsQuery) - emit itemsReceived(receivedIq); - - return true; - } - return false; -} - -QString QXmppDiscoveryManager::requestInfo(const QString& jid, const QString& node) -{ - QXmppDiscoveryIq request; - request.setType(QXmppIq::Get); - request.setQueryType(QXmppDiscoveryIq::InfoQuery); - request.setTo(jid); - request.setFrom(client()->configuration().jid()); - if(!node.isEmpty()) - request.setQueryNode(node); - if(client()->sendPacket(request)) - return request.id(); - else - return ""; -} - -QString QXmppDiscoveryManager::requestItems(const QString& jid, const QString& node) -{ - QXmppDiscoveryIq request; - request.setType(QXmppIq::Get); - request.setQueryType(QXmppDiscoveryIq::ItemsQuery); - request.setTo(jid); - request.setFrom(client()->configuration().jid()); - if(!node.isEmpty()) - request.setQueryNode(node); - if(client()->sendPacket(request)) - return request.id(); - else - return ""; -} - -QStringList QXmppDiscoveryManager::discoveryFeatures() const -{ - return QStringList() << ns_disco_info; -} - -QXmppDiscoveryIq QXmppDiscoveryManager::capabilities() -{ - QXmppDiscoveryIq iq; - iq.setType(QXmppIq::Result); - iq.setQueryType(QXmppDiscoveryIq::InfoQuery); - - // features - QStringList features; - features - << ns_rpc // XEP-0009: Jabber-RPC -// << ns_vcard // XEP-0054: vcard-temp - << ns_chat_states // XEP-0085: Chat State Notifications - << ns_capabilities // XEP-0115 : Entity Capabilities - << ns_ping; // XEP-0199: XMPP Ping - - foreach(QXmppClientExtension* extension, client()->extensions()) - { - if(extension) - features << extension->discoveryFeatures(); - } - - iq.setFeatures(features); - - // TODO: get identities from the extensions itself like the features - // identities - QList identities; - QXmppDiscoveryIq::Identity identity; - - identity.setCategory("automation"); - identity.setType("rpc"); - identities.append(identity); - - identity.setCategory(clientCategory()); - identity.setType(clientType()); - identity.setName(clientName()); - identities.append(identity); - - iq.setIdentities(identities); - return iq; -} - -/// http://xmpp.org/registrar/disco-categories.html#client -void QXmppDiscoveryManager::setClientCategory(const QString& category) -{ - m_clientCategory = category; -} - -void QXmppDiscoveryManager::setClientType(const QString& type) -{ - m_clientType = type; -} - -void QXmppDiscoveryManager::setClientName(const QString& name) -{ - m_clientName = name; -} - -QString QXmppDiscoveryManager::clientCategory() -{ - return m_clientCategory; -} - -QString QXmppDiscoveryManager::clientType() -{ - return m_clientType; -} - -QString QXmppDiscoveryManager::clientName() -{ - return m_clientName; -} +/* + * Copyright (C) 2008-2010 The QXmpp developers + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#include "QXmppDiscoveryManager.h" + +#include +#include + +#include "QXmppClient.h" +#include "QXmppConstants.h" +#include "QXmppDiscoveryIq.h" +#include "QXmppStream.h" +#include "QXmppGlobal.h" + +QXmppDiscoveryManager::QXmppDiscoveryManager() : QXmppClientExtension(), + m_clientCategory("client"), + m_clientType("pc"), + m_clientName(QString("%1 %2").arg(qApp->applicationName(), qApp->applicationVersion())) +{ + if(qApp->applicationName().isEmpty() && qApp->applicationVersion().isEmpty()) + { + m_clientName = QString("%1 %2").arg("Based on QXmpp", QXmppVersion()); + } +} + +bool QXmppDiscoveryManager::handleStanza(const QDomElement &element) +{ + if (element.tagName() == "iq" && QXmppDiscoveryIq::isDiscoveryIq(element)) + { + QXmppDiscoveryIq receivedIq; + receivedIq.parse(element); + + if(receivedIq.type() == QXmppIq::Get && + receivedIq.queryType() == QXmppDiscoveryIq::InfoQuery && + (receivedIq.queryNode().isEmpty() || receivedIq.queryNode().startsWith(QString(capabilities_node)))) + { + // respond to query + QXmppDiscoveryIq qxmppFeatures = capabilities(); + qxmppFeatures.setId(receivedIq.id()); + qxmppFeatures.setTo(receivedIq.from()); + qxmppFeatures.setQueryNode(receivedIq.queryNode()); + client()->sendPacket(qxmppFeatures); + } + else if(receivedIq.queryType() == QXmppDiscoveryIq::InfoQuery) + emit infoReceived(receivedIq); + else if(receivedIq.queryType() == QXmppDiscoveryIq::ItemsQuery) + emit itemsReceived(receivedIq); + + return true; + } + return false; +} + +QString QXmppDiscoveryManager::requestInfo(const QString& jid, const QString& node) +{ + QXmppDiscoveryIq request; + request.setType(QXmppIq::Get); + request.setQueryType(QXmppDiscoveryIq::InfoQuery); + request.setTo(jid); + request.setFrom(client()->configuration().jid()); + if(!node.isEmpty()) + request.setQueryNode(node); + if(client()->sendPacket(request)) + return request.id(); + else + return ""; +} + +QString QXmppDiscoveryManager::requestItems(const QString& jid, const QString& node) +{ + QXmppDiscoveryIq request; + request.setType(QXmppIq::Get); + request.setQueryType(QXmppDiscoveryIq::ItemsQuery); + request.setTo(jid); + request.setFrom(client()->configuration().jid()); + if(!node.isEmpty()) + request.setQueryNode(node); + if(client()->sendPacket(request)) + return request.id(); + else + return ""; +} + +QStringList QXmppDiscoveryManager::discoveryFeatures() const +{ + return QStringList() << ns_disco_info; +} + +QXmppDiscoveryIq QXmppDiscoveryManager::capabilities() +{ + QXmppDiscoveryIq iq; + iq.setType(QXmppIq::Result); + iq.setQueryType(QXmppDiscoveryIq::InfoQuery); + + // features + QStringList features; + features + << ns_rpc // XEP-0009: Jabber-RPC +// << ns_vcard // XEP-0054: vcard-temp + << ns_chat_states // XEP-0085: Chat State Notifications + << ns_capabilities // XEP-0115 : Entity Capabilities + << ns_ping; // XEP-0199: XMPP Ping + + foreach(QXmppClientExtension* extension, client()->extensions()) + { + if(extension) + features << extension->discoveryFeatures(); + } + + iq.setFeatures(features); + + // TODO: get identities from the extensions itself like the features + // identities + QList identities; + QXmppDiscoveryIq::Identity identity; + + identity.setCategory("automation"); + identity.setType("rpc"); + identities.append(identity); + + identity.setCategory(clientCategory()); + identity.setType(clientType()); + identity.setName(clientName()); + identities.append(identity); + + iq.setIdentities(identities); + return iq; +} + +/// http://xmpp.org/registrar/disco-categories.html#client +void QXmppDiscoveryManager::setClientCategory(const QString& category) +{ + m_clientCategory = category; +} + +void QXmppDiscoveryManager::setClientType(const QString& type) +{ + m_clientType = type; +} + +void QXmppDiscoveryManager::setClientName(const QString& name) +{ + m_clientName = name; +} + +QString QXmppDiscoveryManager::clientCategory() +{ + return m_clientCategory; +} + +QString QXmppDiscoveryManager::clientType() +{ + return m_clientType; +} + +QString QXmppDiscoveryManager::clientName() +{ + return m_clientName; +} diff --git a/src/QXmppDiscoveryManager.h b/src/QXmppDiscoveryManager.h index ab39ef46..942fad6f 100644 --- a/src/QXmppDiscoveryManager.h +++ b/src/QXmppDiscoveryManager.h @@ -53,7 +53,7 @@ public: /// \cond QStringList discoveryFeatures() const; - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); QXmppDiscoveryIq capabilities(); /// \endcond diff --git a/src/QXmppEntityTimeManager.cpp b/src/QXmppEntityTimeManager.cpp index b301d28d..c69feb12 100644 --- a/src/QXmppEntityTimeManager.cpp +++ b/src/QXmppEntityTimeManager.cpp @@ -49,10 +49,8 @@ QStringList QXmppEntityTimeManager::discoveryFeatures() const return QStringList() << ns_entity_time; } -bool QXmppEntityTimeManager::handleStanza(QXmppStream *stream, const QDomElement &element) +bool QXmppEntityTimeManager::handleStanza(const QDomElement &element) { - Q_UNUSED(stream); - if(element.tagName() == "iq" && QXmppEntityTimeIq::isEntityTimeIq(element)) { QXmppEntityTimeIq entityTime; diff --git a/src/QXmppEntityTimeManager.h b/src/QXmppEntityTimeManager.h index 09a59ca6..434de4af 100644 --- a/src/QXmppEntityTimeManager.h +++ b/src/QXmppEntityTimeManager.h @@ -43,7 +43,7 @@ public: /// \cond QStringList discoveryFeatures() const; - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); /// \endcond signals: diff --git a/src/QXmppMucManager.cpp b/src/QXmppMucManager.cpp index e1ebaeb2..574360a8 100644 --- a/src/QXmppMucManager.cpp +++ b/src/QXmppMucManager.cpp @@ -51,10 +51,8 @@ QStringList QXmppMucManager::discoveryFeatures() const << ns_muc_user; } -bool QXmppMucManager::handleStanza(QXmppStream *stream, const QDomElement &element) +bool QXmppMucManager::handleStanza(const QDomElement &element) { - Q_UNUSED(stream); - if (element.tagName() == "iq") { if (QXmppMucAdminIq::isMucAdminIq(element)) diff --git a/src/QXmppMucManager.h b/src/QXmppMucManager.h index 621d4f76..a33b7580 100644 --- a/src/QXmppMucManager.h +++ b/src/QXmppMucManager.h @@ -64,7 +64,7 @@ public: /// \cond QStringList discoveryFeatures() const; - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); /// \endcond signals: diff --git a/src/QXmppRosterManager.cpp b/src/QXmppRosterManager.cpp index ac1ff1d3..24efca1b 100644 --- a/src/QXmppRosterManager.cpp +++ b/src/QXmppRosterManager.cpp @@ -69,10 +69,8 @@ void QXmppRosterManager::disconnected() m_isRosterReceived = false; } -bool QXmppRosterManager::handleStanza(QXmppStream *stream, const QDomElement &element) +bool QXmppRosterManager::handleStanza(const QDomElement &element) { - Q_UNUSED(stream); - if(element.tagName() == "iq" && QXmppRosterIq::isRosterIq(element)) { QXmppRosterIq rosterIq; diff --git a/src/QXmppRosterManager.h b/src/QXmppRosterManager.h index 6ceca453..4fd57022 100644 --- a/src/QXmppRosterManager.h +++ b/src/QXmppRosterManager.h @@ -82,7 +82,7 @@ public: const QString& resource) const; /// \cond - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); /// \endcond // deprecated in release 0.2.0 diff --git a/src/QXmppTransferManager.cpp b/src/QXmppTransferManager.cpp index e168eacc..4071817a 100644 --- a/src/QXmppTransferManager.cpp +++ b/src/QXmppTransferManager.cpp @@ -580,10 +580,8 @@ QStringList QXmppTransferManager::discoveryFeatures() const << ns_stream_initiation_file_transfer; // XEP-0096: SI File Transfer } -bool QXmppTransferManager::handleStanza(QXmppStream *stream, const QDomElement &element) +bool QXmppTransferManager::handleStanza(const QDomElement &element) { - Q_UNUSED(stream); - if (element.tagName() != "iq") return false; diff --git a/src/QXmppTransferManager.h b/src/QXmppTransferManager.h index e5498a27..f4d025e7 100644 --- a/src/QXmppTransferManager.h +++ b/src/QXmppTransferManager.h @@ -230,7 +230,7 @@ public: /// \cond QStringList discoveryFeatures() const; - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); /// \endcond signals: diff --git a/src/QXmppVCardManager.cpp b/src/QXmppVCardManager.cpp index e776f647..7535d13b 100644 --- a/src/QXmppVCardManager.cpp +++ b/src/QXmppVCardManager.cpp @@ -39,10 +39,8 @@ QStringList QXmppVCardManager::discoveryFeatures() const return QStringList() << ns_vcard; } -bool QXmppVCardManager::handleStanza(QXmppStream *stream, const QDomElement &element) +bool QXmppVCardManager::handleStanza(const QDomElement &element) { - Q_UNUSED(stream); - if(element.tagName() == "iq" && QXmppVCardIq::isVCard(element)) { QXmppVCardIq vCardIq; diff --git a/src/QXmppVCardManager.h b/src/QXmppVCardManager.h index 552c97e2..739838e8 100644 --- a/src/QXmppVCardManager.h +++ b/src/QXmppVCardManager.h @@ -72,7 +72,7 @@ public: /// \cond QStringList discoveryFeatures() const; - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); /// \endcond signals: diff --git a/src/QXmppVersionManager.cpp b/src/QXmppVersionManager.cpp index 3c3ec599..d953d74d 100644 --- a/src/QXmppVersionManager.cpp +++ b/src/QXmppVersionManager.cpp @@ -47,10 +47,8 @@ QStringList QXmppVersionManager::discoveryFeatures() const return QStringList() << ns_version; } -bool QXmppVersionManager::handleStanza(QXmppStream *stream, const QDomElement &element) +bool QXmppVersionManager::handleStanza(const QDomElement &element) { - Q_UNUSED(stream); - if (element.tagName() == "iq" && QXmppVersionIq::isVersionIq(element)) { QXmppVersionIq versionIq; diff --git a/src/QXmppVersionManager.h b/src/QXmppVersionManager.h index b2da936b..5c87842a 100644 --- a/src/QXmppVersionManager.h +++ b/src/QXmppVersionManager.h @@ -51,7 +51,7 @@ public: /// \cond QStringList discoveryFeatures() const; - bool handleStanza(QXmppStream *stream, const QDomElement &element); + bool handleStanza(const QDomElement &element); /// \endcond signals: -- cgit v1.2.3