rename RPC IQ accessors starting with "get"

4 files changed, 19 insertions, 20 deletions

diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 1a3a1b89..00c6dc2a 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -477,17 +477,16 @@ void QXmppClient::addInvokableInterface( QXmppInvokable *interface )
 void QXmppClient::invokeInterfaceMethod( const QXmppRpcInvokeIq &iq )
 {
     QXmppStanza::Error error;
-    QString interface = iq.getInterface();
-    QXmppInvokable *iface = m_interfaces[ interface ];
-    if( iface )
+    QXmppInvokable *iface = m_interfaces.value(iq.interface());
+    if (iface)
     {
         if ( iface->isAuthorized( iq.from() ) )
         {
 
-            if ( iface->interfaces().contains( iq.getMethod() ) )
+            if ( iface->interfaces().contains( iq.method() ) )
             {
-                QVariant result = iface->dispatch(iq.getMethod().toLatin1(),
-                                                  iq.getPayload() );
+                QVariant result = iface->dispatch(iq.method().toLatin1(),
+                                                  iq.payload() );
                 QXmppRpcResponseIq resultIq;
                 resultIq.setId(iq.id());
                 resultIq.setTo(iq.from());
diff --git a/source/QXmppRemoteMethod.cpp b/source/QXmppRemoteMethod.cpp
index 54214d15..f78b459c 100644
--- a/source/QXmppRemoteMethod.cpp
+++ b/source/QXmppRemoteMethod.cpp
@@ -45,7 +45,7 @@ void QXmppRemoteMethod::gotResult( const QXmppRpcResponseIq &iq )
     if ( iq.id() == m_payload.id() )
     {
         m_result.hasError = false;
-        m_result.result = iq.getPayload();
+        m_result.result = iq.payload();
         emit callDone();
     }
 }
diff --git a/source/QXmppRpcIq.cpp b/source/QXmppRpcIq.cpp
index 7bc5ee7f..2708bbb7 100644
--- a/source/QXmppRpcIq.cpp
+++ b/source/QXmppRpcIq.cpp
@@ -9,14 +9,14 @@ QXmppRpcErrorIq::QXmppRpcErrorIq() : QXmppIq( QXmppIq::Error )
 
 }
 
-void QXmppRpcErrorIq::setQuery(const QXmppRpcInvokeIq &query )
+QXmppRpcInvokeIq QXmppRpcErrorIq::query() const
 {
-    m_query = query;
+    return m_query;
 }
 
-QXmppRpcInvokeIq QXmppRpcErrorIq::getQuery() const
+void QXmppRpcErrorIq::setQuery(const QXmppRpcInvokeIq &query)
 {
-    return m_query;
+    m_query = query;
 }
 
 bool QXmppRpcErrorIq::isRpcErrorIq(const QDomElement &element)
@@ -43,7 +43,7 @@ QXmppRpcResponseIq::QXmppRpcResponseIq() : QXmppIq( QXmppIq::Result )
 {
 }
 
-QVariant QXmppRpcResponseIq::getPayload() const
+QVariant QXmppRpcResponseIq::payload() const
 {
     return m_payload;
 }
@@ -82,7 +82,7 @@ QXmppRpcInvokeIq::QXmppRpcInvokeIq() : QXmppIq( QXmppIq::Set )
 {
 }
 
-QVariantList QXmppRpcInvokeIq::getPayload() const
+QVariantList QXmppRpcInvokeIq::payload() const
 {
     return m_payload;
 }
@@ -92,7 +92,7 @@ void QXmppRpcInvokeIq::setPayload( const QVariantList &payload )
     m_payload = payload;
 }
 
-QString QXmppRpcInvokeIq::getMethod() const
+QString QXmppRpcInvokeIq::method() const
 {
     return m_method;
 }
@@ -101,7 +101,7 @@ void QXmppRpcInvokeIq::setMethod( const QString &method )
     m_method = method;
 }
 
-QString QXmppRpcInvokeIq::getInterface() const
+QString QXmppRpcInvokeIq::interface() const
 {
     return m_interface;
 }
diff --git a/source/QXmppRpcIq.h b/source/QXmppRpcIq.h
index 9700a8b8..7eae434a 100644
--- a/source/QXmppRpcIq.h
+++ b/source/QXmppRpcIq.h
@@ -12,7 +12,7 @@ class QXmppRpcResponseIq : public QXmppIq
 public:
     QXmppRpcResponseIq();
 
-    QVariant getPayload() const;
+    QVariant payload() const;
     void setPayload( const QVariant &payload );
 
     static bool isRpcResponseIq(const QDomElement &element);
@@ -30,13 +30,13 @@ class QXmppRpcInvokeIq : public QXmppIq
 public:
     QXmppRpcInvokeIq();
 
-    QVariantList getPayload() const;
+    QVariantList payload() const;
     void setPayload( const QVariantList &payload );
 
-    QString getMethod() const;
+    QString method() const;
     void setMethod( const QString &method );
 
-    QString getInterface() const;
+    QString interface() const;
     void setInterface( const QString &interface );
 
     static bool isRpcInvokeIq(const QDomElement &element);
@@ -58,8 +58,8 @@ class QXmppRpcErrorIq : public QXmppIq
 public:
     QXmppRpcErrorIq();
 
+    QXmppRpcInvokeIq query() const;
     void setQuery(const QXmppRpcInvokeIq &query);
-    QXmppRpcInvokeIq getQuery() const;
 
     static bool isRpcErrorIq(const QDomElement &element);