diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-03-04 06:11:40 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-03-04 06:11:40 +0000 |
| commit | 801a435be9e271226d3c53b6eb36fb506b9faa9d (patch) | |
| tree | 0b0e6951eb7b300cacc503c4140ac0f3cdd470cc /source | |
| parent | 1d462f4db4fa3563f1e1050c40765c855196000d (diff) | |
| download | qxmpp-801a435be9e271226d3c53b6eb36fb506b9faa9d.tar.gz | |
internal API cleanup : remove "get" from IBB IQ accessors
Diffstat (limited to 'source')
| -rw-r--r-- | source/QXmppIbbIqs.cpp | 12 | ||||
| -rw-r--r-- | source/QXmppIbbIqs.h | 12 | ||||
| -rw-r--r-- | source/QXmppTransferManager.cpp | 14 |
3 files changed, 19 insertions, 19 deletions
diff --git a/source/QXmppIbbIqs.cpp b/source/QXmppIbbIqs.cpp index 6a85e417..caffe49f 100644 --- a/source/QXmppIbbIqs.cpp +++ b/source/QXmppIbbIqs.cpp @@ -35,7 +35,7 @@ bool QXmppIbbOpenIq::isIbbOpenIq( QDomElement &element ) return openElement.namespaceURI() == ns_ibb; } -long QXmppIbbOpenIq::getBlockSize() const +long QXmppIbbOpenIq::blockSize() const { return m_block_size; } @@ -45,7 +45,7 @@ void QXmppIbbOpenIq::setBlockSize( long block_size ) m_block_size = block_size; } -QString QXmppIbbOpenIq::getSid() const +QString QXmppIbbOpenIq::sid() const { return m_sid; } @@ -84,7 +84,7 @@ bool QXmppIbbCloseIq::isIbbCloseIq( QDomElement &element ) return openElement.namespaceURI() == ns_ibb; } -QString QXmppIbbCloseIq::getSid() const +QString QXmppIbbCloseIq::sid() const { return m_sid; } @@ -98,7 +98,7 @@ QXmppIbbDataIq::QXmppIbbDataIq() : QXmppIq( QXmppIq::Set ), m_seq(0) { } -quint16 QXmppIbbDataIq::getSequence() const +quint16 QXmppIbbDataIq::sequence() const { return m_seq; } @@ -108,7 +108,7 @@ void QXmppIbbDataIq::setSequence( quint16 seq ) m_seq = seq; } -QString QXmppIbbDataIq::getSid() const +QString QXmppIbbDataIq::sid() const { return m_sid; } @@ -118,7 +118,7 @@ void QXmppIbbDataIq::setSid( const QString &sid ) m_sid = sid; } -QByteArray QXmppIbbDataIq::getPayload() const +QByteArray QXmppIbbDataIq::payload() const { return m_payload; } diff --git a/source/QXmppIbbIqs.h b/source/QXmppIbbIqs.h index add9b147..783ef9e0 100644 --- a/source/QXmppIbbIqs.h +++ b/source/QXmppIbbIqs.h @@ -14,10 +14,10 @@ public: void parse( QDomElement &element ); static bool isIbbOpenIq( QDomElement &element ); - long getBlockSize() const; + long blockSize() const; void setBlockSize( long block_size ); - QString getSid() const; + QString sid() const; void setSid( const QString &sid ); private: @@ -33,7 +33,7 @@ public: void parse( QDomElement &element ); static bool isIbbCloseIq( QDomElement &element ); - QString getSid() const; + QString sid() const; void setSid( const QString &sid ); private: @@ -45,11 +45,11 @@ class QXmppIbbDataIq : public QXmppIq public: QXmppIbbDataIq(); - quint16 getSequence() const; + quint16 sequence() const; void setSequence( quint16 seq ); - QString getSid() const; + QString sid() const; void setSid( const QString &sid ); - QByteArray getPayload() const; + QByteArray payload() const; void setPayload( const QByteArray &data ); void toXmlElementFromChild(QXmlStreamWriter *writer) const; diff --git a/source/QXmppTransferManager.cpp b/source/QXmppTransferManager.cpp index fe4d41ed..7709d2ed 100644 --- a/source/QXmppTransferManager.cpp +++ b/source/QXmppTransferManager.cpp @@ -393,7 +393,7 @@ void QXmppTransferManager::ibbCloseIqReceived(const QXmppIbbCloseIq &iq) response.setTo(iq.getFrom()); response.setId(iq.getId()); - QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.getSid()); + QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.sid()); if (!job || job->direction() != QXmppTransferJob::IncomingDirection || job->method() != QXmppTransferJob::InBandMethod) @@ -420,7 +420,7 @@ void QXmppTransferManager::ibbDataIqReceived(const QXmppIbbDataIq &iq) response.setTo(iq.getFrom()); response.setId(iq.getId()); - QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.getSid()); + QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.sid()); if (!job || job->direction() != QXmppTransferJob::IncomingDirection || job->method() != QXmppTransferJob::InBandMethod) @@ -433,7 +433,7 @@ void QXmppTransferManager::ibbDataIqReceived(const QXmppIbbDataIq &iq) return; } - if (iq.getSequence() != job->m_ibbSequence) + if (iq.sequence() != job->m_ibbSequence) { // the packet is out of sequence QXmppStanza::Error error(QXmppStanza::Error::Cancel, QXmppStanza::Error::UnexpectedRequest); @@ -444,7 +444,7 @@ void QXmppTransferManager::ibbDataIqReceived(const QXmppIbbDataIq &iq) } // write data - job->writeData(iq.getPayload()); + job->writeData(iq.payload()); job->m_ibbSequence++; // acknowledge the packet @@ -458,7 +458,7 @@ void QXmppTransferManager::ibbOpenIqReceived(const QXmppIbbOpenIq &iq) response.setTo(iq.getFrom()); response.setId(iq.getId()); - QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.getSid()); + QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.sid()); if (!job || job->direction() != QXmppTransferJob::IncomingDirection || job->method() != QXmppTransferJob::InBandMethod) @@ -471,7 +471,7 @@ void QXmppTransferManager::ibbOpenIqReceived(const QXmppIbbOpenIq &iq) return; } - if (iq.getBlockSize() > m_ibbBlockSize) + if (iq.blockSize() > m_ibbBlockSize) { // we prefer a smaller block size QXmppStanza::Error error(QXmppStanza::Error::Modify, QXmppStanza::Error::ResourceConstraint); @@ -481,7 +481,7 @@ void QXmppTransferManager::ibbOpenIqReceived(const QXmppIbbOpenIq &iq) return; } - job->m_blockSize = iq.getBlockSize(); + job->m_blockSize = iq.blockSize(); job->setState(QXmppTransferJob::TransferState); // accept transfer |
