doc fixes

14 files changed, 150 insertions, 122 deletions

diff --git a/src/client/QXmppArchiveManager.cpp b/src/client/QXmppArchiveManager.cpp
index f8a476e7..cef1f0a9 100644
--- a/src/client/QXmppArchiveManager.cpp
+++ b/src/client/QXmppArchiveManager.cpp
@@ -28,6 +28,7 @@
 #include "QXmppClient.h"
 #include "QXmppConstants.h"
 
+/// \cond
 QStringList QXmppArchiveManager::discoveryFeatures() const
 {
     // XEP-0036: Message Archiving
@@ -64,6 +65,7 @@ bool QXmppArchiveManager::handleStanza(const QDomElement &element)
 
     return false;
 }
+/// \endcond
 
 /// Retrieves the list of available collections. Once the results are
 /// received, the archiveListReceived() signal will be emitted.
diff --git a/src/client/QXmppBookmarkManager.cpp b/src/client/QXmppBookmarkManager.cpp
index 1eaa139e..ac7b6967 100644
--- a/src/client/QXmppBookmarkManager.cpp
+++ b/src/client/QXmppBookmarkManager.cpp
@@ -142,6 +142,7 @@ bool QXmppBookmarkManager::setBookmarks(const QXmppBookmarkSet &bookmarks)
     return true;
 }
 
+/// \cond
 void QXmppBookmarkManager::setClient(QXmppClient *client)
 {
     bool check;
@@ -190,6 +191,7 @@ bool QXmppBookmarkManager::handleStanza(const QDomElement &stanza)
     }
     return false;
 }
+/// \endcond
 
 void QXmppBookmarkManager::slotConnected()
 {
diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index 334d5747..7ccea61c 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -769,6 +769,7 @@ QXmppCallManager::~QXmppCallManager()
     delete d;
 }
 
+/// \cond
 QStringList QXmppCallManager::discoveryFeatures() const
 {
     return QStringList()
@@ -815,6 +816,7 @@ void QXmppCallManager::setClient(QXmppClient *client)
                     this, SLOT(_q_presenceReceived(QXmppPresence)));
     Q_ASSERT(check);
 }
+/// \endcond
 
 /// Initiates a new outgoing call to the specified recipient.
 ///
diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp
index 4f06a4ef..ff4a20fa 100644
--- a/src/client/QXmppDiscoveryManager.cpp
+++ b/src/client/QXmppDiscoveryManager.cpp
@@ -58,34 +58,6 @@ QXmppDiscoveryManager::~QXmppDiscoveryManager()
     delete d;
 }
 
-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(d->clientCapabilitiesNode)))
-        {
-            // 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;
-}
-
 /// Requests information from the specified XMPP entity.
 ///
 /// \param jid  The target entity's JID.
@@ -124,10 +96,7 @@ QString QXmppDiscoveryManager::requestItems(const QString& jid, const QString& n
         return QString();
 }
 
-QStringList QXmppDiscoveryManager::discoveryFeatures() const
-{
-    return QStringList() << ns_disco_info;
-}
+/// Returns the client's full capabilities.
 
 QXmppDiscoveryIq QXmppDiscoveryManager::capabilities()
 {
@@ -250,3 +219,38 @@ QString QXmppDiscoveryManager::clientName() const
 {
     return d->clientName;
 }
+
+/// \cond
+QStringList QXmppDiscoveryManager::discoveryFeatures() const
+{
+    return QStringList() << ns_disco_info;
+}
+
+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(d->clientCapabilitiesNode)))
+        {
+            // 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;
+}
+/// \endcond
diff --git a/src/client/QXmppDiscoveryManager.h b/src/client/QXmppDiscoveryManager.h
index f492a154..822e26cf 100644
--- a/src/client/QXmppDiscoveryManager.h
+++ b/src/client/QXmppDiscoveryManager.h
@@ -42,6 +42,8 @@ public:
     QXmppDiscoveryManager();
     ~QXmppDiscoveryManager();
 
+    QXmppDiscoveryIq capabilities();
+
     QString requestInfo(const QString& jid, const QString& node = "");
     QString requestItems(const QString& jid, const QString& node = "");
 
@@ -61,7 +63,6 @@ public:
     /// \cond
     QStringList discoveryFeatures() const;
     bool handleStanza(const QDomElement &element);
-    QXmppDiscoveryIq capabilities();
     /// \endcond
 
 signals:
diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp
index 7c70c707..eab78bb3 100644
--- a/src/client/QXmppEntityTimeManager.cpp
+++ b/src/client/QXmppEntityTimeManager.cpp
@@ -47,6 +47,7 @@ QString QXmppEntityTimeManager::requestTime(const QString& jid)
         return QString();
 }
 
+/// \cond
 QStringList QXmppEntityTimeManager::discoveryFeatures() const
 {
     return QStringList() << ns_entity_time;
@@ -83,3 +84,4 @@ bool QXmppEntityTimeManager::handleStanza(const QDomElement &element)
 
     return false;
 }
+/// \endcond
diff --git a/src/client/QXmppMessageReceiptManager.cpp b/src/client/QXmppMessageReceiptManager.cpp
index f8763e0a..f3e55a58 100644
--- a/src/client/QXmppMessageReceiptManager.cpp
+++ b/src/client/QXmppMessageReceiptManager.cpp
@@ -38,6 +38,7 @@ QXmppMessageReceiptManager::QXmppMessageReceiptManager()
 {
 }
 
+/// \cond
 QStringList QXmppMessageReceiptManager::discoveryFeatures() const
 {
     return QStringList(ns_message_receipts);
@@ -70,3 +71,4 @@ bool QXmppMessageReceiptManager::handleStanza(const QDomElement &stanza)
     // Continue processing.
     return false;
 }
+/// \endcond
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index ec31fbdd..222d14de 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -92,18 +92,7 @@ QList<QXmppMucRoom*> QXmppMucManager::rooms() const
     return d->rooms.values();
 }
 
-void QXmppMucManager::setClient(QXmppClient* client)
-{
-    bool check;
-    Q_UNUSED(check);
-
-    QXmppClientExtension::setClient(client);
-
-    check = connect(client, SIGNAL(messageReceived(QXmppMessage)),
-                    this, SLOT(_q_messageReceived(QXmppMessage)));
-    Q_ASSERT(check);
-}
-
+/// \cond
 QStringList QXmppMucManager::discoveryFeatures() const
 {
     // XEP-0045: Multi-User Chat
@@ -151,6 +140,19 @@ bool QXmppMucManager::handleStanza(const QDomElement &element)
     return false;
 }
 
+void QXmppMucManager::setClient(QXmppClient* client)
+{
+    bool check;
+    Q_UNUSED(check);
+
+    QXmppClientExtension::setClient(client);
+
+    check = connect(client, SIGNAL(messageReceived(QXmppMessage)),
+                    this, SLOT(_q_messageReceived(QXmppMessage)));
+    Q_ASSERT(check);
+}
+/// \endcond
+
 void QXmppMucManager::_q_messageReceived(const QXmppMessage &msg)
 {
     if (msg.type() != QXmppMessage::Normal)
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index c8faf64d..e86a819e 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -232,6 +232,7 @@ void QXmppOutgoingClient::socketError(QAbstractSocket::SocketError socketError)
     emit error(QXmppClient::SocketError);
 }
 
+/// \cond
 void QXmppOutgoingClient::handleStart()
 {
     QXmppStream::handleStart();
@@ -601,6 +602,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
         }
     }
 }
+/// \endcond
 
 void QXmppOutgoingClient::pingStart()
 {
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index ca64df23..cbb30cb3 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -115,6 +115,7 @@ void QXmppRosterManager::_q_disconnected()
     d->isRosterReceived = false;
 }
 
+/// \cond
 bool QXmppRosterManager::handleStanza(const QDomElement &element)
 {
     if (element.tagName() != "iq" || !QXmppRosterIq::isRosterIq(element))
@@ -187,6 +188,7 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element)
 
     return true;
 }
+/// \endcond
 
 void QXmppRosterManager::_q_presenceReceived(const QXmppPresence& presence)
 {
diff --git a/src/client/QXmppRpcManager.cpp b/src/client/QXmppRpcManager.cpp
index b1289006..ddf18716 100644
--- a/src/client/QXmppRpcManager.cpp
+++ b/src/client/QXmppRpcManager.cpp
@@ -137,6 +137,7 @@ QXmppRemoteMethodResult QXmppRpcManager::callRemoteMethod( const QString &jid,
     return method.call();
 }
 
+/// \cond
 QStringList QXmppRpcManager::discoveryFeatures() const
 {
     // XEP-0009: Jabber-RPC
@@ -177,4 +178,4 @@ bool QXmppRpcManager::handleStanza(const QDomElement &element)
     }
     return false;
 }
-
+/// \endcond
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index ea8dccef..a88d5deb 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -757,19 +757,6 @@ QXmppTransferManager::~QXmppTransferManager()
     delete d;
 }
 
-void QXmppTransferManager::setClient(QXmppClient *client)
-{
-    bool check;
-    Q_UNUSED(check);
-
-    QXmppClientExtension::setClient(client);
-
-    // XEP-0047: In-Band Bytestreams
-    check = connect(client, SIGNAL(iqReceived(QXmppIq)),
-                    this, SLOT(_q_iqReceived(QXmppIq)));
-    Q_ASSERT(check);
-}
-
 void QXmppTransferManager::byteStreamIqReceived(const QXmppByteStreamIq &iq)
 {
     // handle IQ from proxy
@@ -868,6 +855,7 @@ void QXmppTransferManager::byteStreamSetReceived(const QXmppByteStreamIq &iq)
     job->connectToHosts(iq);
 }
 
+/// \cond
 QStringList QXmppTransferManager::discoveryFeatures() const
 {
     return QStringList()
@@ -924,6 +912,20 @@ bool QXmppTransferManager::handleStanza(const QDomElement &element)
     return false;
 }
 
+void QXmppTransferManager::setClient(QXmppClient *client)
+{
+    bool check;
+    Q_UNUSED(check);
+
+    QXmppClientExtension::setClient(client);
+
+    // XEP-0047: In-Band Bytestreams
+    check = connect(client, SIGNAL(iqReceived(QXmppIq)),
+                    this, SLOT(_q_iqReceived(QXmppIq)));
+    Q_ASSERT(check);
+}
+/// \endcond
+
 void QXmppTransferManager::ibbCloseIqReceived(const QXmppIbbCloseIq &iq)
 {
     QXmppIq response;
diff --git a/src/client/QXmppVCardManager.cpp b/src/client/QXmppVCardManager.cpp
index 06e26767..66768d2e 100644
--- a/src/client/QXmppVCardManager.cpp
+++ b/src/client/QXmppVCardManager.cpp
@@ -46,33 +46,6 @@ QXmppVCardManager::~QXmppVCardManager()
     delete d;
 }
 
-QStringList QXmppVCardManager::discoveryFeatures() const
-{
-    // XEP-0054: vcard-temp
-    return QStringList() << ns_vcard;
-}
-
-bool QXmppVCardManager::handleStanza(const QDomElement &element)
-{
-    if(element.tagName() == "iq" && QXmppVCardIq::isVCard(element))
-    {
-        QXmppVCardIq vCardIq;
-        vCardIq.parse(element);
-
-        if (vCardIq.from().isEmpty()) {
-            d->clientVCard = vCardIq;
-            d->isClientVCardReceived = true;
-            emit clientVCardReceived();
-        }
-
-        emit vCardReceived(vCardIq);
-
-        return true;
-    }
-
-    return false;
-}
-
 /// This function requests the server for vCard of the specified jid.
 /// Once received the signal vCardReceived() is emitted.
 ///
@@ -126,3 +99,32 @@ bool QXmppVCardManager::isClientVCardReceived() const
 {
     return d->isClientVCardReceived;
 }
+
+/// \cond
+QStringList QXmppVCardManager::discoveryFeatures() const
+{
+    // XEP-0054: vcard-temp
+    return QStringList() << ns_vcard;
+}
+
+bool QXmppVCardManager::handleStanza(const QDomElement &element)
+{
+    if(element.tagName() == "iq" && QXmppVCardIq::isVCard(element))
+    {
+        QXmppVCardIq vCardIq;
+        vCardIq.parse(element);
+
+        if (vCardIq.from().isEmpty()) {
+            d->clientVCard = vCardIq;
+            d->isClientVCardReceived = true;
+            emit clientVCardReceived();
+        }
+
+        emit vCardReceived(vCardIq);
+
+        return true;
+    }
+
+    return false;
+}
+/// \endcond
diff --git a/src/client/QXmppVersionManager.cpp b/src/client/QXmppVersionManager.cpp
index ec5aa8af..9015070d 100644
--- a/src/client/QXmppVersionManager.cpp
+++ b/src/client/QXmppVersionManager.cpp
@@ -65,42 +65,6 @@ QXmppVersionManager::~QXmppVersionManager()
     delete d;
 }
 
-QStringList QXmppVersionManager::discoveryFeatures() const
-{
-    // XEP-0092: Software Version
-    return QStringList() << ns_version;
-}
-
-bool QXmppVersionManager::handleStanza(const QDomElement &element)
-{
-    if (element.tagName() == "iq" && QXmppVersionIq::isVersionIq(element))
-    {
-        QXmppVersionIq versionIq;
-        versionIq.parse(element);
-
-        if (versionIq.type() == QXmppIq::Get) {
-            // respond to query
-            QXmppVersionIq responseIq;
-            responseIq.setType(QXmppIq::Result);
-            responseIq.setId(versionIq.id());
-            responseIq.setTo(versionIq.from());
-
-            responseIq.setName(clientName());
-            responseIq.setVersion(clientVersion());
-            responseIq.setOs(clientOs());
-
-            client()->sendPacket(responseIq);
-        } else if (versionIq.type() == QXmppIq::Result) {
-            // emit response
-            emit versionReceived(versionIq);
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
 /// Request version information from the specified XMPP entity.
 ///
 /// \param jid
@@ -172,3 +136,41 @@ QString QXmppVersionManager::clientOs() const
 {
     return d->clientOs;
 }
+
+/// \cond
+QStringList QXmppVersionManager::discoveryFeatures() const
+{
+    // XEP-0092: Software Version
+    return QStringList() << ns_version;
+}
+
+bool QXmppVersionManager::handleStanza(const QDomElement &element)
+{
+    if (element.tagName() == "iq" && QXmppVersionIq::isVersionIq(element))
+    {
+        QXmppVersionIq versionIq;
+        versionIq.parse(element);
+
+        if (versionIq.type() == QXmppIq::Get) {
+            // respond to query
+            QXmppVersionIq responseIq;
+            responseIq.setType(QXmppIq::Result);
+            responseIq.setId(versionIq.id());
+            responseIq.setTo(versionIq.from());
+
+            responseIq.setName(clientName());
+            responseIq.setVersion(clientVersion());
+            responseIq.setOs(clientOs());
+
+            client()->sendPacket(responseIq);
+        } else if (versionIq.type() == QXmppIq::Result) {
+            // emit response
+            emit versionReceived(versionIq);
+        }
+
+        return true;
+    }
+
+    return false;
+}
+/// \endcond