cleanup QXmppIq accessors

7 files changed, 40 insertions, 28 deletions

diff --git a/source/QXmppDiscoveryIq.cpp b/source/QXmppDiscoveryIq.cpp
index 1c8f6078..b54df435 100644
--- a/source/QXmppDiscoveryIq.cpp
+++ b/source/QXmppDiscoveryIq.cpp
@@ -27,7 +27,7 @@
 
 #include <QDomElement>
 
-QXmppElementList QXmppDiscoveryIq::getQueryItems() const
+QXmppElementList QXmppDiscoveryIq::queryItems() const
 {
     return m_queryItems;
 }
@@ -37,7 +37,7 @@ void QXmppDiscoveryIq::setQueryItems(const QXmppElementList &items)
     m_queryItems = items;
 }
 
-enum QXmppDiscoveryIq::QueryType QXmppDiscoveryIq::getQueryType() const
+enum QXmppDiscoveryIq::QueryType QXmppDiscoveryIq::queryType() const
 {
     return m_queryType;
 }
diff --git a/source/QXmppDiscoveryIq.h b/source/QXmppDiscoveryIq.h
index 9173e01f..fb8d5a39 100644
--- a/source/QXmppDiscoveryIq.h
+++ b/source/QXmppDiscoveryIq.h
@@ -41,10 +41,10 @@ public:
     void parse( QDomElement &element );
     static bool isDiscoveryIq( QDomElement &element );
 
-    QXmppElementList getQueryItems() const;
+    QXmppElementList queryItems() const;
     void setQueryItems(const QXmppElementList &items);
 
-    enum QueryType getQueryType() const;
+    enum QueryType queryType() const;
     void setQueryType(enum QueryType type);
 
 private:
diff --git a/source/QXmppIq.cpp b/source/QXmppIq.cpp
index dc8c2a48..601092b4 100644
--- a/source/QXmppIq.cpp
+++ b/source/QXmppIq.cpp
@@ -46,7 +46,7 @@ QXmppIq::~QXmppIq()
 
 }
 
-QXmppIq::Type QXmppIq::getType() const
+QXmppIq::Type QXmppIq::type() const
 {
     return m_type;
 }
@@ -97,7 +97,7 @@ void QXmppIq::toXmlElementFromChild( QXmlStreamWriter *writer ) const
 
 QString QXmppIq::getTypeStr() const
 {
-    switch(getType())
+    switch(m_type)
     {
     case QXmppIq::Error:
         return "error";
@@ -108,7 +108,7 @@ QString QXmppIq::getTypeStr() const
     case QXmppIq::Result:
         return "result";
     default:
-        qWarning("QXmppIq::getTypeStr() invalid type %d", (int)getType());
+        qWarning("QXmppIq::getTypeStr() invalid type %d", (int)m_type);
         return "";
     }
 }
@@ -144,3 +144,10 @@ void QXmppIq::setTypeFromStr(const QString& str)
     }
 }
 
+// deprecated
+
+QXmppIq::Type QXmppIq::getType() const
+{
+    return m_type;
+}
+
diff --git a/source/QXmppIq.h b/source/QXmppIq.h
index b6a0a554..5961466d 100644
--- a/source/QXmppIq.h
+++ b/source/QXmppIq.h
@@ -48,15 +48,20 @@ public:
     QXmppIq(const QString& type);
     ~QXmppIq();
 
-    QXmppIq::Type getType() const;
-    QString getTypeStr() const;
+    QXmppIq::Type type() const;
     void setType(QXmppIq::Type);
-    void setTypeFromStr(const QString& str);
 
     void parse( QDomElement &element );
     void toXml( QXmlStreamWriter *writer ) const;
     virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const;
 
+    // deprecated accessors, use the form without "get" instead
+    QXmppIq::Type Q_DECL_DEPRECATED getType() const;
+
+protected:
+    QString getTypeStr() const;
+    void setTypeFromStr(const QString& str);
+
 private:
     Type m_type;
 };
diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp
index 4393efa4..a5ccf3f1 100644
--- a/source/QXmppRoster.cpp
+++ b/source/QXmppRoster.cpp
@@ -63,7 +63,7 @@ void QXmppRoster::presenceReceived(const QXmppPresence& presence)
 
 void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq)
 {
-    switch(rosterIq.getType())
+    switch(rosterIq.type())
     {
     case QXmppIq::Set:
     case QXmppIq::Result:
@@ -82,7 +82,7 @@ void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq)
                 m_entries[bareJid].setGroups(items.at(i).getGroups());
                 emit rosterChanged(bareJid);
             }
-            if(rosterIq.getType() == QXmppIq::Set) // send result iq
+            if(rosterIq.type() == QXmppIq::Set) // send result iq
             {
                 QXmppIq returnIq(QXmppIq::Result);
                 returnIq.setId(rosterIq.id());
@@ -97,7 +97,7 @@ void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq)
 
 void QXmppRoster::rosterRequestIqReceived(const QXmppRosterIq& rosterIq)
 {
-    switch(rosterIq.getType())
+    switch(rosterIq.type())
     {
     case QXmppIq::Set:
     case QXmppIq::Result:
@@ -115,7 +115,7 @@ void QXmppRoster::rosterRequestIqReceived(const QXmppRosterIq& rosterIq)
                         items.at(i).getSubscriptionStatus());
                 m_entries[bareJid].setGroups(items.at(i).getGroups());
             }
-            if(rosterIq.getType() == QXmppIq::Set) // send result iq
+            if(rosterIq.type() == QXmppIq::Set) // send result iq
             {
                 QXmppIq returnIq(QXmppIq::Result);
                 returnIq.setId(rosterIq.id());
diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 8e52c0d8..a426d60f 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -1040,7 +1040,7 @@ void QXmppStream::sendEndStream()
 
 void QXmppStream::processBindIq(const QXmppBind& bind)
 {
-    switch(bind.getType())
+    switch(bind.type())
     {
     case QXmppIq::Result:
         if(!bind.getResource().isEmpty())
@@ -1060,7 +1060,7 @@ void QXmppStream::processRosterIq(const QXmppRosterIq& rosterIq)
     else
         emit rosterIqReceived(rosterIq);
 
-    switch(rosterIq.getType())
+    switch(rosterIq.type())
     {
     case QXmppIq::Set:
         // when contact subscribes user...user sends 'subscribed' presence 
diff --git a/source/QXmppTransferManager.cpp b/source/QXmppTransferManager.cpp
index 1370bdc7..836bdfa3 100644
--- a/source/QXmppTransferManager.cpp
+++ b/source/QXmppTransferManager.cpp
@@ -205,7 +205,7 @@ void QXmppTransferManager::byteStreamIqReceived(const QXmppByteStreamIq &iq)
     {
         if (job->m_socksProxy.jid() == iq.from() && job->m_requestId == iq.id())
         {
-            if (iq.getType() == QXmppIq::Result && iq.streamHosts().size() > 0)
+            if (iq.type() == QXmppIq::Result && iq.streamHosts().size() > 0)
             {
                 job->m_socksProxy = iq.streamHosts().first();
                 socksServerSendOffer(job);
@@ -214,9 +214,9 @@ void QXmppTransferManager::byteStreamIqReceived(const QXmppByteStreamIq &iq)
         }
     }
 
-    if (iq.getType() == QXmppIq::Result)
+    if (iq.type() == QXmppIq::Result)
         byteStreamResultReceived(iq);
-    else if (iq.getType() == QXmppIq::Set)
+    else if (iq.type() == QXmppIq::Set)
         byteStreamSetReceived(iq);
 }
 
@@ -231,7 +231,7 @@ void QXmppTransferManager::byteStreamResponseReceived(const QXmppIq &iq)
         job->state() != QXmppTransferJob::StartState)
         return;
 
-    if (iq.getType() == QXmppIq::Error)
+    if (iq.type() == QXmppIq::Error)
         job->terminate(QXmppTransferJob::ProtocolError);
 }
 
@@ -502,7 +502,7 @@ void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq)
     if (!job->m_iodevice->isOpen())
         return;
 
-    if (iq.getType() == QXmppIq::Result)
+    if (iq.type() == QXmppIq::Result)
     {
         const QByteArray buffer = job->m_iodevice->read(job->m_blockSize);
         job->setState(QXmppTransferJob::TransferState);
@@ -530,7 +530,7 @@ void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq)
             job->terminate(QXmppTransferJob::NoError);
         }
     }
-    else if (iq.getType() == QXmppIq::Error)
+    else if (iq.type() == QXmppIq::Error)
     {
         // close the bytestream
         QXmppIbbCloseIq closeIq;
@@ -553,21 +553,21 @@ void QXmppTransferManager::iqReceived(const QXmppIq &iq)
             if (job->m_socksClient)
             {
                 // proxy connection activation result
-                if (iq.getType() == QXmppIq::Result)
+                if (iq.type() == QXmppIq::Result)
                 {
                     // proxy stream activated, start sending data
                     job->setState(QXmppTransferJob::TransferState);
                     connect(job->m_socksClient, SIGNAL(bytesWritten(qint64)), this, SLOT(socksProxyDataSent()));
                     connect(job->m_socksClient, SIGNAL(disconnected()), this, SLOT(socksProxyDisconnected()));
                     socksServerSendData(job);
-                } else if (iq.getType() == QXmppIq::Error) {
+                } else if (iq.type() == QXmppIq::Error) {
                     // proxy stream not activated, terminate
                     qWarning("Could not activate SOCKS5 proxy bytestream");
                     job->terminate(QXmppTransferJob::ProtocolError);
                 }
             } else {
                 // we could not get host/port from proxy, procede without a proxy
-                if (iq.getType() == QXmppIq::Error)
+                if (iq.type() == QXmppIq::Error)
                     socksServerSendOffer(job);
             }
             return;
@@ -582,7 +582,7 @@ void QXmppTransferManager::iqReceived(const QXmppIq &iq)
         ibbResponseReceived(iq);
     else if (job->method() == QXmppTransferJob::SocksMethod)
         byteStreamResponseReceived(iq);
-    else if (iq.getType() == QXmppIq::Error) {
+    else if (iq.type() == QXmppIq::Error) {
         // remote user cancelled stream initiation
         job->terminate(QXmppTransferJob::ProtocolError);
     }
@@ -829,9 +829,9 @@ void QXmppTransferManager::socksServerSendOffer(QXmppTransferJob *job)
 
 void QXmppTransferManager::streamInitiationIqReceived(const QXmppStreamInitiationIq &iq)
 {
-    if (iq.getType() == QXmppIq::Result)
+    if (iq.type() == QXmppIq::Result)
         streamInitiationResultReceived(iq);
-    else if (iq.getType() == QXmppIq::Set)
+    else if (iq.type() == QXmppIq::Set)
         streamInitiationSetReceived(iq);
 }