25 files changed, 284 insertions, 236 deletions
diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp
index bfc7ba05..bfea49f4 100644
--- a/src/base/QXmppArchiveIq.cpp
+++ b/src/base/QXmppArchiveIq.cpp
@@ -84,6 +84,7 @@ QXmppArchiveChat::QXmppArchiveChat()
 {
 }
 
+/// \cond
 void QXmppArchiveChat::parse(const QDomElement &element)
 {
     m_with = element.attribute("with");
@@ -136,6 +137,7 @@ void QXmppArchiveChat::toXml(QXmlStreamWriter *writer, const QXmppResultSetReply
         rsm.toXml(writer);
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Returns the conversation's messages.
 
@@ -253,6 +255,7 @@ void QXmppArchiveChatIq::setResultSetReply(const QXmppResultSetReply& rsm)
     m_rsmReply = rsm;
 }
 
+/// \cond
 bool QXmppArchiveChatIq::isArchiveChatIq(const QDomElement &element)
 {
     QDomElement chatElement = element.firstChildElement("chat");
@@ -271,6 +274,7 @@ void QXmppArchiveChatIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     m_chat.toXml(writer, m_rsmReply);
 }
+/// \endcond
 
 /// Constructs a QXmppArchiveListIq.
 
@@ -380,6 +384,7 @@ void QXmppArchiveListIq::setResultSetReply(const QXmppResultSetReply& rsm)
     m_rsmReply = rsm;
 }
 
+/// \cond
 bool QXmppArchiveListIq::isArchiveListIq(const QDomElement &element)
 {
     QDomElement listElement = element.firstChildElement("list");
@@ -446,6 +451,7 @@ void QXmppArchivePrefIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeAttribute("xmlns", ns_archive);
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Returns the JID which archived conversations must match.
 ///
@@ -498,6 +504,7 @@ void QXmppArchiveRemoveIq::setEnd(const QDateTime &end)
     m_end = end;
 }
 
+/// \cond
 bool QXmppArchiveRemoveIq::isArchiveRemoveIq(const QDomElement &element)
 {
     QDomElement retrieveElement = element.firstChildElement("remove");
@@ -524,6 +531,7 @@ void QXmppArchiveRemoveIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
         helperToXmlAddAttribute(writer, "end", QXmppUtils::datetimeToString(m_end));
     writer->writeEndElement();
 }
+/// \endcond
 
 QXmppArchiveRetrieveIq::QXmppArchiveRetrieveIq()
     : QXmppIq(QXmppIq::Get)
@@ -582,6 +590,7 @@ void QXmppArchiveRetrieveIq::setResultSetQuery(const QXmppResultSetQuery& rsm)
     m_rsmQuery = rsm;
 }
 
+/// \cond
 bool QXmppArchiveRetrieveIq::isArchiveRetrieveIq(const QDomElement &element)
 {
     QDomElement retrieveElement = element.firstChildElement("retrieve");
@@ -607,3 +616,4 @@ void QXmppArchiveRetrieveIq::toXmlElementFromChild(QXmlStreamWriter *writer) con
         m_rsmQuery.toXml(writer);
     writer->writeEndElement();
 }
+/// \endcond
diff --git a/src/base/QXmppBindIq.cpp b/src/base/QXmppBindIq.cpp
index 02a7ad87..4bdf2507 100644
--- a/src/base/QXmppBindIq.cpp
+++ b/src/base/QXmppBindIq.cpp
@@ -64,6 +64,7 @@ void QXmppBindIq::setResource(const QString& resource)
     m_resource = resource;
 }
 
+/// \cond
 bool QXmppBindIq::isBindIq(const QDomElement &element)
 {
     QDomElement bindElement = element.firstChildElement("bind");
@@ -87,4 +88,4 @@ void QXmppBindIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
         helperToXmlAddTextElement(writer, "resource", m_resource);
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppBookmarkSet.cpp b/src/base/QXmppBookmarkSet.cpp
index ba02b4dd..86330ad0 100644
--- a/src/base/QXmppBookmarkSet.cpp
+++ b/src/base/QXmppBookmarkSet.cpp
@@ -174,6 +174,7 @@ void QXmppBookmarkSet::setUrls(const QList<QXmppBookmarkUrl> &urls)
     m_urls = urls;
 }
 
+/// \cond
 bool QXmppBookmarkSet::isBookmarkSet(const QDomElement &element)
 {
     return element.tagName() == "storage" &&
@@ -229,4 +230,4 @@ void QXmppBookmarkSet::toXml(QXmlStreamWriter *writer) const
     }
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppByteStreamIq.cpp b/src/base/QXmppByteStreamIq.cpp
index c26378b6..0e17cc48 100644
--- a/src/base/QXmppByteStreamIq.cpp
+++ b/src/base/QXmppByteStreamIq.cpp
@@ -117,6 +117,7 @@ void QXmppByteStreamIq::setStreamHostUsed(const QString &jid)
     m_streamHostUsed = jid;
 }
 
+/// \cond
 bool QXmppByteStreamIq::isByteStreamIq(const QDomElement &element)
 {
     return element.firstChildElement("query").namespaceURI() == ns_bytestreams;
@@ -181,3 +182,4 @@ void QXmppByteStreamIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();
 }
+/// \endcond
diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index e7506644..11d07992 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -424,6 +424,7 @@ bool QXmppDataForm::isNull() const
     return d->type == QXmppDataForm::None;
 }
 
+/// \cond
 void QXmppDataForm::parse(const QDomElement &element)
 {
     if (element.isNull())
@@ -648,4 +649,4 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppDiscoveryIq.cpp b/src/base/QXmppDiscoveryIq.cpp
index 6f291f5f..5ded03e4 100644
--- a/src/base/QXmppDiscoveryIq.cpp
+++ b/src/base/QXmppDiscoveryIq.cpp
@@ -238,6 +238,7 @@ QByteArray QXmppDiscoveryIq::verificationString() const
     return hasher.result();
 }
 
+/// \cond
 bool QXmppDiscoveryIq::isDiscoveryIq(const QDomElement &element)
 {
     QDomElement queryElement = element.firstChildElement("query");
@@ -334,4 +335,4 @@ void QXmppDiscoveryIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppEntityTimeIq.cpp b/src/base/QXmppEntityTimeIq.cpp
index ddb5f332..be3e0a64 100644
--- a/src/base/QXmppEntityTimeIq.cpp
+++ b/src/base/QXmppEntityTimeIq.cpp
@@ -63,6 +63,7 @@ void QXmppEntityTimeIq::setUtc(const QDateTime &utc)
     m_utc = utc;
 }
 
+/// \cond
 bool QXmppEntityTimeIq::isEntityTimeIq(const QDomElement &element)
 {
     QDomElement timeElement = element.firstChildElement("time");
@@ -88,3 +89,4 @@ void QXmppEntityTimeIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     }
     writer->writeEndElement();
 }
+/// \endcond
diff --git a/src/base/QXmppIbbIq.cpp b/src/base/QXmppIbbIq.cpp
index be8cf14d..4c39f8f6 100644
--- a/src/base/QXmppIbbIq.cpp
+++ b/src/base/QXmppIbbIq.cpp
@@ -53,6 +53,7 @@ void QXmppIbbOpenIq::setSid( const QString &sid )
     m_sid = sid;
 }
 
+/// \cond
 bool QXmppIbbOpenIq::isIbbOpenIq(const QDomElement &element)
 {
     QDomElement openElement = element.firstChildElement("open");
@@ -74,6 +75,7 @@ void QXmppIbbOpenIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeAttribute( "block-size",QString::number(m_block_size) );
     writer->writeEndElement();
 }
+/// \endcond
 
 QXmppIbbCloseIq::QXmppIbbCloseIq() : QXmppIq(QXmppIq::Set)
 {
@@ -90,6 +92,7 @@ void QXmppIbbCloseIq::setSid( const QString &sid )
     m_sid = sid;
 }
 
+/// \cond
 bool QXmppIbbCloseIq::isIbbCloseIq(const QDomElement &element)
 {
     QDomElement openElement = element.firstChildElement("close");
@@ -109,6 +112,7 @@ void QXmppIbbCloseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeAttribute( "sid",m_sid);
     writer->writeEndElement();
 }
+/// \endcond
 
 QXmppIbbDataIq::QXmppIbbDataIq() : QXmppIq( QXmppIq::Set ), m_seq(0)
 {
@@ -144,6 +148,7 @@ void QXmppIbbDataIq::setPayload( const QByteArray &data )
     m_payload = data;
 }
 
+/// \cond
 bool QXmppIbbDataIq::isIbbDataIq(const QDomElement &element)
 {
     QDomElement dataElement = element.firstChildElement("data");
@@ -167,3 +172,4 @@ void QXmppIbbDataIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeCharacters( m_payload.toBase64() );
     writer->writeEndElement();
 }
+/// \endcond
diff --git a/src/base/QXmppIq.cpp b/src/base/QXmppIq.cpp
index fb1675ed..128aa5d5 100644
--- a/src/base/QXmppIq.cpp
+++ b/src/base/QXmppIq.cpp
@@ -55,6 +55,7 @@ void QXmppIq::setType(QXmppIq::Type type)
     m_type = type;
 }
 
+/// \cond
 void QXmppIq::parse(const QDomElement &element)
 {
     QXmppStanza::parse(element);
@@ -95,6 +96,7 @@ void QXmppIq::toXmlElementFromChild( QXmlStreamWriter *writer ) const
     foreach (const QXmppElement &extension, extensions())
         extension.toXml(writer);
 }
+/// \endcond
 
 QString QXmppIq::getTypeStr() const
 {
diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp
index e0428306..b42d518b 100644
--- a/src/base/QXmppJingleIq.cpp
+++ b/src/base/QXmppJingleIq.cpp
@@ -160,6 +160,7 @@ void QXmppJingleIq::Content::setTransportPassword(const QString &password)
     m_transportPassword = password;
 }
 
+/// \cond
 void QXmppJingleIq::Content::parse(const QDomElement &element)
 {
     m_creator = element.attribute("creator");
@@ -230,6 +231,7 @@ void QXmppJingleIq::Content::toXml(QXmlStreamWriter *writer) const
     }
     writer->writeEndElement();
 }
+/// \endcond
 
 QXmppJingleIq::Reason::Reason()
     : m_type(None)
@@ -256,6 +258,7 @@ void QXmppJingleIq::Reason::setType(QXmppJingleIq::Reason::Type type)
     m_type = type;
 }
 
+/// \cond
 void QXmppJingleIq::Reason::parse(const QDomElement &element)
 {
     m_text = element.firstChildElement("text").text();
@@ -280,6 +283,7 @@ void QXmppJingleIq::Reason::toXml(QXmlStreamWriter *writer) const
     writer->writeEmptyElement(jingle_reasons[m_type]);
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Constructs a QXmppJingleIq.
 
@@ -352,12 +356,6 @@ void QXmppJingleIq::setSid(const QString &sid)
     m_sid = sid;
 }
 
-bool QXmppJingleIq::isJingleIq(const QDomElement &element)
-{
-    QDomElement jingleElement = element.firstChildElement("jingle");
-    return (jingleElement.namespaceURI() == ns_jingle);
-}
-
 /// Returns true if the call is ringing.
 
 bool QXmppJingleIq::ringing() const
@@ -374,6 +372,13 @@ void QXmppJingleIq::setRinging(bool ringing)
     m_ringing = ringing;
 }
 
+/// \cond
+bool QXmppJingleIq::isJingleIq(const QDomElement &element)
+{
+    QDomElement jingleElement = element.firstChildElement("jingle");
+    return (jingleElement.namespaceURI() == ns_jingle);
+}
+
 void QXmppJingleIq::parseElementFromChild(const QDomElement &element)
 {
     QDomElement jingleElement = element.firstChildElement("jingle");
@@ -422,6 +427,7 @@ void QXmppJingleIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();
 }
+/// \endcond
 
 QXmppJingleCandidate::QXmppJingleCandidate()
     : m_component(0),
@@ -593,6 +599,7 @@ bool QXmppJingleCandidate::isNull() const
     return m_host.isNull() || !m_port;
 }
 
+/// \cond
 void QXmppJingleCandidate::parse(const QDomElement &element)
 {
     m_component = element.attribute("component").toInt();
@@ -665,6 +672,7 @@ QString QXmppJingleCandidate::typeToString(QXmppJingleCandidate::Type type)
     }
     return typeStr;
 }
+/// \endcond
 
 QXmppJinglePayloadType::QXmppJinglePayloadType()
     : m_channels(1),
@@ -791,6 +799,7 @@ void QXmppJinglePayloadType::setPtime(unsigned int ptime)
     m_ptime = ptime;
 }
 
+/// \cond
 void QXmppJinglePayloadType::parse(const QDomElement &element)
 {
     m_id = element.attribute("id").toInt();
@@ -831,6 +840,7 @@ void QXmppJinglePayloadType::toXml(QXmlStreamWriter *writer) const
     }
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Returns true if this QXmppJinglePayloadType and \a other refer to the same payload type.
 ///
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index ab9a9cb6..d48e8948 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -248,6 +248,56 @@ void QXmppMessage::setState(QXmppMessage::State state)
     m_state = state;
 }
 
+/// Returns the message's subject.
+///
+
+QString QXmppMessage::subject() const
+{
+    return m_subject;
+}
+
+/// Sets the message's subject.
+///
+/// \param subject
+
+void QXmppMessage::setSubject(const QString& subject)
+{
+    m_subject = subject;
+}
+
+/// Returns the message's thread.
+
+QString QXmppMessage::thread() const
+{
+    return m_thread;
+}
+
+/// Sets the message's thread.
+///
+/// \param thread
+
+void QXmppMessage::setThread(const QString& thread)
+{
+    m_thread = thread;
+}
+
+/// Returns the message's XHTML body as defined by
+/// XEP-0071: XHTML-IM.
+
+QString QXmppMessage::xhtml() const
+{
+    return m_xhtml;
+}
+
+/// Sets the message's XHTML body as defined by
+/// XEP-0071: XHTML-IM.
+
+void QXmppMessage::setXhtml(const QString &xhtml)
+{
+    m_xhtml = xhtml;
+}
+
+/// \cond
 void QXmppMessage::parse(const QDomElement &element)
 {
     QXmppStanza::parse(element);
@@ -411,52 +461,4 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
         extension.toXml(xmlWriter);
     xmlWriter->writeEndElement();
 }
-
-/// Returns the message's subject.
-///
-
-QString QXmppMessage::subject() const
-{
-    return m_subject;
-}
-
-/// Sets the message's subject.
-///
-/// \param subject
-
-void QXmppMessage::setSubject(const QString& subject)
-{
-    m_subject = subject;
-}
-
-/// Returns the message's thread.
-
-QString QXmppMessage::thread() const
-{
-    return m_thread;
-}
-
-/// Sets the message's thread.
-///
-/// \param thread
-
-void QXmppMessage::setThread(const QString& thread)
-{
-    m_thread = thread;
-}
-
-/// Returns the message's XHTML body as defined by
-/// XEP-0071: XHTML-IM.
-
-QString QXmppMessage::xhtml() const
-{
-    return m_xhtml;
-}
-
-/// Sets the message's XHTML body as defined by
-/// XEP-0071: XHTML-IM.
-
-void QXmppMessage::setXhtml(const QString &xhtml)
-{
-    m_xhtml = xhtml;
-}
+/// \endcond
diff --git a/src/base/QXmppMucIq.cpp b/src/base/QXmppMucIq.cpp
index 5495ca3e..986ce567 100644
--- a/src/base/QXmppMucIq.cpp
+++ b/src/base/QXmppMucIq.cpp
@@ -205,6 +205,7 @@ void QXmppMucItem::setRole(Role role)
     m_role = role;
 }
 
+/// \cond
 void QXmppMucItem::parse(const QDomElement &element)
 {
     m_affiliation = QXmppMucItem::affiliationFromString(element.attribute("affiliation").toLower());
@@ -231,6 +232,7 @@ void QXmppMucItem::toXml(QXmlStreamWriter *writer) const
         helperToXmlAddTextElement(writer, "reason", m_reason);
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Returns the IQ's items.
 
@@ -248,6 +250,7 @@ void QXmppMucAdminIq::setItems(const QList<QXmppMucItem> &items)
     m_items = items;
 }
 
+/// \cond
 bool QXmppMucAdminIq::isMucAdminIq(const QDomElement &element)
 {
     QDomElement queryElement = element.firstChildElement("query");
@@ -275,6 +278,7 @@ void QXmppMucAdminIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
         item.toXml(writer);
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Returns the IQ's data form.
 
@@ -292,6 +296,7 @@ void QXmppMucOwnerIq::setForm(const QXmppDataForm &form)
     m_form = form;
 }
 
+/// \cond
 bool QXmppMucOwnerIq::isMucOwnerIq(const QDomElement &element)
 {
     QDomElement queryElement = element.firstChildElement("query");
@@ -311,4 +316,4 @@ void QXmppMucOwnerIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     m_form.toXml(writer);
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppNonSASLAuth.cpp b/src/base/QXmppNonSASLAuth.cpp
index 161cc1fe..66e97af2 100644
--- a/src/base/QXmppNonSASLAuth.cpp
+++ b/src/base/QXmppNonSASLAuth.cpp
@@ -34,36 +34,6 @@ QXmppNonSASLAuthIq::QXmppNonSASLAuthIq()
 {
 }
 
-bool QXmppNonSASLAuthIq::isNonSASLAuthIq(const QDomElement &element)
-{
-    QDomElement queryElement = element.firstChildElement("query");
-    return queryElement.namespaceURI() == ns_auth;
-}
-
-void QXmppNonSASLAuthIq::parseElementFromChild(const QDomElement &element)
-{
-    QDomElement queryElement = element.firstChildElement("query");
-    m_username = queryElement.firstChildElement("username").text();
-    m_password = queryElement.firstChildElement("password").text();
-    m_digest = QByteArray::fromHex(queryElement.firstChildElement("digest").text().toAscii());
-    m_resource = queryElement.firstChildElement("resource").text();
-}
-
-void QXmppNonSASLAuthIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
-{
-    writer->writeStartElement("query");
-    writer->writeAttribute("xmlns", ns_auth);
-    if (!m_username.isEmpty())
-        writer->writeTextElement("username", m_username);
-    if (!m_digest.isEmpty())
-        writer->writeTextElement("digest", m_digest.toHex());
-    if (!m_password.isEmpty())
-        writer->writeTextElement("password", m_password);
-    if (!m_resource.isEmpty())
-        writer->writeTextElement("resource", m_resource);
-    writer->writeEndElement();
-}
-
 QString QXmppNonSASLAuthIq::username() const
 {
     return m_username;
@@ -104,3 +74,34 @@ void QXmppNonSASLAuthIq::setResource(const QString &resource)
     m_resource = resource;
 }
 
+/// \cond
+bool QXmppNonSASLAuthIq::isNonSASLAuthIq(const QDomElement &element)
+{
+    QDomElement queryElement = element.firstChildElement("query");
+    return queryElement.namespaceURI() == ns_auth;
+}
+
+void QXmppNonSASLAuthIq::parseElementFromChild(const QDomElement &element)
+{
+    QDomElement queryElement = element.firstChildElement("query");
+    m_username = queryElement.firstChildElement("username").text();
+    m_password = queryElement.firstChildElement("password").text();
+    m_digest = QByteArray::fromHex(queryElement.firstChildElement("digest").text().toAscii());
+    m_resource = queryElement.firstChildElement("resource").text();
+}
+
+void QXmppNonSASLAuthIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("query");
+    writer->writeAttribute("xmlns", ns_auth);
+    if (!m_username.isEmpty())
+        writer->writeTextElement("username", m_username);
+    if (!m_digest.isEmpty())
+        writer->writeTextElement("digest", m_digest.toHex());
+    if (!m_password.isEmpty())
+        writer->writeTextElement("password", m_password);
+    if (!m_resource.isEmpty())
+        writer->writeTextElement("resource", m_resource);
+    writer->writeEndElement();
+}
+/// \endcond
diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index cfe416b5..f14a70f7 100644
--- a/src/base/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
@@ -123,29 +123,7 @@ void QXmppPresence::setType(QXmppPresence::Type type)
     m_type = type;
 }
 
-/// Returns the presence status.
-
-const QXmppPresence::Status& QXmppPresence::status() const
-{
-    return m_status;
-}
-
-/// Returns a reference to the presence status, allowing you to change it.
-
-QXmppPresence::Status& QXmppPresence::status()
-{
-    return m_status;
-}
-
-/// Sets the presence status.
-///
-/// \param status
-
-void QXmppPresence::setStatus(const QXmppPresence::Status& status)
-{
-    m_status = status;
-}
-
+/// \cond
 void QXmppPresence::parse(const QDomElement &element)
 {
     QXmppStanza::parse(element);
@@ -282,6 +260,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const
 
     xmlWriter->writeEndElement();
 }
+/// \endcond
 
 QString QXmppPresence::getTypeStr() const
 {
@@ -333,122 +312,6 @@ void QXmppPresence::setTypeFromStr(const QString& str)
     }
 }
 
-/// Constructs a presence status.
-
-QXmppPresence::Status::Status(QXmppPresence::Status::Type type,
-                             const QString statusText, int priority) :
-                                m_type(type),
-                                m_statusText(statusText), m_priority(priority)
-{
-}
-
-/// Returns the status type, for instance busy or away.
-
-QXmppPresence::Status::Type QXmppPresence::Status::type() const
-{
-    return m_type;
-}
-
-/// Sets the status type.
-
-void QXmppPresence::Status::setType(QXmppPresence::Status::Type type)
-{
-    m_type = type;
-}
-
-void QXmppPresence::Status::setTypeFromStr(const QString& str)
-{
-    if(str == "")
-        m_type = QXmppPresence::Status::Online;
-    else if(str == "away")
-        m_type = QXmppPresence::Status::Away;
-    else if(str == "chat")
-        m_type = QXmppPresence::Status::Chat;
-    else if(str == "dnd")
-        m_type = QXmppPresence::Status::DND;
-    else if(str == "xa")
-        m_type = QXmppPresence::Status::XA;
-    else if(str == "invisible")
-        m_type = QXmppPresence::Status::Invisible;
-    else {
-        qWarning("QXmppPresence::Status::setTypeFromStr() invalid input string type %s",
-            qPrintable(str));
-        m_type = QXmppPresence::Status::Online;
-    }
-}
-
-QString QXmppPresence::Status::getTypeStr() const
-{
-    switch(m_type) {
-    case QXmppPresence::Status::Online:
-        return "";
-    case QXmppPresence::Status::Away:
-        return "away";
-    case QXmppPresence::Status::XA:
-        return "xa";
-    case QXmppPresence::Status::DND:
-        return "dnd";
-    case QXmppPresence::Status::Chat:
-        return "chat";
-    case QXmppPresence::Status::Invisible:
-        return "invisible";
-    default:
-        qWarning("QXmppPresence::Status::getTypeStr() invalid type %d",
-                 (int)m_type);
-        return "";
-    }
-}
-
-/// Returns the status text, a textual description of the user's status.
-
-QString QXmppPresence::Status::statusText() const
-{
-    return m_statusText;
-}
-
-/// Sets the status text, a textual description of the user's status.
-///
-/// \param str The status text, for example "Gone fishing".
-
-void QXmppPresence::Status::setStatusText(const QString& str)
-{
-    m_statusText = str;
-}
-
-/// Returns the priority level of the resource.
-
-int QXmppPresence::Status::priority() const
-{
-    return m_priority;
-}
-
-/// Sets the priority level of the resource.
-///
-/// \param priority
-
-void QXmppPresence::Status::setPriority(int priority)
-{
-    m_priority = priority;
-}
-
-void QXmppPresence::Status::parse(const QDomElement &element)
-{
-    setTypeFromStr(element.firstChildElement("show").text());
-    m_statusText = element.firstChildElement("status").text();
-    m_priority = element.firstChildElement("priority").text().toInt();
-}
-
-void QXmppPresence::Status::toXml(QXmlStreamWriter *xmlWriter) const
-{
-    const QString show = getTypeStr();
-    if (!show.isEmpty())
-        helperToXmlAddTextElement(xmlWriter, "show", getTypeStr());
-    if (!m_statusText.isEmpty())
-        helperToXmlAddTextElement(xmlWriter, "status", m_statusText);
-    if (m_priority != 0)
-        helperToXmlAddTextElement(xmlWriter, "priority", QString::number(m_priority));
-}
-
 /// Returns the photo-hash of the VCardUpdate.
 ///
 /// \return QByteArray
@@ -559,3 +422,117 @@ void QXmppPresence::setMucStatusCodes(const QList<int> &codes)
     m_mucStatusCodes = codes;
 }
 
+/// \cond
+const QXmppPresence::Status& QXmppPresence::status() const
+{
+    return m_status;
+}
+
+QXmppPresence::Status& QXmppPresence::status()
+{
+    return m_status;
+}
+
+void QXmppPresence::setStatus(const QXmppPresence::Status& status)
+{
+    m_status = status;
+}
+
+QXmppPresence::Status::Status(QXmppPresence::Status::Type type,
+                             const QString statusText, int priority) :
+                                m_type(type),
+                                m_statusText(statusText), m_priority(priority)
+{
+}
+
+QXmppPresence::Status::Type QXmppPresence::Status::type() const
+{
+    return m_type;
+}
+
+void QXmppPresence::Status::setType(QXmppPresence::Status::Type type)
+{
+    m_type = type;
+}
+
+void QXmppPresence::Status::setTypeFromStr(const QString& str)
+{
+    if(str == "")
+        m_type = QXmppPresence::Status::Online;
+    else if(str == "away")
+        m_type = QXmppPresence::Status::Away;
+    else if(str == "chat")
+        m_type = QXmppPresence::Status::Chat;
+    else if(str == "dnd")
+        m_type = QXmppPresence::Status::DND;
+    else if(str == "xa")
+        m_type = QXmppPresence::Status::XA;
+    else if(str == "invisible")
+        m_type = QXmppPresence::Status::Invisible;
+    else {
+        qWarning("QXmppPresence::Status::setTypeFromStr() invalid input string type %s",
+            qPrintable(str));
+        m_type = QXmppPresence::Status::Online;
+    }
+}
+
+QString QXmppPresence::Status::getTypeStr() const
+{
+    switch(m_type) {
+    case QXmppPresence::Status::Online:
+        return "";
+    case QXmppPresence::Status::Away:
+        return "away";
+    case QXmppPresence::Status::XA:
+        return "xa";
+    case QXmppPresence::Status::DND:
+        return "dnd";
+    case QXmppPresence::Status::Chat:
+        return "chat";
+    case QXmppPresence::Status::Invisible:
+        return "invisible";
+    default:
+        qWarning("QXmppPresence::Status::getTypeStr() invalid type %d",
+                 (int)m_type);
+        return "";
+    }
+}
+
+QString QXmppPresence::Status::statusText() const
+{
+    return m_statusText;
+}
+
+void QXmppPresence::Status::setStatusText(const QString& str)
+{
+    m_statusText = str;
+}
+
+int QXmppPresence::Status::priority() const
+{
+    return m_priority;
+}
+
+void QXmppPresence::Status::setPriority(int priority)
+{
+    m_priority = priority;
+}
+
+void QXmppPresence::Status::parse(const QDomElement &element)
+{
+    setTypeFromStr(element.firstChildElement("show").text());
+    m_statusText = element.firstChildElement("status").text();
+    m_priority = element.firstChildElement("priority").text().toInt();
+}
+
+void QXmppPresence::Status::toXml(QXmlStreamWriter *xmlWriter) const
+{
+    const QString show = getTypeStr();
+    if (!show.isEmpty())
+        helperToXmlAddTextElement(xmlWriter, "show", getTypeStr());
+    if (!m_statusText.isEmpty())
+        helperToXmlAddTextElement(xmlWriter, "status", m_statusText);
+    if (m_priority != 0)
+        helperToXmlAddTextElement(xmlWriter, "priority", QString::number(m_priority));
+}
+/// \endcond
diff --git a/src/base/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp
index 3f03fb57..c206d78b 100644
--- a/src/base/QXmppPubSubIq.cpp
+++ b/src/base/QXmppPubSubIq.cpp
@@ -75,6 +75,7 @@ void QXmppPubSubItem::setContents(const QXmppElement &contents)
     m_contents = contents;
 }
 
+/// \cond
 void QXmppPubSubItem::parse(const QDomElement &element)
 {
     m_id = element.attribute("id");
@@ -88,6 +89,7 @@ void QXmppPubSubItem::toXml(QXmlStreamWriter *writer) const
     m_contents.toXml(writer);
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Returns the PubSub queryType for this IQ.
 ///
@@ -174,6 +176,7 @@ void QXmppPubSubIq::setItems(const QList<QXmppPubSubItem> &items)
     m_items = items;
 }
 
+/// \cond
 bool QXmppPubSubIq::isPubSubIq(const QDomElement &element)
 {
     const QDomElement pubSubElement = element.firstChildElement("pubsub");
@@ -251,3 +254,4 @@ void QXmppPubSubIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeEndElement();
     writer->writeEndElement();
 }
+/// \endcond
diff --git a/src/base/QXmppRegisterIq.cpp b/src/base/QXmppRegisterIq.cpp
index 323f7487..1897579f 100644
--- a/src/base/QXmppRegisterIq.cpp
+++ b/src/base/QXmppRegisterIq.cpp
@@ -98,6 +98,7 @@ void QXmppRegisterIq::setUsername(const QString &username)
     m_username = username;
 }
 
+/// \cond
 bool QXmppRegisterIq::isRegisterIq(const QDomElement &element)
 {
     return (element.firstChildElement("query").namespaceURI() == ns_register);
@@ -138,3 +139,4 @@ void QXmppRegisterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     m_form.toXml(writer);
     writer->writeEndElement();
 }
+/// \endcond
diff --git a/src/base/QXmppResultSet.cpp b/src/base/QXmppResultSet.cpp
index 7013a956..7589b62a 100644
--- a/src/base/QXmppResultSet.cpp
+++ b/src/base/QXmppResultSet.cpp
@@ -116,6 +116,7 @@ bool QXmppResultSetQuery::isNull() const
     return m_max == -1 && m_index == -1 && m_after.isNull() && m_before.isNull();
 }
 
+/// \cond
 void QXmppResultSetQuery::parse(const QDomElement& element)
 {
     QDomElement setElement = (element.tagName() == "set") ? element : element.firstChildElement("set");
@@ -146,6 +147,7 @@ void QXmppResultSetQuery::toXml(QXmlStreamWriter* writer) const
         helperToXmlAddTextElement(writer, "index", QString::number(m_index));
     writer->writeEndElement();
 }
+/// \endcond
 
 QXmppResultSetReply::QXmppResultSetReply()
     : m_count(-1)
@@ -223,6 +225,7 @@ bool QXmppResultSetReply::isNull() const
     return m_count == -1 && m_index == -1 && m_first.isNull() && m_last.isNull();
 }
 
+/// \cond
 void QXmppResultSetReply::parse(const QDomElement& element)
 {
     QDomElement setElement = (element.tagName() == "set") ? element : element.firstChildElement("set");
@@ -257,3 +260,4 @@ void QXmppResultSetReply::toXml(QXmlStreamWriter* writer) const
         helperToXmlAddTextElement(writer, "count", QString::number(m_count));
     writer->writeEndElement();
 }
+/// \endcond
diff --git a/src/base/QXmppRosterIq.cpp b/src/base/QXmppRosterIq.cpp
index 4737d723..606b36f1 100644
--- a/src/base/QXmppRosterIq.cpp
+++ b/src/base/QXmppRosterIq.cpp
@@ -45,6 +45,7 @@ QList<QXmppRosterIq::Item> QXmppRosterIq::items() const
     return m_items;
 }
 
+/// \cond
 bool QXmppRosterIq::isRosterIq(const QDomElement &element)
 {
     return (element.firstChildElement("query").namespaceURI() == ns_roster);
@@ -73,6 +74,7 @@ void QXmppRosterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
         m_items.at(i).toXml(writer);
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Constructs a new roster entry.
 
@@ -227,6 +229,7 @@ void QXmppRosterIq::Item::setSubscriptionTypeFromStr(const QString& type)
         qWarning("QXmppRosterIq::Item::setTypeFromStr(): invalid type");
 }
 
+/// \cond
 void QXmppRosterIq::Item::parse(const QDomElement &element)
 {
     m_name = element.attribute("name");
@@ -258,3 +261,4 @@ void QXmppRosterIq::Item::toXml(QXmlStreamWriter *writer) const
     }
     writer->writeEndElement();
 }
+/// \endcond
diff --git a/src/base/QXmppRpcIq.cpp b/src/base/QXmppRpcIq.cpp
index 85958b07..1fd64f71 100644
--- a/src/base/QXmppRpcIq.cpp
+++ b/src/base/QXmppRpcIq.cpp
@@ -200,6 +200,7 @@ void QXmppRpcErrorIq::setQuery(const QXmppRpcInvokeIq &query)
     m_query = query;
 }
 
+/// \cond
 bool QXmppRpcErrorIq::isRpcErrorIq(const QDomElement &element)
 {
     QString type = element.attribute("type");
@@ -219,6 +220,7 @@ void QXmppRpcErrorIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     m_query.toXmlElementFromChild(writer);
 }
+/// \endcond
 
 QXmppRpcResponseIq::QXmppRpcResponseIq()
     : QXmppIq(QXmppIq::Result),
@@ -277,6 +279,7 @@ void QXmppRpcResponseIq::setValues(const QVariantList &values)
     m_values = values;
 }
 
+/// \cond
 bool QXmppRpcResponseIq::isRpcResponseIq(const QDomElement &element)
 {
     QString type = element.attribute("type");
@@ -346,6 +349,7 @@ void QXmppRpcResponseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();
 }
+/// \endcond
 
 QXmppRpcInvokeIq::QXmppRpcInvokeIq()
     : QXmppIq(QXmppIq::Set)
@@ -386,6 +390,7 @@ void QXmppRpcInvokeIq::setMethod(const QString &method)
     m_method = method;
 }
 
+/// \cond
 bool QXmppRpcInvokeIq::isRpcInvokeIq(const QDomElement &element)
 {
     QString type = element.attribute("type");
@@ -440,4 +445,4 @@ void QXmppRpcInvokeIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppSessionIq.cpp b/src/base/QXmppSessionIq.cpp
index 457b855f..31677062 100644
--- a/src/base/QXmppSessionIq.cpp
+++ b/src/base/QXmppSessionIq.cpp
@@ -29,6 +29,7 @@
 #include "QXmppConstants.h"
 #include "QXmppUtils.h"
 
+/// \cond
 bool QXmppSessionIq::isSessionIq(const QDomElement &element)
 {
     QDomElement sessionElement = element.firstChildElement("session");
@@ -41,4 +42,4 @@ void QXmppSessionIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeAttribute("xmlns", ns_session);
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index cbe69215..b00531f3 100644
--- a/src/base/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
@@ -95,6 +95,7 @@ void QXmppStanza::Error::setType(QXmppStanza::Error::Type type)
     m_type = type;
 }
 
+/// \cond
 QString QXmppStanza::Error::getTypeStr() const
 {
     switch(m_type)
@@ -287,6 +288,7 @@ void QXmppStanza::Error::toXml( QXmlStreamWriter *writer ) const
 
     writer->writeEndElement();
 }
+/// \endcond
 
 /// Constructs a QXmppStanza with the specified sender and recipient.
 ///
@@ -404,6 +406,7 @@ void QXmppStanza::setExtensions(const QXmppElementList &extensions)
     m_extensions = extensions;
 }
 
+/// \cond
 void QXmppStanza::generateAndSetNextId()
 {
     // get back
@@ -422,4 +425,4 @@ void QXmppStanza::parse(const QDomElement &element)
     if(!errorElement.isNull())
         m_error.parse(errorElement);
 }
-
+/// \endcond
diff --git a/src/base/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp
index e3918cc6..9b532ee9 100644
--- a/src/base/QXmppStreamFeatures.cpp
+++ b/src/base/QXmppStreamFeatures.cpp
@@ -94,6 +94,7 @@ void QXmppStreamFeatures::setTlsMode(QXmppStreamFeatures::Mode mode)
     m_tlsMode = mode;
 }
 
+/// \cond
 bool QXmppStreamFeatures::isStreamFeatures(const QDomElement &element)
 {
     return element.namespaceURI() == ns_stream &&
@@ -183,4 +184,4 @@ void QXmppStreamFeatures::toXml(QXmlStreamWriter *writer) const
     }
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppStreamInitiationIq.cpp b/src/base/QXmppStreamInitiationIq.cpp
index 87c1be36..9b34bb59 100644
--- a/src/base/QXmppStreamInitiationIq.cpp
+++ b/src/base/QXmppStreamInitiationIq.cpp
@@ -67,6 +67,7 @@ void QXmppStreamInitiationIq::setSiItems(const QXmppElementList &items)
     m_siItems = items;
 }
 
+/// \cond
 bool QXmppStreamInitiationIq::isStreamInitiationIq(const QDomElement &element)
 {
     QDomElement siElement = element.firstChildElement("si");
@@ -103,4 +104,4 @@ void QXmppStreamInitiationIq::toXmlElementFromChild(QXmlStreamWriter *writer) co
         item.toXml(writer);
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp
index 4472bb00..0d8ab988 100644
--- a/src/base/QXmppVCardIq.cpp
+++ b/src/base/QXmppVCardIq.cpp
@@ -235,6 +235,7 @@ void QXmppVCardIq::setPhotoType(const QString& photoType)
     m_photoType = photoType;
 }
 
+/// \cond
 bool QXmppVCardIq::isVCard(const QDomElement &nodeRecv)
 {
     return nodeRecv.firstChildElement("vCard").namespaceURI() == ns_vcard;
@@ -307,4 +308,4 @@ void QXmppVCardIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();
 }
-
+/// \endcond
diff --git a/src/base/QXmppVersionIq.cpp b/src/base/QXmppVersionIq.cpp
index bef0920a..7c4d61e9 100644
--- a/src/base/QXmppVersionIq.cpp
+++ b/src/base/QXmppVersionIq.cpp
@@ -78,6 +78,7 @@ void QXmppVersionIq::setVersion(const QString &version)
     m_version = version;
 }
 
+/// \cond
 bool QXmppVersionIq::isVersionIq(const QDomElement &element)
 {
     QDomElement queryElement = element.firstChildElement("query");
@@ -108,4 +109,4 @@ void QXmppVersionIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();
 }
-
+/// \endcond