rename QXmppBind to QXmppBindIq

5 files changed, 31 insertions, 44 deletions

diff --git a/src/QXmppBind.cpp b/src/QXmppBindIq.cpp
index c75698b0..759e9cbf 100644
--- a/src/QXmppBind.cpp
+++ b/src/QXmppBindIq.cpp
@@ -26,53 +26,53 @@
 #include <QTextStream>
 #include <QXmlStreamWriter>
 
-#include "QXmppBind.h"
+#include "QXmppBindIq.h"
 #include "QXmppUtils.h"
 #include "QXmppConstants.h"
 
-QXmppBind::QXmppBind()
+QXmppBindIq::QXmppBindIq()
 {
 }
 
-QXmppBind::QXmppBind(QXmppIq::Type type)
+QXmppBindIq::QXmppBindIq(QXmppIq::Type type)
     : QXmppIq(type)
 {
 }
 
-QString QXmppBind::jid() const
+QString QXmppBindIq::jid() const
 {
     return m_jid;
 }
 
-QString QXmppBind::resource() const
+QString QXmppBindIq::resource() const
 {
     return m_resource;
 }
 
-void QXmppBind::setJid(const QString& str)
+void QXmppBindIq::setJid(const QString& str)
 {
     m_jid = str;
 }
 
-void QXmppBind::setResource(const QString& str)
+void QXmppBindIq::setResource(const QString& str)
 {
     m_resource = str;
 }
 
-bool QXmppBind::isBind(const QDomElement &element)
+bool QXmppBindIq::isBindIq(const QDomElement &element)
 {
     QDomElement bindElement = element.firstChildElement("bind");
     return (bindElement.namespaceURI() == ns_bind);
 }
 
-void QXmppBind::parseElementFromChild(const QDomElement &element)
+void QXmppBindIq::parseElementFromChild(const QDomElement &element)
 {
     QDomElement bindElement = element.firstChildElement("bind");
     m_jid = bindElement.firstChildElement("jid").text();
     m_resource = bindElement.firstChildElement("resource").text();
 }
 
-void QXmppBind::toXmlElementFromChild(QXmlStreamWriter *writer) const
+void QXmppBindIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement("bind");
     helperToXmlAddAttribute(writer, "xmlns", ns_bind);
@@ -83,12 +83,3 @@ void QXmppBind::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeEndElement();
 }
 
-QString QXmppBind::getJid() const
-{
-    return m_jid;
-}
-
-QString QXmppBind::getResource() const
-{
-    return m_resource;
-}
diff --git a/src/QXmppBind.h b/src/QXmppBindIq.h
index a485576f..5794c66a 100644
--- a/src/QXmppBind.h
+++ b/src/QXmppBindIq.h
@@ -23,16 +23,16 @@
  */
 
 
-#ifndef QXMPPBIND_H
-#define QXMPPBIND_H
+#ifndef QXMPPBINDIQ_H
+#define QXMPPBINDIQ_H
 
 #include "QXmppIq.h"
 
-class QXmppBind : public QXmppIq
+class QXmppBindIq : public QXmppIq
 {
 public:
-    QXmppBind();
-    QXmppBind(QXmppIq::Type type);
+    QXmppBindIq();
+    QXmppBindIq(QXmppIq::Type type);
     
     QString jid() const;
     QString resource() const;
@@ -40,13 +40,7 @@ public:
     void setJid(const QString&);
     void setResource(const QString&);
 
-    static bool isBind(const QDomElement &element);
-
-    // deprecated accessors, use the form without "get" instead
-    /// \cond
-    QString Q_DECL_DEPRECATED getJid() const;
-    QString Q_DECL_DEPRECATED getResource() const;
-    /// \endcond
+    static bool isBindIq(const QDomElement &element);
 
 protected:
     /// \cond
diff --git a/src/QXmppIncomingClient.cpp b/src/QXmppIncomingClient.cpp
index 1211bc18..1e9cd3e5 100644
--- a/src/QXmppIncomingClient.cpp
+++ b/src/QXmppIncomingClient.cpp
@@ -26,7 +26,7 @@
 #include <QSslSocket>
 #include <QTimer>
 
-#include "QXmppBind.h"
+#include "QXmppBindIq.h"
 #include "QXmppConstants.h"
 #include "QXmppMessage.h"
 #include "QXmppSessionIq.h"
@@ -256,13 +256,14 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
         if (nodeRecv.tagName() == "iq")
         {
             const QString type = nodeRecv.attribute("type");
-            if (QXmppBind::isBind(nodeRecv) && type == "set")
+            if (QXmppBindIq::isBindIq(nodeRecv) && type == "set")
             {
-                QXmppBind bindSet;
+                QXmppBindIq bindSet;
                 bindSet.parse(nodeRecv);
                 d->resource = bindSet.resource();
 
-                QXmppBind bindResult(QXmppIq::Result);
+                QXmppBindIq bindResult;
+                bindResult.setType(QXmppIq::Result);
                 bindResult.setId(bindSet.id());
                 bindResult.setJid(jid());
                 sendPacket(bindResult);
@@ -270,12 +271,13 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
                 // bound
                 emit connected();
             }
-            else if (QXmppSession::isSession(nodeRecv) && type == "set")
+            else if (QXmppSessionIq::isSessionIq(nodeRecv) && type == "set")
             {
-                QXmppSession sessionSet;
+                QXmppSessionIq sessionSet;
                 sessionSet.parse(nodeRecv);
 
-                QXmppSession sessionResult(QXmppIq::Result);
+                QXmppSessionIq sessionResult;
+                sessionResult.setType(QXmppIq::Result);
                 sessionResult.setId(sessionSet.id());
                 sendPacket(sessionResult);
             }
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index 83f8f895..a1125a84 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -38,7 +38,7 @@
 
 // IQ types
 #include "QXmppArchiveIq.h"
-#include "QXmppBind.h"
+#include "QXmppBindIq.h"
 #include "QXmppByteStreamIq.h"
 #include "QXmppDiscoveryIq.h"
 #include "QXmppIbbIq.h"
@@ -312,7 +312,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
         // check whether bind is available
         if (features.isBindAvailable())
         {
-            QXmppBind bind(QXmppIq::Set);
+            QXmppBindIq bind(QXmppIq::Set);
             bind.setResource(configuration().resource());
             d->bindId = bind.id();
             sendPacket(bind);
@@ -396,9 +396,9 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
                 d->sessionStarted = true;
                 emit connected();
             }
-            else if(QXmppBind::isBind(nodeRecv) && id == d->bindId)
+            else if(QXmppBindIq::isBindIq(nodeRecv) && id == d->bindId)
             {
-                QXmppBind bind;
+                QXmppBindIq bind;
                 bind.parse(nodeRecv);
 
                 // bind result
diff --git a/src/src.pro b/src/src.pro
index b9c652c3..b14412c9 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -21,7 +21,7 @@ DESTDIR = $$QXMPP_LIBRARY_DIR
 HEADERS += QXmppUtils.h \
     QXmppArchiveIq.h \
     QXmppArchiveManager.h \
-    QXmppBind.h \
+    QXmppBindIq.h \
     QXmppByteStreamIq.h \
     QXmppCallManager.h \
     QXmppClient.h \
@@ -70,7 +70,7 @@ HEADERS += QXmppUtils.h \
 SOURCES += QXmppUtils.cpp \
     QXmppArchiveIq.cpp \
     QXmppArchiveManager.cpp \
-    QXmppBind.cpp \
+    QXmppBindIq.cpp \
     QXmppByteStreamIq.cpp \
     QXmppCallManager.cpp \
     QXmppClient.cpp \