aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2010-05-17 11:29:03 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2010-05-17 11:29:03 +0000
commitb91f776bc99fdf7d91ee5d252f559efaddc4ef38 (patch)
tree6c9409cd7ffaf7fa25d36b1d07cd6ab4452c7f96 /source
parent1fc25c7c20387d7c5b0cdb14bd7034291538d17b (diff)
downloadqxmpp-b91f776bc99fdf7d91ee5d252f559efaddc4ef38.tar.gz
don't use deprecated QXmppPresence accessors
Diffstat (limited to 'source')
-rw-r--r--source/QXmppClient.cpp10
-rw-r--r--source/QXmppRoster.cpp4
-rw-r--r--source/QXmppStream.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 0ceea500..19d787da 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -225,8 +225,8 @@ void QXmppClient::sendPacket(const QXmppPacket& packet)
void QXmppClient::disconnect()
{
m_clientPresence.setType(QXmppPresence::Unavailable);
- m_clientPresence.getStatus().setType(QXmppPresence::Status::Offline);
- m_clientPresence.getStatus().setStatusText("Logged out");
+ m_clientPresence.status().setType(QXmppPresence::Status::Offline);
+ m_clientPresence.status().setStatusText("Logged out");
if (m_stream && m_stream->isConnected())
{
sendPacket(m_clientPresence);
@@ -270,7 +270,7 @@ void QXmppClient::sendMessage(const QString& bareJid, const QString& message)
void QXmppClient::setClientPresence(const QXmppPresence& presence)
{
- if (presence.getType() == QXmppPresence::Unavailable)
+ if (presence.type() == QXmppPresence::Unavailable)
disconnect();
else if (!m_stream->isConnected())
connectToServer(m_config, presence);
@@ -291,7 +291,7 @@ void QXmppClient::setClientPresence(const QXmppPresence& presence)
void QXmppClient::setClientPresence(const QString& statusText)
{
QXmppPresence newPresence = m_clientPresence;
- newPresence.getStatus().setStatusText(statusText);
+ newPresence.status().setStatusText(statusText);
setClientPresence(newPresence);
}
@@ -323,7 +323,7 @@ void QXmppClient::setClientPresence(QXmppPresence::Status::Type statusType)
newPresence.setType(QXmppPresence::Unavailable);
else
newPresence.setType(QXmppPresence::Available);
- newPresence.getStatus().setType(statusType);
+ newPresence.status().setType(statusType);
setClientPresence(newPresence);
}
diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp
index d7346f22..a71158e3 100644
--- a/source/QXmppRoster.cpp
+++ b/source/QXmppRoster.cpp
@@ -52,9 +52,9 @@ void QXmppRoster::presenceReceived(const QXmppPresence& presence)
QString bareJid = jidToBareJid(jid);
QString resource = jidToResource(jid);
- if (presence.getType() == QXmppPresence::Available)
+ if (presence.type() == QXmppPresence::Available)
m_presences[bareJid][resource] = presence;
- else if (presence.getType() == QXmppPresence::Unavailable)
+ else if (presence.type() == QXmppPresence::Unavailable)
m_presences[bareJid].remove(resource);
else
return;
diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index f6c0328d..7a7b678e 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -1046,7 +1046,7 @@ void QXmppStream::sendPacket(const QXmppPacket& packet)
void QXmppStream::processPresence(const QXmppPresence& presence)
{
- switch(presence.getType())
+ switch(presence.type())
{
case QXmppPresence::Error:
break;