From ec09e22b712cc1daf0428bfca75372469de7dbea Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 4 Mar 2010 09:32:16 +0000 Subject: internal API cleanup : rename QXmppIbbIqs to QXmppIbbIq for consistency --- source/QXmppIbbIq.cpp | 158 ++++++++++++++++++++++++++++++++++++++++ source/QXmppIbbIq.h | 69 ++++++++++++++++++ source/QXmppIbbIqs.cpp | 158 ---------------------------------------- source/QXmppIbbIqs.h | 69 ------------------ source/QXmppStream.cpp | 2 +- source/QXmppTransferManager.cpp | 2 +- source/source.pro | 32 ++++---- 7 files changed, 245 insertions(+), 245 deletions(-) create mode 100644 source/QXmppIbbIq.cpp create mode 100644 source/QXmppIbbIq.h delete mode 100644 source/QXmppIbbIqs.cpp delete mode 100644 source/QXmppIbbIqs.h (limited to 'source') diff --git a/source/QXmppIbbIq.cpp b/source/QXmppIbbIq.cpp new file mode 100644 index 00000000..a85d0f54 --- /dev/null +++ b/source/QXmppIbbIq.cpp @@ -0,0 +1,158 @@ +#include +#include + +#include "QXmppConstants.h" +#include "QXmppIbbIq.h" + +QXmppIbbOpenIq::QXmppIbbOpenIq() : QXmppIq(QXmppIq::Set), m_block_size(1024) +{ + +} + +long QXmppIbbOpenIq::blockSize() const +{ + return m_block_size; +} + +void QXmppIbbOpenIq::setBlockSize( long block_size ) +{ + m_block_size = block_size; +} + +QString QXmppIbbOpenIq::sid() const +{ + return m_sid; +} + +void QXmppIbbOpenIq::setSid( const QString &sid ) +{ + m_sid = sid; +} + +bool QXmppIbbOpenIq::isIbbOpenIq(const QDomElement &element) +{ + QDomElement openElement = element.firstChildElement("open"); + return openElement.namespaceURI() == ns_ibb; +} + +void QXmppIbbOpenIq::parse(const QDomElement &element) +{ + QXmppStanza::parse(element); + + setTypeFromStr(element.attribute("type")); + + QDomElement openElement = element.firstChildElement("open"); + m_sid = openElement.attribute( "sid" ); + m_block_size = openElement.attribute( "block-size" ).toLong(); +} + +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(); +} + +QXmppIbbCloseIq::QXmppIbbCloseIq() : QXmppIq(QXmppIq::Set) +{ + +} + +QString QXmppIbbCloseIq::sid() const +{ + return m_sid; +} + +void QXmppIbbCloseIq::setSid( const QString &sid ) +{ + m_sid = sid; +} + +bool QXmppIbbCloseIq::isIbbCloseIq(const QDomElement &element) +{ + QDomElement openElement = element.firstChildElement("close"); + return openElement.namespaceURI() == ns_ibb; +} + +void QXmppIbbCloseIq::parse(const QDomElement &element) +{ + QXmppStanza::parse(element); + + setTypeFromStr(element.attribute("type")); + + QDomElement openElement = element.firstChildElement("close"); + m_sid = openElement.attribute( "sid" ); +} + +void QXmppIbbCloseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("close"); + writer->writeAttribute( "xmlns",ns_ibb); + writer->writeAttribute( "sid",m_sid); + writer->writeEndElement(); +} + + +QXmppIbbDataIq::QXmppIbbDataIq() : QXmppIq( QXmppIq::Set ), m_seq(0) +{ +} + +quint16 QXmppIbbDataIq::sequence() const +{ + return m_seq; +} + +void QXmppIbbDataIq::setSequence( quint16 seq ) +{ + m_seq = seq; +} + +QString QXmppIbbDataIq::sid() const +{ + return m_sid; +} + +void QXmppIbbDataIq::setSid( const QString &sid ) +{ + m_sid = sid; +} + +QByteArray QXmppIbbDataIq::payload() const +{ + return m_payload; +} + +void QXmppIbbDataIq::setPayload( const QByteArray &data ) +{ + m_payload = data; +} + +bool QXmppIbbDataIq::isIbbDataIq(const QDomElement &element) +{ + QDomElement dataElement = element.firstChildElement("data"); + return dataElement.namespaceURI() == ns_ibb; +} + +void QXmppIbbDataIq::parse(const QDomElement &element) +{ + QXmppStanza::parse(element); + + setTypeFromStr(element.attribute("type")); + + QDomElement dataElement = element.firstChildElement("data"); + m_sid = dataElement.attribute( "sid" ); + m_seq = dataElement.attribute( "seq" ).toLong(); + m_payload = QByteArray::fromBase64( dataElement.text().toLatin1() ); +} + +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(); +} diff --git a/source/QXmppIbbIq.h b/source/QXmppIbbIq.h new file mode 100644 index 00000000..33dc9e42 --- /dev/null +++ b/source/QXmppIbbIq.h @@ -0,0 +1,69 @@ +#ifndef QXMPPIBBIQ_H +#define QXMPPIBBIQ_H + +#include "QXmppIq.h" + +class QDomElement; +class QXmlStreamWriter; + +class QXmppIbbOpenIq: public QXmppIq +{ +public: + QXmppIbbOpenIq(); + + long blockSize() const; + void setBlockSize( long block_size ); + + QString sid() const; + void setSid( const QString &sid ); + + static bool isIbbOpenIq(const QDomElement &element); + void parse(const QDomElement &element); + void toXmlElementFromChild(QXmlStreamWriter *writer) const; + +private: + long m_block_size; + QString m_sid; +}; + +class QXmppIbbCloseIq: public QXmppIq +{ +public: + QXmppIbbCloseIq(); + + QString sid() const; + void setSid( const QString &sid ); + + static bool isIbbCloseIq(const QDomElement &element); + void parse(const QDomElement &element); + void toXmlElementFromChild(QXmlStreamWriter *writer) const; + +private: + QString m_sid; +}; + +class QXmppIbbDataIq : public QXmppIq +{ +public: + QXmppIbbDataIq(); + + quint16 sequence() const; + void setSequence( quint16 seq ); + + QString sid() const; + void setSid( const QString &sid ); + + QByteArray payload() const; + void setPayload( const QByteArray &data ); + + static bool isIbbDataIq(const QDomElement &element); + void parse(const QDomElement &element); + void toXmlElementFromChild(QXmlStreamWriter *writer) const; + +private: + quint16 m_seq; + QString m_sid; + QByteArray m_payload; +}; + +#endif // QXMPPIBBIQS_H diff --git a/source/QXmppIbbIqs.cpp b/source/QXmppIbbIqs.cpp deleted file mode 100644 index 9d360ac9..00000000 --- a/source/QXmppIbbIqs.cpp +++ /dev/null @@ -1,158 +0,0 @@ -#include "QXmppIbbIqs.h" -#include "QXmppConstants.h" - -#include -#include - -QXmppIbbOpenIq::QXmppIbbOpenIq() : QXmppIq(QXmppIq::Set), m_block_size(1024) -{ - -} - -long QXmppIbbOpenIq::blockSize() const -{ - return m_block_size; -} - -void QXmppIbbOpenIq::setBlockSize( long block_size ) -{ - m_block_size = block_size; -} - -QString QXmppIbbOpenIq::sid() const -{ - return m_sid; -} - -void QXmppIbbOpenIq::setSid( const QString &sid ) -{ - m_sid = sid; -} - -bool QXmppIbbOpenIq::isIbbOpenIq(const QDomElement &element) -{ - QDomElement openElement = element.firstChildElement("open"); - return openElement.namespaceURI() == ns_ibb; -} - -void QXmppIbbOpenIq::parse(const QDomElement &element) -{ - QXmppStanza::parse(element); - - setTypeFromStr(element.attribute("type")); - - QDomElement openElement = element.firstChildElement("open"); - m_sid = openElement.attribute( "sid" ); - m_block_size = openElement.attribute( "block-size" ).toLong(); -} - -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(); -} - -QXmppIbbCloseIq::QXmppIbbCloseIq() : QXmppIq(QXmppIq::Set) -{ - -} - -QString QXmppIbbCloseIq::sid() const -{ - return m_sid; -} - -void QXmppIbbCloseIq::setSid( const QString &sid ) -{ - m_sid = sid; -} - -bool QXmppIbbCloseIq::isIbbCloseIq(const QDomElement &element) -{ - QDomElement openElement = element.firstChildElement("close"); - return openElement.namespaceURI() == ns_ibb; -} - -void QXmppIbbCloseIq::parse(const QDomElement &element) -{ - QXmppStanza::parse(element); - - setTypeFromStr(element.attribute("type")); - - QDomElement openElement = element.firstChildElement("close"); - m_sid = openElement.attribute( "sid" ); -} - -void QXmppIbbCloseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("close"); - writer->writeAttribute( "xmlns",ns_ibb); - writer->writeAttribute( "sid",m_sid); - writer->writeEndElement(); -} - - -QXmppIbbDataIq::QXmppIbbDataIq() : QXmppIq( QXmppIq::Set ), m_seq(0) -{ -} - -quint16 QXmppIbbDataIq::sequence() const -{ - return m_seq; -} - -void QXmppIbbDataIq::setSequence( quint16 seq ) -{ - m_seq = seq; -} - -QString QXmppIbbDataIq::sid() const -{ - return m_sid; -} - -void QXmppIbbDataIq::setSid( const QString &sid ) -{ - m_sid = sid; -} - -QByteArray QXmppIbbDataIq::payload() const -{ - return m_payload; -} - -void QXmppIbbDataIq::setPayload( const QByteArray &data ) -{ - m_payload = data; -} - -bool QXmppIbbDataIq::isIbbDataIq(const QDomElement &element) -{ - QDomElement dataElement = element.firstChildElement("data"); - return dataElement.namespaceURI() == ns_ibb; -} - -void QXmppIbbDataIq::parse(const QDomElement &element) -{ - QXmppStanza::parse(element); - - setTypeFromStr(element.attribute("type")); - - QDomElement dataElement = element.firstChildElement("data"); - m_sid = dataElement.attribute( "sid" ); - m_seq = dataElement.attribute( "seq" ).toLong(); - m_payload = QByteArray::fromBase64( dataElement.text().toLatin1() ); -} - -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(); -} diff --git a/source/QXmppIbbIqs.h b/source/QXmppIbbIqs.h deleted file mode 100644 index 4401e7dc..00000000 --- a/source/QXmppIbbIqs.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef QXMPPIBBIQS_H -#define QXMPPIBBIQS_H - -#include "QXmppIq.h" - -class QDomElement; -class QXmlStreamWriter; - -class QXmppIbbOpenIq: public QXmppIq -{ -public: - QXmppIbbOpenIq(); - - long blockSize() const; - void setBlockSize( long block_size ); - - QString sid() const; - void setSid( const QString &sid ); - - static bool isIbbOpenIq(const QDomElement &element); - void parse(const QDomElement &element); - void toXmlElementFromChild(QXmlStreamWriter *writer) const; - -private: - long m_block_size; - QString m_sid; -}; - -class QXmppIbbCloseIq: public QXmppIq -{ -public: - QXmppIbbCloseIq(); - - QString sid() const; - void setSid( const QString &sid ); - - static bool isIbbCloseIq(const QDomElement &element); - void parse(const QDomElement &element); - void toXmlElementFromChild(QXmlStreamWriter *writer) const; - -private: - QString m_sid; -}; - -class QXmppIbbDataIq : public QXmppIq -{ -public: - QXmppIbbDataIq(); - - quint16 sequence() const; - void setSequence( quint16 seq ); - - QString sid() const; - void setSid( const QString &sid ); - - QByteArray payload() const; - void setPayload( const QByteArray &data ); - - static bool isIbbDataIq(const QDomElement &element); - void parse(const QDomElement &element); - void toXmlElementFromChild(QXmlStreamWriter *writer) const; - -private: - quint16 m_seq; - QString m_sid; - QByteArray m_payload; -}; - -#endif // QXMPPIBBIQS_H diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp index 6e70566d..a67e1aba 100644 --- a/source/QXmppStream.cpp +++ b/source/QXmppStream.cpp @@ -37,7 +37,7 @@ #include "QXmppVCard.h" #include "QXmppNonSASLAuth.h" #include "QXmppInformationRequestResult.h" -#include "QXmppIbbIqs.h" +#include "QXmppIbbIq.h" #include "QXmppRpcIq.h" #include "QXmppArchiveIq.h" #include "QXmppByteStreamIq.h" diff --git a/source/QXmppTransferManager.cpp b/source/QXmppTransferManager.cpp index 796d4344..7ed94390 100644 --- a/source/QXmppTransferManager.cpp +++ b/source/QXmppTransferManager.cpp @@ -30,7 +30,7 @@ #include "QXmppByteStreamIq.h" #include "QXmppClient.h" #include "QXmppConstants.h" -#include "QXmppIbbIqs.h" +#include "QXmppIbbIq.h" #include "QXmppSocks.h" #include "QXmppStreamInitiationIq.h" #include "QXmppTransferManager.h" diff --git a/source/source.pro b/source/source.pro index 52037813..5d355ce6 100644 --- a/source/source.pro +++ b/source/source.pro @@ -23,8 +23,13 @@ HEADERS += QXmppUtils.h \ QXmppConstants.h \ QXmppDiscoveryIq.h \ QXmppElement.h \ + QXmppIbbIq.h \ + QXmppInformationRequestResult.h \ + QXmppInvokable.h \ QXmppIq.h \ + QXmppLogger.h \ QXmppMessage.h \ + QXmppNonSASLAuth.h \ QXmppPacket.h \ QXmppPingIq.h \ QXmppPresence.h \ @@ -36,17 +41,12 @@ HEADERS += QXmppUtils.h \ QXmppStream.h \ QXmppStreamInitiationIq.h \ QXmppTransferManager.h \ - QXmppLogger.h \ QXmppReconnectionManager.h \ + QXmppRemoteMethod.h \ + QXmppRpcIq.h \ QXmppVCardManager.h \ QXmppVCard.h \ - QXmppNonSASLAuth.h \ - QXmppInformationRequestResult.h \ - QXmppIbbIqs.h \ - xmlrpc.h \ - QXmppInvokable.h \ - QXmppRpcIq.h \ - QXmppRemoteMethod.h + xmlrpc.h # Source files SOURCES += QXmppUtils.cpp \ @@ -59,8 +59,13 @@ SOURCES += QXmppUtils.cpp \ QXmppConstants.cpp \ QXmppDiscoveryIq.cpp \ QXmppElement.cpp \ + QXmppIbbIq.cpp \ + QXmppInformationRequestResult.cpp \ + QXmppInvokable.cpp \ QXmppIq.cpp \ + QXmppLogger.cpp \ QXmppMessage.cpp \ + QXmppNonSASLAuth.cpp \ QXmppPacket.cpp \ QXmppPingIq.cpp \ QXmppPresence.cpp \ @@ -72,14 +77,9 @@ SOURCES += QXmppUtils.cpp \ QXmppStream.cpp \ QXmppStreamInitiationIq.cpp \ QXmppTransferManager.cpp \ - QXmppLogger.cpp \ QXmppReconnectionManager.cpp \ + QXmppRemoteMethod.cpp \ + QXmppRpcIq.cpp \ QXmppVCardManager.cpp \ QXmppVCard.cpp \ - QXmppNonSASLAuth.cpp \ - QXmppInformationRequestResult.cpp \ - QXmppIbbIqs.cpp \ - xmlrpc.cpp \ - QXmppInvokable.cpp \ - QXmppRpcIq.cpp \ - QXmppRemoteMethod.cpp + xmlrpc.cpp -- cgit v1.2.3