diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-04-20 17:14:09 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-04-20 17:14:09 +0000 |
| commit | 9684bb108207ae64ddbb0a0708f69890b250783c (patch) | |
| tree | 7cc104d599fba6d2350ce9d993e67415d71c4c9f /src | |
| parent | e5fb3e50428b26edf0800ff91c3805929e6819a1 (diff) | |
| download | qxmpp-9684bb108207ae64ddbb0a0708f69890b250783c.tar.gz | |
remove QXmppPacket from user-facing APIs
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/QXmppStream.cpp | 4 | ||||
| -rw-r--r-- | src/base/QXmppStream.h | 4 | ||||
| -rw-r--r-- | src/client/QXmppClient.cpp | 4 | ||||
| -rw-r--r-- | src/client/QXmppClient.h | 3 | ||||
| -rw-r--r-- | src/client/QXmppOutgoingClient.cpp | 1 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp index 234a3433..30228109 100644 --- a/src/base/QXmppStream.cpp +++ b/src/base/QXmppStream.cpp @@ -25,7 +25,7 @@ #include "QXmppConstants.h" #include "QXmppLogger.h" -#include "QXmppPacket.h" +#include "QXmppStanza.h" #include "QXmppStream.h" #include "QXmppUtils.h" @@ -130,7 +130,7 @@ bool QXmppStream::sendData(const QByteArray &data) /// /// \param packet -bool QXmppStream::sendPacket(const QXmppPacket &packet) +bool QXmppStream::sendPacket(const QXmppStanza &packet) { // prepare packet QByteArray data; diff --git a/src/base/QXmppStream.h b/src/base/QXmppStream.h index 2a8abc1c..b61dbd5a 100644 --- a/src/base/QXmppStream.h +++ b/src/base/QXmppStream.h @@ -32,7 +32,7 @@ class QDomElement; class QSslSocket; -class QXmppPacket; +class QXmppStanza; class QXmppStreamPrivate; /// \brief The QXmppStream class is the base class for all XMPP streams. @@ -47,7 +47,7 @@ public: ~QXmppStream(); virtual bool isConnected() const; - bool sendPacket(const QXmppPacket&); + bool sendPacket(const QXmppStanza&); signals: /// This signal is emitted when the stream is connected. diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index 3dd93d07..9403d67a 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -300,7 +300,7 @@ void QXmppClient::connectToServer(const QString &jid, const QString &password) /// After successfully connecting to the server use this function to send /// stanzas to the server. This function can solely be used to send various kind -/// of stanzas to the server. QXmppPacket is a parent class of all the stanzas +/// of stanzas to the server. QXmppStanza is a parent class of all the stanzas /// QXmppMessage, QXmppPresence, QXmppIq, QXmppBind, QXmppRosterIq, QXmppSession /// and QXmppVCard. /// @@ -315,7 +315,7 @@ void QXmppClient::connectToServer(const QString &jid, const QString &password) /// \param packet A valid XMPP stanza. It can be an iq, a message or a presence stanza. /// -bool QXmppClient::sendPacket(const QXmppPacket& packet) +bool QXmppClient::sendPacket(const QXmppStanza& packet) { return d->stream->sendPacket(packet); } diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h index b3cbc3b3..c4696911 100644 --- a/src/client/QXmppClient.h +++ b/src/client/QXmppClient.h @@ -35,7 +35,6 @@ class QXmppClientExtension; class QXmppClientPrivate; class QXmppPresence; class QXmppMessage; -class QXmppPacket; class QXmppIq; class QXmppStream; @@ -228,7 +227,7 @@ public slots: void connectToServer(const QString &jid, const QString &password); void disconnectFromServer(); - bool sendPacket(const QXmppPacket&); + bool sendPacket(const QXmppStanza&); void sendMessage(const QString& bareJid, const QString& message); private slots: diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index 7953dad2..c8f165d5 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -32,7 +32,6 @@ #include "QXmppIq.h" #include "QXmppLogger.h" #include "QXmppMessage.h" -#include "QXmppPacket.h" #include "QXmppPresence.h" #include "QXmppOutgoingClient.h" #include "QXmppStreamFeatures.h" |
