rename QXmppSession to QXmppSessionIq for consistency

5 files changed, 19 insertions, 29 deletions

diff --git a/src/QXmppIncomingClient.cpp b/src/QXmppIncomingClient.cpp
index 565a17c9..1211bc18 100644
--- a/src/QXmppIncomingClient.cpp
+++ b/src/QXmppIncomingClient.cpp
@@ -29,7 +29,7 @@
 #include "QXmppBind.h"
 #include "QXmppConstants.h"
 #include "QXmppMessage.h"
-#include "QXmppSession.h"
+#include "QXmppSessionIq.h"
 #include "QXmppStreamFeatures.h"
 #include "QXmppUtils.h"
 
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index 145f5b1d..83f8f895 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -47,7 +47,7 @@
 #include "QXmppPingIq.h"
 #include "QXmppRpcIq.h"
 #include "QXmppRosterIq.h"
-#include "QXmppSession.h"
+#include "QXmppSessionIq.h"
 #include "QXmppStreamInitiationIq.h"
 #include "QXmppVCard.h"
 #include "QXmppVersionIq.h"
@@ -389,13 +389,9 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
 
             if(id == d->sessionId)
             {
-                QXmppSession session;
+                QXmppSessionIq session;
                 session.parse(nodeRecv);
 
-                // get back add configuration whether to send
-                // roster and intial presence in beginning
-                // process SessionIq
-
                 // xmpp connection made
                 d->sessionStarted = true;
                 emit connected();
@@ -424,7 +420,8 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
                     // start session if it is available
                     if (d->sessionAvailable)
                     {
-                        QXmppSession session(QXmppIq::Set);
+                        QXmppSessionIq session;
+                        session.setType(QXmppIq::Set);
                         session.setTo(configuration().domain());
                         d->sessionId = session.id();
                         sendPacket(session);
diff --git a/src/QXmppSession.cpp b/src/QXmppSessionIq.cpp
index 9ee988d3..a9875783 100644
--- a/src/QXmppSession.cpp
+++ b/src/QXmppSessionIq.cpp
@@ -25,26 +25,17 @@
 #include <QDomElement>
 #include <QXmlStreamWriter>
 
-#include "QXmppSession.h"
+#include "QXmppSessionIq.h"
 #include "QXmppConstants.h"
 #include "QXmppUtils.h"
 
-QXmppSession::QXmppSession()
-{
-}
-
-QXmppSession::QXmppSession(QXmppIq::Type type)
-    : QXmppIq(type)
-{
-}
-
-bool QXmppSession::isSession(const QDomElement &element)
+bool QXmppSessionIq::isSessionIq(const QDomElement &element)
 {
     QDomElement sessionElement = element.firstChildElement("session");
     return (sessionElement.namespaceURI() == ns_session);
 }
 
-void QXmppSession::toXmlElementFromChild(QXmlStreamWriter *writer) const
+void QXmppSessionIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement("session");;
     writer->writeAttribute("xmlns", ns_session);
diff --git a/src/QXmppSession.h b/src/QXmppSessionIq.h
index 83ba464f..9abc7e24 100644
--- a/src/QXmppSession.h
+++ b/src/QXmppSessionIq.h
@@ -23,21 +23,23 @@
  */
 
 
-#ifndef QXMPPSESSION_H
-#define QXMPPSESSION_H
+#ifndef QXMPPSESSIONIQ_H
+#define QXMPPSESSIONIQ_H
 
 #include "QXmppIq.h"
 
-class QXmppSession : public QXmppIq
+/// \brief The QXmppSessionIq class represents an IQ used for session
+/// establishment as defined by RFC 5921.
+
+class QXmppSessionIq : public QXmppIq
 {
 public:
-    QXmppSession();
-    QXmppSession(QXmppIq::Type type);
-
-    static bool isSession(const QDomElement &element);
+    static bool isSessionIq(const QDomElement &element);
 
 private:
+    /// \cond
     void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+    /// \endcond
 };
 
 #endif // QXMPPSESSION_H
diff --git a/src/src.pro b/src/src.pro
index 14d20884..b9c652c3 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -51,7 +51,7 @@ HEADERS += QXmppUtils.h \
     QXmppRoster.h \
     QXmppRosterIq.h \
     QXmppRosterManager.h \
-    QXmppSession.h \
+    QXmppSessionIq.h \
     QXmppSocks.h \
     QXmppStanza.h \
     QXmppStream.h \
@@ -99,7 +99,7 @@ SOURCES += QXmppUtils.cpp \
     QXmppPresence.cpp \
     QXmppRosterIq.cpp \
     QXmppRosterManager.cpp \
-    QXmppSession.cpp \
+    QXmppSessionIq.cpp \
     QXmppSocks.cpp \
     QXmppStanza.cpp \
     QXmppStream.cpp \