rename QXmppDataIq to QXmppIbbDataIq

8 files changed, 366 insertions, 382 deletions

diff --git a/source/QXmppDataIq.cpp b/source/QXmppDataIq.cpp
deleted file mode 100644
index a1fcda23..00000000
--- a/source/QXmppDataIq.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "QXmppDataIq.h"

-#include "QXmppConstants.h"

-

-#include <QXmlStreamWriter>

-#include <QDomElement>

-

-QXmppDataIq::QXmppDataIq() : QXmppIq( QXmppIq::Set ), m_seq(0)

-{

-}

-

-quint16 QXmppDataIq::getSequence() const

-{

-    return m_seq;

-}

-

-void QXmppDataIq::setSequence( quint16 seq )

-{

-    m_seq = seq;

-}

-

-QString QXmppDataIq::getSid() const

-{

-    return m_sid;

-}

-

-void QXmppDataIq::setSid( const QString &sid )

-{

-    m_sid = sid;

-}

-

-QByteArray QXmppDataIq::getPayload() const

-{

-    return m_payload;

-}

-

-void QXmppDataIq::setPayload( const QByteArray &data )

-{

-    m_payload = data;

-}

-

-

-void QXmppDataIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("data");

-    writer->writeAttribute( "xmlns",ns_ibb);

-    writer->writeAttribute( "sid",m_sid);

-    writer->writeAttribute( "seq",QString::number(m_seq) );

-    writer->writeCharacters( m_payload.toBase64() );

-    writer->writeEndElement();

-}

-

-void QXmppDataIq::parse( QDomElement &element )

-{

-    QDomElement dataElement = element.firstChildElement("data");

-    setId( element.attribute("id"));

-    setTo( element.attribute("to"));

-    setFrom( element.attribute("from"));

-    setTypeFromStr( element.attribute("type"));

-

-    m_sid = dataElement.attribute( "sid" );

-    m_seq = dataElement.attribute( "seq" ).toLong();

-    m_payload = QByteArray::fromBase64( dataElement.text().toLatin1() );

-}

-

-bool QXmppDataIq::isDataIq( QDomElement &element )

-{

-    QDomElement dataElement = element.firstChildElement("data");

-    return dataElement.namespaceURI() == ns_ibb;

-}

diff --git a/source/QXmppDataIq.h b/source/QXmppDataIq.h
deleted file mode 100644
index 0a987d29..00000000
--- a/source/QXmppDataIq.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef QXMPPDATAIQ_H

-#define QXMPPDATAIQ_H

-

-#include "QXmppIq.h"

-

-class QXmlStreamWriter;

-class QDomElement;

-

-class QXmppDataIq : public QXmppIq

-{

-public:

-    QXmppDataIq();

-

-    quint16 getSequence() const;

-    void setSequence( quint16 seq );

-    QString getSid() const;

-    void setSid( const QString &sid );

-    QByteArray getPayload() const;

-    void setPayload( const QByteArray &data );

-

-    void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-    void parse( QDomElement &element );

-    static bool isDataIq( QDomElement &element );

-private:

-    quint16 m_seq;

-    QString m_sid;

-    QByteArray m_payload;

-};

-

-#endif // QXMPPDATAIQ_H

diff --git a/source/QXmppIbbIqs.cpp b/source/QXmppIbbIqs.cpp
index f90dfbb1..aa5e938c 100644
--- a/source/QXmppIbbIqs.cpp
+++ b/source/QXmppIbbIqs.cpp
@@ -1,202 +1,266 @@
-#include "QXmppIbbIqs.h"

-#include "QXmppConstants.h"

-

-#include <QDomElement>

-#include <QXmlStreamWriter>

-

-QXmppIbbOpenIq::QXmppIbbOpenIq() : QXmppIq(QXmppIq::Set), m_block_size(1024)

-{

-

-}

-

-void QXmppIbbOpenIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("open");

-    writer->writeAttribute( "xmlns",ns_ibb);

-    writer->writeAttribute( "sid",m_sid);

-    writer->writeAttribute( "block-size",QString::number(m_block_size) );

-    writer->writeEndElement();

-}

-

-void QXmppIbbOpenIq::parse( QDomElement &element )

-{

-    QDomElement openElement = element.firstChildElement("open");

-    setId( element.attribute("id"));

-    setTo( element.attribute("to"));

-    setFrom( element.attribute("from"));

-    setTypeFromStr( element.attribute("type"));

-    m_sid = openElement.attribute( "sid" );

-    m_block_size = openElement.attribute( "block-size" ).toLong();

-}

-

-bool QXmppIbbOpenIq::isIbbOpenIq( QDomElement &element )

-{

-    QDomElement openElement = element.firstChildElement("open");

-    return openElement.namespaceURI() == ns_ibb;

-}

-

-long QXmppIbbOpenIq::getBlockSize() const

-{

-    return m_block_size;

-}

-

-void QXmppIbbOpenIq::setBlockSize( long block_size )

-{

-    m_block_size = block_size;

-}

-

-QString QXmppIbbOpenIq::getSid() const

-{

-   return  m_sid;

-}

-

-void QXmppIbbOpenIq::setSid( const QString &sid )

-{

-    m_sid = sid;

-}

-

-QXmppIbbAckIq::QXmppIbbAckIq() : QXmppIq(QXmppIq::Result)

-{

-

-}

-

-void QXmppIbbAckIq::parse( QDomElement &element )

-{

-    setId( element.attribute("id"));

-    setTo( element.attribute("to"));

-    setFrom( element.attribute("from"));

-    setTypeFromStr( element.attribute("type"));

-}

-bool QXmppIbbAckIq::isIbbAckIq( QDomElement &element )

-{

-    return element.attribute("type") == "result";

-}

-

-QXmppIbbErrorIq::QXmppIbbErrorIq()  : QXmppIq(QXmppIq::Error), m_type(Unknown)

-{

-

-}

-

-void QXmppIbbErrorIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("error");

-    switch( m_type ) {

-        case Unknown:

-            break;

-        case Cancel:

-            writer->writeAttribute("type", "cancel");

-            writer->writeStartElement("not-acceptable");

-            break;

-        case NoSupport:

-            writer->writeAttribute("type", "cancel");

-            writer->writeStartElement("service-unavailable");

-            break;

-        case Modify:

-            writer->writeAttribute("type", "modify");

-            writer->writeStartElement("resource-constrainte");

-            break;

-        case NotFound:

-            writer->writeAttribute("type", "cancel");

-            writer->writeStartElement("item-not-found");

-            break;

-    }

-

-    writer->writeAttribute("xmlns", "urn:ietf:params:xml:ns:xmpp-stanzas");

-    writer->writeEndElement();

-    writer->writeEndElement();

-}

-

-void QXmppIbbErrorIq::parse( QDomElement &element )

-{

-    QDomElement errorElement = element.firstChildElement("error");

-    setId( element.attribute("id"));

-    setTo( element.attribute("to"));

-    setFrom( element.attribute("from"));

-    setTypeFromStr( element.attribute("type"));

-    if ( errorElement.attribute( "type" ) == "cancel" )

-    {

-       if( !errorElement.firstChildElement("service-unavailable").isNull() )

-            m_type = NoSupport;

-       else if( !errorElement.firstChildElement("not-acceptable").isNull() )

-            m_type = Cancel;

-       else if( !errorElement.firstChildElement("item-not-found").isNull() )

-            m_type = NotFound;

-       else

-           m_type = Unknown;

-    }

-    else if ( errorElement.attribute( "type" ) == "modify" )

-    {

-        if( !errorElement.firstChildElement("resource-constraint").isNull() )

-            m_type = Modify;

-        else

-            m_type = Unknown;

-    }

-    else

-        m_type = Unknown;

-    m_errorString = errorElement.text();

-

-}

-

-bool QXmppIbbErrorIq::isIbbErrorIq( QDomElement &element )

-{

-    return element.attribute("type") == "error";

-}

-

-QXmppIbbErrorIq::Type QXmppIbbErrorIq::getErrorType() const

-{

-    return m_type;

-}

-

-void QXmppIbbErrorIq::setErrorType( Type err )

-{

-    m_type = err;

-}

-

-QString QXmppIbbErrorIq::getErrorString() const

-{

-    return m_errorString;

-}

-

-void QXmppIbbErrorIq::setErrorString( const QString &err )

-{

-    m_errorString = err;

-}

-

-QXmppIbbCloseIq::QXmppIbbCloseIq() : QXmppIq(QXmppIq::Set)

-{

-

-}

-

-void QXmppIbbCloseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("close");

-    writer->writeAttribute( "xmlns",ns_ibb);

-    writer->writeAttribute( "sid",m_sid);

-    writer->writeEndElement();

-}

-

-void QXmppIbbCloseIq::parse( QDomElement &element )

-{

-    QDomElement openElement = element.firstChildElement("close");

-    setId( element.attribute("id"));

-    setTo( element.attribute("to"));

-    setFrom( element.attribute("from"));

-    setTypeFromStr( element.attribute("type"));

-    m_sid = openElement.attribute( "sid" );

-}

-

-bool QXmppIbbCloseIq::isIbbCloseIq( QDomElement &element )

-{

-    QDomElement openElement = element.firstChildElement("close");

-    return openElement.namespaceURI() == ns_ibb;

-}

-

-QString QXmppIbbCloseIq::getSid() const

-{

-   return  m_sid;

-}

-

-void QXmppIbbCloseIq::setSid( const QString &sid )

-{

-    m_sid = sid;

-}

+#include "QXmppIbbIqs.h"
+#include "QXmppConstants.h"
+
+#include <QDomElement>
+#include <QXmlStreamWriter>
+
+QXmppIbbOpenIq::QXmppIbbOpenIq() : QXmppIq(QXmppIq::Set), m_block_size(1024)
+{
+
+}
+
+void QXmppIbbOpenIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("open");
+    writer->writeAttribute( "xmlns",ns_ibb);
+    writer->writeAttribute( "sid",m_sid);
+    writer->writeAttribute( "block-size",QString::number(m_block_size) );
+    writer->writeEndElement();
+}
+
+void QXmppIbbOpenIq::parse( QDomElement &element )
+{
+    QDomElement openElement = element.firstChildElement("open");
+    setId( element.attribute("id"));
+    setTo( element.attribute("to"));
+    setFrom( element.attribute("from"));
+    setTypeFromStr( element.attribute("type"));
+    m_sid = openElement.attribute( "sid" );
+    m_block_size = openElement.attribute( "block-size" ).toLong();
+}
+
+bool QXmppIbbOpenIq::isIbbOpenIq( QDomElement &element )
+{
+    QDomElement openElement = element.firstChildElement("open");
+    return openElement.namespaceURI() == ns_ibb;
+}
+
+long QXmppIbbOpenIq::getBlockSize() const
+{
+    return m_block_size;
+}
+
+void QXmppIbbOpenIq::setBlockSize( long block_size )
+{
+    m_block_size = block_size;
+}
+
+QString QXmppIbbOpenIq::getSid() const
+{
+   return  m_sid;
+}
+
+void QXmppIbbOpenIq::setSid( const QString &sid )
+{
+    m_sid = sid;
+}
+
+QXmppIbbAckIq::QXmppIbbAckIq() : QXmppIq(QXmppIq::Result)
+{
+
+}
+
+void QXmppIbbAckIq::parse( QDomElement &element )
+{
+    setId( element.attribute("id"));
+    setTo( element.attribute("to"));
+    setFrom( element.attribute("from"));
+    setTypeFromStr( element.attribute("type"));
+}
+bool QXmppIbbAckIq::isIbbAckIq( QDomElement &element )
+{
+    return element.attribute("type") == "result";
+}
+
+QXmppIbbErrorIq::QXmppIbbErrorIq()  : QXmppIq(QXmppIq::Error), m_type(Unknown)
+{
+
+}
+
+void QXmppIbbErrorIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("error");
+    switch( m_type ) {
+        case Unknown:
+            break;
+        case Cancel:
+            writer->writeAttribute("type", "cancel");
+            writer->writeStartElement("not-acceptable");
+            break;
+        case NoSupport:
+            writer->writeAttribute("type", "cancel");
+            writer->writeStartElement("service-unavailable");
+            break;
+        case Modify:
+            writer->writeAttribute("type", "modify");
+            writer->writeStartElement("resource-constrainte");
+            break;
+        case NotFound:
+            writer->writeAttribute("type", "cancel");
+            writer->writeStartElement("item-not-found");
+            break;
+    }
+
+    writer->writeAttribute("xmlns", "urn:ietf:params:xml:ns:xmpp-stanzas");
+    writer->writeEndElement();
+    writer->writeEndElement();
+}
+
+void QXmppIbbErrorIq::parse( QDomElement &element )
+{
+    QDomElement errorElement = element.firstChildElement("error");
+    setId( element.attribute("id"));
+    setTo( element.attribute("to"));
+    setFrom( element.attribute("from"));
+    setTypeFromStr( element.attribute("type"));
+    if ( errorElement.attribute( "type" ) == "cancel" )
+    {
+       if( !errorElement.firstChildElement("service-unavailable").isNull() )
+            m_type = NoSupport;
+       else if( !errorElement.firstChildElement("not-acceptable").isNull() )
+            m_type = Cancel;
+       else if( !errorElement.firstChildElement("item-not-found").isNull() )
+            m_type = NotFound;
+       else
+           m_type = Unknown;
+    }
+    else if ( errorElement.attribute( "type" ) == "modify" )
+    {
+        if( !errorElement.firstChildElement("resource-constraint").isNull() )
+            m_type = Modify;
+        else
+            m_type = Unknown;
+    }
+    else
+        m_type = Unknown;
+    m_errorString = errorElement.text();
+
+}
+
+bool QXmppIbbErrorIq::isIbbErrorIq( QDomElement &element )
+{
+    return element.attribute("type") == "error";
+}
+
+QXmppIbbErrorIq::Type QXmppIbbErrorIq::getErrorType() const
+{
+    return m_type;
+}
+
+void QXmppIbbErrorIq::setErrorType( Type err )
+{
+    m_type = err;
+}
+
+QString QXmppIbbErrorIq::getErrorString() const
+{
+    return m_errorString;
+}
+
+void QXmppIbbErrorIq::setErrorString( const QString &err )
+{
+    m_errorString = err;
+}
+
+QXmppIbbCloseIq::QXmppIbbCloseIq() : QXmppIq(QXmppIq::Set)
+{
+
+}
+
+void QXmppIbbCloseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("close");
+    writer->writeAttribute( "xmlns",ns_ibb);
+    writer->writeAttribute( "sid",m_sid);
+    writer->writeEndElement();
+}
+
+void QXmppIbbCloseIq::parse( QDomElement &element )
+{
+    QDomElement openElement = element.firstChildElement("close");
+    setId( element.attribute("id"));
+    setTo( element.attribute("to"));
+    setFrom( element.attribute("from"));
+    setTypeFromStr( element.attribute("type"));
+    m_sid = openElement.attribute( "sid" );
+}
+
+bool QXmppIbbCloseIq::isIbbCloseIq( QDomElement &element )
+{
+    QDomElement openElement = element.firstChildElement("close");
+    return openElement.namespaceURI() == ns_ibb;
+}
+
+QString QXmppIbbCloseIq::getSid() const
+{
+   return  m_sid;
+}
+
+void QXmppIbbCloseIq::setSid( const QString &sid )
+{
+    m_sid = sid;
+}
+
+QXmppIbbDataIq::QXmppIbbDataIq() : QXmppIq( QXmppIq::Set ), m_seq(0)
+{
+}
+
+quint16 QXmppIbbDataIq::getSequence() const
+{
+    return m_seq;
+}
+
+void QXmppIbbDataIq::setSequence( quint16 seq )
+{
+    m_seq = seq;
+}
+
+QString QXmppIbbDataIq::getSid() const
+{
+    return m_sid;
+}
+
+void QXmppIbbDataIq::setSid( const QString &sid )
+{
+    m_sid = sid;
+}
+
+QByteArray QXmppIbbDataIq::getPayload() const
+{
+    return m_payload;
+}
+
+void QXmppIbbDataIq::setPayload( const QByteArray &data )
+{
+    m_payload = data;
+}
+
+
+void QXmppIbbDataIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("data");
+    writer->writeAttribute( "xmlns",ns_ibb);
+    writer->writeAttribute( "sid",m_sid);
+    writer->writeAttribute( "seq",QString::number(m_seq) );
+    writer->writeCharacters( m_payload.toBase64() );
+    writer->writeEndElement();
+}
+
+void QXmppIbbDataIq::parse( QDomElement &element )
+{
+    QDomElement dataElement = element.firstChildElement("data");
+    setId( element.attribute("id"));
+    setTo( element.attribute("to"));
+    setFrom( element.attribute("from"));
+    setTypeFromStr( element.attribute("type"));
+
+    m_sid = dataElement.attribute( "sid" );
+    m_seq = dataElement.attribute( "seq" ).toLong();
+    m_payload = QByteArray::fromBase64( dataElement.text().toLatin1() );
+}
+
+bool QXmppIbbDataIq::isIbbDataIq( QDomElement &element )
+{
+    QDomElement dataElement = element.firstChildElement("data");
+    return dataElement.namespaceURI() == ns_ibb;
+}
diff --git a/source/QXmppIbbIqs.h b/source/QXmppIbbIqs.h
index 058a1a85..7d032e55 100644
--- a/source/QXmppIbbIqs.h
+++ b/source/QXmppIbbIqs.h
@@ -1,70 +1,93 @@
-#ifndef QXMPPIBBIQS_H

-#define QXMPPIBBIQS_H

-

-#include "QXmppIq.h"

-

-class QDomElement;

-class QXmlStreamWriter;

-

-class QXmppIbbOpenIq: public QXmppIq

-{

-public:

-    QXmppIbbOpenIq();

-    void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-    void parse( QDomElement &element );

-    static bool isIbbOpenIq( QDomElement &element );

-

-    long getBlockSize() const;

-    void setBlockSize( long block_size );

-

-    QString getSid() const;

-    void setSid( const QString &sid );

-

-private:

-    long m_block_size;

-    QString m_sid;

-};

-

-class QXmppIbbAckIq: public QXmppIq

-{

-public:

-    QXmppIbbAckIq();

-    void parse( QDomElement &element );

-    static bool isIbbAckIq( QDomElement &element );

-};

-

-class QXmppIbbErrorIq: public QXmppIq

-{

-public:

-    enum Type { Unknown, Cancel, NoSupport, Modify, NotFound };

-    QXmppIbbErrorIq();

-    void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-    void parse( QDomElement &element );

-    static bool isIbbErrorIq( QDomElement &element );

-

-    Type getErrorType() const;

-    void setErrorType( Type err );

-

-    QString getErrorString() const;

-    void setErrorString( const QString &err );

-

-private:

-    Type m_type;

-    QString m_errorString;

-};

-

-class QXmppIbbCloseIq: public QXmppIq

-{

-public:

-    QXmppIbbCloseIq();

-    void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-    void parse( QDomElement &element );

-    static bool isIbbCloseIq( QDomElement &element );

-

-    QString getSid() const;

-    void setSid( const QString &sid );

-

-private:

-    QString m_sid;

-};

-#endif // QXMPPIBBIQS_H

+#ifndef QXMPPIBBIQS_H
+#define QXMPPIBBIQS_H
+
+#include "QXmppIq.h"
+
+class QDomElement;
+class QXmlStreamWriter;
+
+class QXmppIbbOpenIq: public QXmppIq
+{
+public:
+    QXmppIbbOpenIq();
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+    void parse( QDomElement &element );
+    static bool isIbbOpenIq( QDomElement &element );
+
+    long getBlockSize() const;
+    void setBlockSize( long block_size );
+
+    QString getSid() const;
+    void setSid( const QString &sid );
+
+private:
+    long m_block_size;
+    QString m_sid;
+};
+
+class QXmppIbbAckIq: public QXmppIq
+{
+public:
+    QXmppIbbAckIq();
+    void parse( QDomElement &element );
+    static bool isIbbAckIq( QDomElement &element );
+};
+
+class QXmppIbbErrorIq: public QXmppIq
+{
+public:
+    enum Type { Unknown, Cancel, NoSupport, Modify, NotFound };
+    QXmppIbbErrorIq();
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+    void parse( QDomElement &element );
+    static bool isIbbErrorIq( QDomElement &element );
+
+    Type getErrorType() const;
+    void setErrorType( Type err );
+
+    QString getErrorString() const;
+    void setErrorString( const QString &err );
+
+private:
+    Type m_type;
+    QString m_errorString;
+};
+
+class QXmppIbbCloseIq: public QXmppIq
+{
+public:
+    QXmppIbbCloseIq();
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+    void parse( QDomElement &element );
+    static bool isIbbCloseIq( QDomElement &element );
+
+    QString getSid() const;
+    void setSid( const QString &sid );
+
+private:
+    QString m_sid;
+};
+
+class QXmppIbbDataIq : public QXmppIq
+{
+public:
+    QXmppIbbDataIq();
+
+    quint16 getSequence() const;
+    void setSequence( quint16 seq );
+    QString getSid() const;
+    void setSid( const QString &sid );
+    QByteArray getPayload() const;
+    void setPayload( const QByteArray &data );
+
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+    void parse( QDomElement &element );
+    static bool isIbbDataIq( QDomElement &element );
+
+private:
+    quint16 m_seq;
+    QString m_sid;
+    QByteArray m_payload;
+};
+
+#endif // QXMPPIBBIQS_H
diff --git a/source/QXmppIbbTransferJob.cpp b/source/QXmppIbbTransferJob.cpp
index 4835596a..f6af11e6 100644
--- a/source/QXmppIbbTransferJob.cpp
+++ b/source/QXmppIbbTransferJob.cpp
@@ -3,7 +3,6 @@
 #include <QIODevice>

 #include <QUuid>

 #include "QXmppIbbIqs.h"

-#include "QXmppDataIq.h"

 #include "QXmppClient.h"

 #include "QXmppUtils.h"

 

@@ -50,7 +49,6 @@ void QXmppIbbTransferJob::setId( const QString &id )
     m_id  = id;

 }

 

-

 void QXmppIbbTransferJob::requestTransfer( )

 {

     m_state = Requesting;

@@ -164,7 +162,8 @@ void QXmppIbbTransferJob::gotError( const QXmppIbbErrorIq &err )
     emit transferCanceled(m_sid,err.getError().getConditionStr());

     emit readyForTeardown(m_sid);

 }

-void QXmppIbbTransferJob::gotData( const  QXmppDataIq &data )

+

+void QXmppIbbTransferJob::gotData( const QXmppIbbDataIq &data )

 {

     if( m_io &&

         (data.getSequence() == 0 || data.getSequence() > m_sequence) )

@@ -217,7 +216,7 @@ void QXmppIbbTransferJob::sendNextBlock()
         QByteArray buffer = m_io->read( m_blockSize );

 

         m_sequence++;

-        QXmppDataIq sendData;

+        QXmppIbbDataIq sendData;

         sendData.setId(m_id);

         sendData.setTo(m_remoteJid);

         sendData.setFrom(m_localJid);

diff --git a/source/QXmppIbbTransferJob.h b/source/QXmppIbbTransferJob.h
index 2c14c03d..a3bf1140 100644
--- a/source/QXmppIbbTransferJob.h
+++ b/source/QXmppIbbTransferJob.h
@@ -6,7 +6,7 @@ class QIODevice;
 class QXmppIbbOpenIq;

 class QXmppIbbCloseIq;

 class QXmppIbbErrorIq;

-class QXmppDataIq;

+class QXmppIbbDataIq;

 class QXmppClient;

 

 class QXmppIbbTransferJob : public QObject

@@ -45,7 +45,7 @@ public:
     void gotOpen( const QXmppIbbOpenIq &open );

     void gotClose( const QXmppIbbCloseIq &close );

     void gotError( const QXmppIbbErrorIq &err );

-    void gotData( const  QXmppDataIq &data );

+    void gotData( const  QXmppIbbDataIq &data );

 

 private:

     enum TransferState { Idle, Requesting, Pending, TransferringIn, TransferringOut };

diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 55c6d58c..d01b4130 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -38,7 +38,6 @@
 #include "QXmppNonSASLAuth.h"
 #include "QXmppInformationRequestResult.h"
 #include "QXmppIbbIqs.h"
-#include "QXmppDataIq.h"
 #include "QXmppRpcIq.h"
 #include "QXmppIbbTransferManager.h"
 #include "QXmppArchiveIq.h"
@@ -462,10 +461,10 @@ void QXmppStream::parser(const QByteArray& data)
                         QXmppIbbTransferJob *mgr = m_client->getIbbTransferManager()->getIbbTransferJob(ackIqPacket.getId());
                         mgr->gotAck();
                     }
-                    else if( QXmppDataIq::isDataIq( nodeRecv ) &&
+                    else if( QXmppIbbDataIq::isIbbDataIq( nodeRecv ) &&
                              m_client->getIbbTransferManager()->isIbbTransferJobId( id ))
                     {
-                        QXmppDataIq dataIqPacket;
+                        QXmppIbbDataIq dataIqPacket;
                         dataIqPacket.parse(nodeRecv);
 
                         QXmppIbbTransferJob *mgr = m_client->getIbbTransferManager()->getIbbTransferJob(dataIqPacket.getId());
diff --git a/source/source.pro b/source/source.pro
index 6708f670..46b70925 100644
--- a/source/source.pro
+++ b/source/source.pro
@@ -39,7 +39,6 @@ HEADERS += QXmppUtils.h \
     QXmppVCard.h \
     QXmppNonSASLAuth.h \
     QXmppInformationRequestResult.h \
-    QXmppDataIq.h \
     QXmppIbbIqs.h \
     QXmppIbbTransferJob.h \
     QXmppIbbTransferManager.h \
@@ -75,7 +74,6 @@ SOURCES += QXmppUtils.cpp \
     QXmppVCard.cpp \
     QXmppNonSASLAuth.cpp \
     QXmppInformationRequestResult.cpp \
-    QXmppDataIq.cpp \
     QXmppIbbIqs.cpp \
     QXmppIbbTransferJob.cpp \
     QXmppIbbTransferManager.cpp \