From 95b10ce06499f3e952b370b41fef1730bddd27fd Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Fri, 10 Dec 2010 11:34:18 +0000
Subject: improve QXmppOutgoingClient documentation and remove unnecessary
 addFeatures() method

---
 src/QXmppClient.cpp         |  4 ----
 src/QXmppOutgoingClient.cpp | 11 ++++-------
 src/QXmppOutgoingClient.h   | 11 +++++++++--
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index bd369e74..adf56f04 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -240,10 +240,6 @@ bool QXmppClient::addExtension(QXmppClientExtension* extension)
 
     extension->setParent(this);
     extension->setClient(this);
-
-    // Features
-    d->stream->addFeatures(extension->discoveryFeatures());
-
     d->extensions << extension;
     return true;
 }
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index 9ae68881..cfa67429 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -64,9 +64,6 @@ public:
     QAbstractSocket::SocketError socketError;
     QXmppStanza::Error::Condition xmppStreamError;
 
-    // Discovery
-    QStringList extraFeatures;
-
     // State data
     QString bindId;
     QString sessionId;
@@ -719,17 +716,17 @@ void QXmppOutgoingClient::sendNonSASLAuthQuery()
     sendPacket(authQuery);
 }
 
+/// Returns the type of the last socket error that occured.
+
 QAbstractSocket::SocketError QXmppOutgoingClient::socketError()
 {
     return d->socketError;
 }
 
+/// Returns the type of the last XMPP stream error that occured.
+
 QXmppStanza::Error::Condition QXmppOutgoingClient::xmppStreamError()
 {
     return d->xmppStreamError;
 }
 
-void QXmppOutgoingClient::addFeatures(const QStringList &features)
-{
-    d->extraFeatures << features;
-}
diff --git a/src/QXmppOutgoingClient.h b/src/QXmppOutgoingClient.h
index 3d744854..4b39445b 100644
--- a/src/QXmppOutgoingClient.h
+++ b/src/QXmppOutgoingClient.h
@@ -63,21 +63,28 @@ public:
 
     QXmppConfiguration& configuration();
 
-    void addFeatures(const QStringList &features);
-
 signals:
+    /// This signal is emitted when an error is encountered.
     void error(QXmppClient::Error);
 
     /// This signal is emitted when an element is received.
     void elementReceived(const QDomElement &element, bool &handled);
+
+    /// This signal is emitted when a presence is received.
     void presenceReceived(const QXmppPresence&);
+
+    /// This signal is emitted when a message is received.
     void messageReceived(const QXmppMessage&);
+
+    /// This signal is emitted when an IQ is received.
     void iqReceived(const QXmppIq&);
 
+    /// \cond
     // XEP-0009: Jabber-RPC
     void rpcCallInvoke(const QXmppRpcInvokeIq &invoke);
     void rpcCallResponse(const QXmppRpcResponseIq& result);
     void rpcCallError(const QXmppRpcErrorIq &err);
+    /// \endcond
 
 protected:
     /// \cond
-- 
cgit v1.2.3