start cleaning up accessor names

10 files changed, 106 insertions, 73 deletions

diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 4070cdda..7b6770ba 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -403,7 +403,7 @@ void QXmppClient::invokeInterfaceMethod( const QXmppRpcInvokeIq &iq )
     QXmppInvokable *iface = m_interfaces[ interface ];
     if( iface )
     {
-        if ( iface->isAuthorized( iq.getFrom() ) )
+        if ( iface->isAuthorized( iq.from() ) )
         {
 
             if ( iface->interfaces().contains( iq.getMethod() ) )
@@ -411,8 +411,8 @@ void QXmppClient::invokeInterfaceMethod( const QXmppRpcInvokeIq &iq )
                 QVariant result = iface->dispatch(iq.getMethod().toLatin1(),
                                                   iq.getPayload() );
                 QXmppRpcResponseIq resultIq;
-                resultIq.setId(iq.getId());
-                resultIq.setTo(iq.getFrom());
+                resultIq.setId(iq.id());
+                resultIq.setTo(iq.from());
                 resultIq.setFrom( m_config.getJid());
                 resultIq.setPayload(result);
                 m_stream->sendPacket( resultIq );
@@ -437,8 +437,8 @@ void QXmppClient::invokeInterfaceMethod( const QXmppRpcInvokeIq &iq )
         error.setCondition(QXmppStanza::Error::ItemNotFound);
     }
     QXmppRpcErrorIq errorIq;
-    errorIq.setId(iq.getId());
-    errorIq.setTo(iq.getFrom());
+    errorIq.setId(iq.id());
+    errorIq.setTo(iq.from());
     errorIq.setFrom( m_config.getJid());
     errorIq.setQuery( iq );
     errorIq.setError( error );
diff --git a/source/QXmppIq.cpp b/source/QXmppIq.cpp
index 7cb917e8..dc8c2a48 100644
--- a/source/QXmppIq.cpp
+++ b/source/QXmppIq.cpp
@@ -77,15 +77,15 @@ void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const
 {
     xmlWriter->writeStartElement("iq");
 
-    helperToXmlAddAttribute(xmlWriter, "id", getId());
-    helperToXmlAddAttribute(xmlWriter, "to", getTo());
-    helperToXmlAddAttribute(xmlWriter, "from", getFrom());
+    helperToXmlAddAttribute(xmlWriter, "id", id());
+    helperToXmlAddAttribute(xmlWriter, "to", to());
+    helperToXmlAddAttribute(xmlWriter, "from", from());
     if(getTypeStr().isEmpty())
         helperToXmlAddAttribute(xmlWriter, "type", "get");
     else
         helperToXmlAddAttribute(xmlWriter,  "type", getTypeStr());
     toXmlElementFromChild(xmlWriter);
-    getError().toXml(xmlWriter);
+    error().toXml(xmlWriter);
     xmlWriter->writeEndElement();
 }
 
diff --git a/source/QXmppMessage.cpp b/source/QXmppMessage.cpp
index f5fb6763..8a53c87f 100644
--- a/source/QXmppMessage.cpp
+++ b/source/QXmppMessage.cpp
@@ -168,10 +168,10 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
 {
 
     xmlWriter->writeStartElement("message");
-    helperToXmlAddAttribute(xmlWriter, "xml:lang", getLang());
-    helperToXmlAddAttribute(xmlWriter,  "id", getId());
-    helperToXmlAddAttribute(xmlWriter, "to", getTo());
-    helperToXmlAddAttribute(xmlWriter, "from", getFrom());
+    helperToXmlAddAttribute(xmlWriter, "xml:lang", lang());
+    helperToXmlAddAttribute(xmlWriter,  "id", id());
+    helperToXmlAddAttribute(xmlWriter, "to", to());
+    helperToXmlAddAttribute(xmlWriter, "from", from());
     helperToXmlAddAttribute(xmlWriter,  "type", getTypeStr());
     if (!m_subject.isEmpty())
         helperToXmlAddTextElement(xmlWriter, "subject", m_subject);
@@ -179,7 +179,7 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
         helperToXmlAddTextElement(xmlWriter, "body", m_body);
     if (!m_thread.isEmpty())
         helperToXmlAddTextElement(xmlWriter, "thread", m_thread);
-    getError().toXml(xmlWriter);
+    error().toXml(xmlWriter);
 
     if (m_state > None && m_state <= Paused)
     {
diff --git a/source/QXmppPresence.cpp b/source/QXmppPresence.cpp
index 87399100..d6088312 100644
--- a/source/QXmppPresence.cpp
+++ b/source/QXmppPresence.cpp
@@ -100,10 +100,10 @@ void  QXmppPresence::toXml(QXmlStreamWriter *xmlWriter ) const
 {
 
     xmlWriter->writeStartElement("presence");
-    helperToXmlAddAttribute(xmlWriter,"xml:lang", getLang());
-    helperToXmlAddAttribute(xmlWriter,"id", getId());
-    helperToXmlAddAttribute(xmlWriter,"to", getTo());
-    helperToXmlAddAttribute(xmlWriter,"from", getFrom());
+    helperToXmlAddAttribute(xmlWriter,"xml:lang", lang());
+    helperToXmlAddAttribute(xmlWriter,"id", id());
+    helperToXmlAddAttribute(xmlWriter,"to", to());
+    helperToXmlAddAttribute(xmlWriter,"from", from());
     helperToXmlAddAttribute(xmlWriter,"type", getTypeStr());
 
     helperToXmlAddTextElement(xmlWriter,"status", getStatus().getStatusText());
@@ -111,7 +111,7 @@ void  QXmppPresence::toXml(QXmlStreamWriter *xmlWriter ) const
         helperToXmlAddNumberElement(xmlWriter,"priority", getStatus().getPriority());
     helperToXmlAddTextElement(xmlWriter,"show", getStatus().getTypeStr());
     
-    getError().toXml(xmlWriter);
+    error().toXml(xmlWriter);
     foreach (const QXmppElement &extension, extensions())
         extension.toXml(xmlWriter);
     
diff --git a/source/QXmppRemoteMethod.cpp b/source/QXmppRemoteMethod.cpp
index 795b4709..99d04a58 100644
--- a/source/QXmppRemoteMethod.cpp
+++ b/source/QXmppRemoteMethod.cpp
@@ -31,18 +31,18 @@ QXmppRemoteMethodResult QXmppRemoteMethod::call( )
 
 void QXmppRemoteMethod::gotError( const QXmppRpcErrorIq &iq )
 {
-    if ( iq.getId() == m_payload.getId() )
+    if ( iq.id() == m_payload.id() )
     {
         m_result.hasError = true;
-        m_result.errorMessage = iq.getError().getText();
-        m_result.code = iq.getError().getType();
+        m_result.errorMessage = iq.error().getText();
+        m_result.code = iq.error().getType();
         emit callDone();
     }
 }
 
 void QXmppRemoteMethod::gotResult( const QXmppRpcResponseIq &iq )
 {
-    if ( iq.getId() == m_payload.getId() )
+    if ( iq.id() == m_payload.id() )
     {
         m_result.hasError = false;
         m_result.result = iq.getPayload();
diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp
index 9d272cfa..4393efa4 100644
--- a/source/QXmppRoster.cpp
+++ b/source/QXmppRoster.cpp
@@ -47,7 +47,7 @@ void QXmppRoster::disconnected()
 
 void QXmppRoster::presenceReceived(const QXmppPresence& presence)
 {
-    QString jid = presence.getFrom();
+    QString jid = presence.from();
     QString bareJid = jidToBareJid(jid);
     QString resource = jidToResource(jid);
 
@@ -85,7 +85,7 @@ void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq)
             if(rosterIq.getType() == QXmppIq::Set) // send result iq
             {
                 QXmppIq returnIq(QXmppIq::Result);
-                returnIq.setId(rosterIq.getId());
+                returnIq.setId(rosterIq.id());
                 m_stream->sendPacket(returnIq);
             }
             break;
@@ -118,7 +118,7 @@ void QXmppRoster::rosterRequestIqReceived(const QXmppRosterIq& rosterIq)
             if(rosterIq.getType() == QXmppIq::Set) // send result iq
             {
                 QXmppIq returnIq(QXmppIq::Result);
-                returnIq.setId(rosterIq.getId());
+                returnIq.setId(rosterIq.id());
                 m_stream->sendPacket(returnIq);
             }
             m_isRosterReceived = true;
diff --git a/source/QXmppStanza.cpp b/source/QXmppStanza.cpp
index 31ee050f..afc47589 100644
--- a/source/QXmppStanza.cpp
+++ b/source/QXmppStanza.cpp
@@ -297,6 +297,30 @@ QString QXmppStanza::getLang() const
     return m_lang;
 }
 
+QXmppStanza::Error QXmppStanza::getError() const
+{
+    return m_error;
+}
+
+QString QXmppStanza::to() const
+{
+    return m_to;
+}
+
+QString QXmppStanza::from() const
+{
+    return m_from;
+}
+
+QString QXmppStanza::id() const    
+{
+    return m_id;
+}
+
+QString QXmppStanza::lang() const    
+{
+    return m_lang;
+}
 
 void QXmppStanza::setTo(const QString& to)  
 {
@@ -325,7 +349,7 @@ void QXmppStanza::generateAndSetNextId()
     m_id = "qxmpp" + QString::number(s_uniqeIdNo);
 }
 
-QXmppStanza::Error QXmppStanza::getError() const
+QXmppStanza::Error QXmppStanza::error() const
 {
     return m_error;
 }
diff --git a/source/QXmppStanza.h b/source/QXmppStanza.h
index 024264ab..50b38b23 100644
--- a/source/QXmppStanza.h
+++ b/source/QXmppStanza.h
@@ -104,17 +104,23 @@ public:
     QXmppStanza(const QString& from = "", const QString& to = "");
     ~QXmppStanza();
     
-    QString getTo() const;  
-    QString getFrom() const;
-    QString getId() const;    
-    QString getLang() const;    
-    QXmppStanza::Error getError() const;    
+    // deprecated accessors, use the form without "get" instead
+    QString Q_DECL_DEPRECATED getTo() const;  
+    QString Q_DECL_DEPRECATED getFrom() const;
+    QString Q_DECL_DEPRECATED getId() const;    
+    QString Q_DECL_DEPRECATED getLang() const;    
+    QXmppStanza::Error Q_DECL_DEPRECATED getError() const;
+
+    QString to() const;
+    QString from() const;
+    QString id() const;
+    QString lang() const;
+    QXmppStanza::Error error() const;
     QXmppElementList extensions() const;
 
     void setTo(const QString&);  
     void setFrom(const QString&);
     void setId(const QString&);
-    void generateAndSetNextId();
     void setLang(const QString&);
     void setError(QXmppStanza::Error& error);
     void setExtensions(const QXmppElementList &elements);
@@ -123,6 +129,9 @@ public:
     // FIXME : make this method protected
     static QXmppStanza::Error parseError(const QDomElement&);
 
+protected:
+    void generateAndSetNextId();
+
 private:
     static uint s_uniqeIdNo;
     QString m_to;  
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);
diff --git a/source/QXmppTransferManager.cpp b/source/QXmppTransferManager.cpp
index 7709d2ed..1370bdc7 100644
--- a/source/QXmppTransferManager.cpp
+++ b/source/QXmppTransferManager.cpp
@@ -203,7 +203,7 @@ void QXmppTransferManager::byteStreamIqReceived(const QXmppByteStreamIq &iq)
     // handle IQ from proxy
     foreach (QXmppTransferJob *job, m_jobs)
     {
-        if (job->m_socksProxy.jid() == iq.getFrom() && job->m_requestId == iq.getId())
+        if (job->m_socksProxy.jid() == iq.from() && job->m_requestId == iq.id())
         {
             if (iq.getType() == QXmppIq::Result && iq.streamHosts().size() > 0)
             {
@@ -224,7 +224,7 @@ void QXmppTransferManager::byteStreamIqReceived(const QXmppByteStreamIq &iq)
 /// that we connected to a stream host.
 void QXmppTransferManager::byteStreamResponseReceived(const QXmppIq &iq)
 {
-    QXmppTransferJob *job = getJobByRequestId(iq.getFrom(), iq.getId());
+    QXmppTransferJob *job = getJobByRequestId(iq.from(), iq.id());
     if (!job ||
         job->direction() != QXmppTransferJob::IncomingDirection ||
         job->method() != QXmppTransferJob::SocksMethod ||
@@ -239,7 +239,7 @@ void QXmppTransferManager::byteStreamResponseReceived(const QXmppIq &iq)
 /// a stream host.
 void QXmppTransferManager::byteStreamResultReceived(const QXmppByteStreamIq &iq)
 {
-    QXmppTransferJob *job = getJobByRequestId(iq.getFrom(), iq.getId());
+    QXmppTransferJob *job = getJobByRequestId(iq.from(), iq.id());
     if (!job ||
         job->direction() != QXmppTransferJob::OutgoingDirection ||
         job->method() != QXmppTransferJob::SocksMethod ||
@@ -275,7 +275,7 @@ void QXmppTransferManager::byteStreamResultReceived(const QXmppByteStreamIq &iq)
         streamIq.setTo(streamHost.jid());
         streamIq.setSid(job->m_sid);
         streamIq.setActivate(job->m_jid);
-        job->m_requestId = streamIq.getId();
+        job->m_requestId = streamIq.id();
         m_client->sendPacket(streamIq);
         return;
     }
@@ -292,10 +292,10 @@ void QXmppTransferManager::byteStreamResultReceived(const QXmppByteStreamIq &iq)
 void QXmppTransferManager::byteStreamSetReceived(const QXmppByteStreamIq &iq)
 {
     QXmppIq response;
-    response.setId(iq.getId());
-    response.setTo(iq.getFrom());
+    response.setId(iq.id());
+    response.setTo(iq.from());
 
-    QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.sid());
+    QXmppTransferJob *job = getJobBySid(iq.from(), iq.sid());
     if (!job ||
         job->direction() != QXmppTransferJob::IncomingDirection ||
         job->method() != QXmppTransferJob::SocksMethod ||
@@ -331,8 +331,8 @@ void QXmppTransferManager::byteStreamSetReceived(const QXmppByteStreamIq &iq)
             connect(job->m_socksClient, SIGNAL(disconnected()), this, SLOT(socksClientDisconnected()));
 
             QXmppByteStreamIq ackIq;
-            ackIq.setId(iq.getId());
-            ackIq.setTo(iq.getFrom());
+            ackIq.setId(iq.id());
+            ackIq.setTo(iq.from());
             ackIq.setType(QXmppIq::Result);
             ackIq.setSid(job->m_sid);
             ackIq.setStreamHostUsed(streamHost.jid());
@@ -390,10 +390,10 @@ QXmppTransferJob* QXmppTransferManager::getJobBySocksServer(QXmppSocksServer *so
 void QXmppTransferManager::ibbCloseIqReceived(const QXmppIbbCloseIq &iq)
 {
     QXmppIq response;
-    response.setTo(iq.getFrom());
-    response.setId(iq.getId());
+    response.setTo(iq.from());
+    response.setId(iq.id());
 
-    QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.sid());
+    QXmppTransferJob *job = getJobBySid(iq.from(), iq.sid());
     if (!job ||
         job->direction() != QXmppTransferJob::IncomingDirection ||
         job->method() != QXmppTransferJob::InBandMethod)
@@ -417,10 +417,10 @@ void QXmppTransferManager::ibbCloseIqReceived(const QXmppIbbCloseIq &iq)
 void QXmppTransferManager::ibbDataIqReceived(const QXmppIbbDataIq &iq)
 {
     QXmppIq response;
-    response.setTo(iq.getFrom());
-    response.setId(iq.getId());
+    response.setTo(iq.from());
+    response.setId(iq.id());
 
-    QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.sid());
+    QXmppTransferJob *job = getJobBySid(iq.from(), iq.sid());
     if (!job ||
         job->direction() != QXmppTransferJob::IncomingDirection ||
         job->method() != QXmppTransferJob::InBandMethod)
@@ -455,10 +455,10 @@ void QXmppTransferManager::ibbDataIqReceived(const QXmppIbbDataIq &iq)
 void QXmppTransferManager::ibbOpenIqReceived(const QXmppIbbOpenIq &iq)
 {
     QXmppIq response;
-    response.setTo(iq.getFrom());
-    response.setId(iq.getId());
+    response.setTo(iq.from());
+    response.setId(iq.id());
 
-    QXmppTransferJob *job = getJobBySid(iq.getFrom(), iq.sid());
+    QXmppTransferJob *job = getJobBySid(iq.from(), iq.sid());
     if (!job ||
         job->direction() != QXmppTransferJob::IncomingDirection ||
         job->method() != QXmppTransferJob::InBandMethod)
@@ -491,7 +491,7 @@ void QXmppTransferManager::ibbOpenIqReceived(const QXmppIbbOpenIq &iq)
 
 void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq)
 {
-    QXmppTransferJob *job = getJobByRequestId(iq.getFrom(), iq.getId());
+    QXmppTransferJob *job = getJobByRequestId(iq.from(), iq.id());
     if (!job ||
         job->direction() != QXmppTransferJob::OutgoingDirection ||
         job->method() != QXmppTransferJob::InBandMethod ||
@@ -514,7 +514,7 @@ void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq)
             dataIq.setSid(job->m_sid);
             dataIq.setSequence(job->m_ibbSequence++);
             dataIq.setPayload(buffer);
-            job->m_requestId = dataIq.getId();
+            job->m_requestId = dataIq.id();
             m_client->sendPacket(dataIq);
 
             job->m_done += buffer.size();
@@ -524,7 +524,7 @@ void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq)
             QXmppIbbCloseIq closeIq;
             closeIq.setTo(job->m_jid);
             closeIq.setSid(job->m_sid);
-            job->m_requestId = closeIq.getId();
+            job->m_requestId = closeIq.id();
             m_client->sendPacket(closeIq);
 
             job->terminate(QXmppTransferJob::NoError);
@@ -536,7 +536,7 @@ void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq)
         QXmppIbbCloseIq closeIq;
         closeIq.setTo(job->m_jid);
         closeIq.setSid(job->m_sid);
-        job->m_requestId = closeIq.getId();
+        job->m_requestId = closeIq.id();
         m_client->sendPacket(closeIq);
 
         job->terminate(QXmppTransferJob::ProtocolError);
@@ -548,7 +548,7 @@ void QXmppTransferManager::iqReceived(const QXmppIq &iq)
     // handle IQ from proxy
     foreach (QXmppTransferJob *job, m_jobs)
     {
-        if (job->m_socksProxy.jid() == iq.getFrom() && job->m_requestId == iq.getId())
+        if (job->m_socksProxy.jid() == iq.from() && job->m_requestId == iq.id())
         {
             if (job->m_socksClient)
             {
@@ -574,7 +574,7 @@ void QXmppTransferManager::iqReceived(const QXmppIq &iq)
         }
     }
 
-    QXmppTransferJob *job = getJobByRequestId(iq.getFrom(), iq.getId());
+    QXmppTransferJob *job = getJobByRequestId(iq.from(), iq.id());
     if (!job)
         return;
 
@@ -691,7 +691,7 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, const QStri
     request.setProfile(QXmppStreamInitiationIq::FileTransfer);
     request.setSiItems(items);
     request.setSiId(job->m_sid);
-    job->m_requestId = request.getId();
+    job->m_requestId = request.id();
     m_client->sendPacket(request);
 
     return job;
@@ -823,7 +823,7 @@ void QXmppTransferManager::socksServerSendOffer(QXmppTransferJob *job)
     streamIq.setTo(job->m_jid);
     streamIq.setSid(job->m_sid);
     streamIq.setStreamHosts(streamHosts);
-    job->m_requestId = streamIq.getId();
+    job->m_requestId = streamIq.id();
     m_client->sendPacket(streamIq);
 }
 
@@ -837,7 +837,7 @@ void QXmppTransferManager::streamInitiationIqReceived(const QXmppStreamInitiatio
 
 void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamInitiationIq &iq)
 {
-    QXmppTransferJob *job = getJobByRequestId(iq.getFrom(), iq.getId());
+    QXmppTransferJob *job = getJobByRequestId(iq.from(), iq.id());
     if (!job ||
         job->direction() != QXmppTransferJob::OutgoingDirection)
         return;
@@ -872,7 +872,7 @@ void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamIniti
         openIq.setTo(job->m_jid);
         openIq.setSid(job->m_sid);
         openIq.setBlockSize(job->m_blockSize);
-        job->m_requestId = openIq.getId();
+        job->m_requestId = openIq.id();
         m_client->sendPacket(openIq);
     } else if (job->method() == QXmppTransferJob::SocksMethod) {
         const QString ownJid = m_client->getConfiguration().getJid();
@@ -898,7 +898,7 @@ void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamIniti
             streamIq.setType(QXmppIq::Get);
             streamIq.setTo(job->m_socksProxy.jid());
             streamIq.setSid(job->m_sid);
-            job->m_requestId = streamIq.getId();
+            job->m_requestId = streamIq.id();
             m_client->sendPacket(streamIq);
         } else {
             socksServerSendOffer(job);
@@ -912,8 +912,8 @@ void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamIniti
 void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiationIq &iq)
 {
     QXmppStreamInitiationIq response;
-    response.setTo(iq.getFrom());
-    response.setId(iq.getId());
+    response.setTo(iq.from());
+    response.setId(iq.id());
 
     // check we support the profile
     if (iq.getProfile() != QXmppStreamInitiationIq::FileTransfer)
@@ -930,7 +930,7 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
     }
 
     // check the stream type
-    QXmppTransferJob *job = new QXmppTransferJob(iq.getFrom(), QXmppTransferJob::IncomingDirection, this);
+    QXmppTransferJob *job = new QXmppTransferJob(iq.from(), QXmppTransferJob::IncomingDirection, this);
     int offeredMethods = QXmppTransferJob::NoMethod;
     job->m_sid = iq.getSiId();
     job->m_mimeType = iq.getMimeType();