From db8440865fe73618dcc2da70f885eb892623d66a Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Thu, 4 Mar 2010 06:49:18 +0000
Subject: start cleaning up accessor names

---
 source/QXmppStream.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source/QXmppStream.cpp')

diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index a0ccf2b5..8e52c0d8 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -776,7 +776,7 @@ void QXmppStream::sendNonSASLAuth(bool plainText)
     authQuery.setResource(getConfiguration().getResource());
     authQuery.setStreamId(m_streamId);
     authQuery.setUsePlainText(plainText);
-    m_nonSASLAuthId = authQuery.getId();
+    m_nonSASLAuthId = authQuery.id();
     sendPacket(authQuery);
 }
 
@@ -917,7 +917,7 @@ void QXmppStream::sendBindIQ()
 {
     QXmppBind bind(QXmppIq::Set);
     bind.setResource(getConfiguration().getResource());
-    m_bindId = bind.getId();
+    m_bindId = bind.id();
     sendPacket(bind);
 }
 
@@ -925,7 +925,7 @@ void QXmppStream::sendSessionIQ()
 {
     QXmppSession session(QXmppIq::Set);
     session.setTo(getConfiguration().getDomain());
-    m_sessionId = session.getId();
+    m_sessionId = session.id();
     sendPacket(session);
 }
 
@@ -962,7 +962,7 @@ void QXmppStream::sendRosterRequest()
 {
     QXmppRosterIq roster(QXmppIq::Get);
     roster.setFrom(getConfiguration().getJid());
-    m_rosterReqId = roster.getId();
+    m_rosterReqId = roster.id();
     sendPacket(roster);
 }
 
@@ -1004,11 +1004,11 @@ void QXmppStream::processPresence(const QXmppPresence& presence)
     case QXmppPresence::Unavailable:
         break;
     case QXmppPresence::Subscribe:
-        if(!presence.getFrom().isEmpty())
+        if(!presence.from().isEmpty())
         {
             if(getConfiguration().getAutoAcceptSubscriptions())
-                acceptSubscriptionRequest(presence.getFrom());
-            emit subscriptionRequestReceived(presence.getFrom());
+                acceptSubscriptionRequest(presence.from());
+            emit subscriptionRequestReceived(presence.from());
         }
         break;
     case QXmppPresence::Unsubscribe:
@@ -1055,7 +1055,7 @@ void QXmppStream::processBindIq(const QXmppBind& bind)
 
 void QXmppStream::processRosterIq(const QXmppRosterIq& rosterIq)
 {
-    if(m_rosterReqId == rosterIq.getId())
+    if(m_rosterReqId == rosterIq.id())
         emit rosterRequestIqReceived(rosterIq);
     else
         emit rosterIqReceived(rosterIq);
-- 
cgit v1.2.3