aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManjeet Dahiya <manjeetdahiya@gmail.com>2010-08-31 12:38:48 +0000
committerManjeet Dahiya <manjeetdahiya@gmail.com>2010-08-31 12:38:48 +0000
commitc3e6f95d2005f490a5753d234872fa1555f2249e (patch)
tree02c0ec0dde7ff5ed7c22f052fe058d20f729fbd4 /src
parente520b60cedad1ca852504aa01b1a39b2dac18119 (diff)
downloadqxmpp-c3e6f95d2005f490a5753d234872fa1555f2249e.tar.gz
reverting the removal of deprecated functions
Diffstat (limited to 'src')
-rw-r--r--src/QXmppClient.cpp70
-rw-r--r--src/QXmppClient.h19
2 files changed, 89 insertions, 0 deletions
diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index ac63db56..18eceeff 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -651,3 +651,73 @@ void QXmppClient::xmppConnected()
sendPacket(d->clientPresence);
}
+// deprecated functions
+const QXmppPresence& QXmppClient::getClientPresence() const
+{
+ return d->clientPresence;
+}
+
+QXmppConfiguration& QXmppClient::getConfiguration()
+{
+ return d->stream->configuration();
+}
+
+const QXmppConfiguration& QXmppClient::getConfiguration() const
+{
+ return d->stream->configuration();
+}
+
+QXmppRosterManager& QXmppClient::getRoster()
+{
+ return *d->rosterManager;
+}
+
+QAbstractSocket::SocketError QXmppClient::getSocketError()
+{
+ return d->stream->socketError();
+}
+
+QXmppVCardManager& QXmppClient::getVCardManager()
+{
+ return *d->vCardManager;
+}
+
+QXmppStanza::Error::Condition QXmppClient::getXmppStreamError()
+{
+ return d->stream->xmppStreamError();
+}
+
+void QXmppClient::disconnect()
+{
+ disconnectFromServer();
+}
+
+void QXmppClient::setClientPresence(const QString& statusText)
+{
+ QXmppPresence newPresence = d->clientPresence;
+ newPresence.status().setStatusText(statusText);
+ setClientPresence(newPresence);
+}
+
+void QXmppClient::setClientPresence(QXmppPresence::Type presenceType)
+{
+ QXmppPresence newPresence = d->clientPresence;
+ newPresence.setType(presenceType);
+ setClientPresence(newPresence);
+}
+
+void QXmppClient::setClientPresence(QXmppPresence::Status::Type statusType)
+{
+ QXmppPresence newPresence = d->clientPresence;
+ if (statusType == QXmppPresence::Status::Offline)
+ newPresence.setType(QXmppPresence::Unavailable);
+ else
+ newPresence.setType(QXmppPresence::Available);
+ newPresence.status().setType(statusType);
+ setClientPresence(newPresence);
+}
+
+QXmppReconnectionManager* QXmppClient::getReconnectionManager()
+{
+ return d->reconnectionManager;
+}
diff --git a/src/QXmppClient.h b/src/QXmppClient.h
index 2566caf6..be87cb93 100644
--- a/src/QXmppClient.h
+++ b/src/QXmppClient.h
@@ -155,6 +155,25 @@ public:
int port = 5222,
const QXmppPresence& initialPresence =
QXmppPresence());
+
+ // deprecated in release 0.2.0
+ // deprecated accessors, use the form without "get" instead
+ const QXmppPresence Q_DECL_DEPRECATED & getClientPresence() const;
+ QXmppConfiguration Q_DECL_DEPRECATED & getConfiguration();
+ const QXmppConfiguration Q_DECL_DEPRECATED & getConfiguration() const;
+ QXmppReconnectionManager* Q_DECL_DEPRECATED getReconnectionManager();
+ QXmppRosterManager Q_DECL_DEPRECATED & getRoster();
+ QXmppVCardManager Q_DECL_DEPRECATED & getVCardManager();
+ QAbstractSocket::SocketError Q_DECL_DEPRECATED getSocketError();
+ QXmppStanza::Error::Condition Q_DECL_DEPRECATED getXmppStreamError();
+
+ /// was clashing with QObject::disconnect use disconnectFromServer() instead
+ void Q_DECL_DEPRECATED disconnect();
+
+ // deprecated methods, use setClientPresence(QXmppPresence) instead.
+ void Q_DECL_DEPRECATED setClientPresence(const QString& statusText);
+ void Q_DECL_DEPRECATED setClientPresence(QXmppPresence::Type presenceType);
+ void Q_DECL_DEPRECATED setClientPresence(QXmppPresence::Status::Type statusType);
/// \endcond
signals: