internal API cleanup : clean QXmppStreamInitiationIq accessors

3 files changed, 20 insertions, 21 deletions

diff --git a/source/QXmppStreamInitiationIq.cpp b/source/QXmppStreamInitiationIq.cpp
index 26891f0d..c31536f6 100644
--- a/source/QXmppStreamInitiationIq.cpp
+++ b/source/QXmppStreamInitiationIq.cpp
@@ -27,7 +27,7 @@
 #include "QXmppStreamInitiationIq.h"
 #include "QXmppUtils.h"
 
-QString QXmppStreamInitiationIq::getMimeType() const
+QString QXmppStreamInitiationIq::mimeType() const
 {
     return m_mimeType;
 }
@@ -37,7 +37,7 @@ void QXmppStreamInitiationIq::setMimeType(const QString &mimeType)
     m_mimeType = mimeType;
 }
 
-QXmppStreamInitiationIq::Profile QXmppStreamInitiationIq::getProfile() const
+QXmppStreamInitiationIq::Profile QXmppStreamInitiationIq::profile() const
 {
     return m_profile;
 }
@@ -47,12 +47,12 @@ void QXmppStreamInitiationIq::setProfile(QXmppStreamInitiationIq::Profile profil
     m_profile = profile;
 }
 
-QXmppElementList QXmppStreamInitiationIq::getSiItems() const
+QXmppElementList QXmppStreamInitiationIq::siItems() const
 {
     return m_siItems;
 }
 
-QString QXmppStreamInitiationIq::getSiId() const
+QString QXmppStreamInitiationIq::siId() const
 {
     return m_siId;
 }
@@ -67,17 +67,16 @@ void QXmppStreamInitiationIq::setSiItems(const QXmppElementList &items)
     m_siItems = items;
 }
 
-bool QXmppStreamInitiationIq::isStreamInitiationIq(QDomElement &element)
+bool QXmppStreamInitiationIq::isStreamInitiationIq(const QDomElement &element)
 {
     QDomElement siElement = element.firstChildElement("si");
     return (siElement.namespaceURI() == ns_stream_initiation);
 }
 
-void QXmppStreamInitiationIq::parse(QDomElement &element)
+void QXmppStreamInitiationIq::parse(const QDomElement &element)
 {
-    setId(element.attribute("id"));
-    setFrom(element.attribute("from"));
-    setTo(element.attribute("to"));
+    QXmppStanza::parse(element);
+
     setTypeFromStr(element.attribute("type"));
 
     QDomElement siElement = element.firstChildElement("si");
diff --git a/source/QXmppStreamInitiationIq.h b/source/QXmppStreamInitiationIq.h
index a784bea9..94b222fa 100644
--- a/source/QXmppStreamInitiationIq.h
+++ b/source/QXmppStreamInitiationIq.h
@@ -39,21 +39,21 @@ public:
         FileTransfer,
     };
 
-    QString getMimeType() const;
+    QString mimeType() const;
     void setMimeType(const QString &mimeType);
 
-    QXmppStreamInitiationIq::Profile getProfile() const;
+    QXmppStreamInitiationIq::Profile profile() const;
     void setProfile(QXmppStreamInitiationIq::Profile profile);
 
-    QString getSiId() const;
+    QString siId() const;
     void setSiId(const QString &id);
 
-    QXmppElementList getSiItems() const;
+    QXmppElementList siItems() const;
     void setSiItems(const QXmppElementList &items);
 
-    void parse(QDomElement &element);
+    static bool isStreamInitiationIq(const QDomElement &element);
+    void parse(const QDomElement &element);
     void toXmlElementFromChild(QXmlStreamWriter *writer) const;
-    static bool isStreamInitiationIq(QDomElement &element);
 
 private:
     QString m_mimeType;
diff --git a/source/QXmppTransferManager.cpp b/source/QXmppTransferManager.cpp
index 836bdfa3..796d4344 100644
--- a/source/QXmppTransferManager.cpp
+++ b/source/QXmppTransferManager.cpp
@@ -842,7 +842,7 @@ void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamIniti
         job->direction() != QXmppTransferJob::OutgoingDirection)
         return;
 
-    foreach (const QXmppElement &item, iq.getSiItems())
+    foreach (const QXmppElement &item, iq.siItems())
     {
         if (item.tagName() == "feature" && item.attribute("xmlns") == ns_feature_negotiation)
         {
@@ -916,7 +916,7 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
     response.setId(iq.id());
 
     // check we support the profile
-    if (iq.getProfile() != QXmppStreamInitiationIq::FileTransfer)
+    if (iq.profile() != QXmppStreamInitiationIq::FileTransfer)
     {
         // FIXME : we should add:
         // <bad-profile xmlns='http://jabber.org/protocol/si'/>
@@ -932,9 +932,9 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
     // check the stream type
     QXmppTransferJob *job = new QXmppTransferJob(iq.from(), QXmppTransferJob::IncomingDirection, this);
     int offeredMethods = QXmppTransferJob::NoMethod;
-    job->m_sid = iq.getSiId();
-    job->m_mimeType = iq.getMimeType();
-    foreach (const QXmppElement &item, iq.getSiItems())
+    job->m_sid = iq.siId();
+    job->m_mimeType = iq.mimeType();
+    foreach (const QXmppElement &item, iq.siItems())
     {
         if (item.tagName() == "feature" && item.attribute("xmlns") == ns_feature_negotiation)
         {
@@ -1028,7 +1028,7 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
     feature.appendChild(x);
 
     response.setType(QXmppIq::Result);
-    response.setProfile(iq.getProfile());
+    response.setProfile(iq.profile());
     response.setSiItems(feature);
 
     m_client->sendPacket(response);