From b91f776bc99fdf7d91ee5d252f559efaddc4ef38 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 17 May 2010 11:29:03 +0000
Subject: don't use deprecated QXmppPresence accessors

---
 source/QXmppClient.cpp | 10 +++++-----
 source/QXmppRoster.cpp |  4 ++--
 source/QXmppStream.cpp |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source')

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;
-- 
cgit v1.2.3