API cleanup: accessors naming

2 files changed, 128 insertions, 31 deletions

diff --git a/source/QXmppConfiguration.cpp b/source/QXmppConfiguration.cpp
index 89008faa..1f3e3930 100644
--- a/source/QXmppConfiguration.cpp
+++ b/source/QXmppConfiguration.cpp
@@ -128,7 +128,7 @@ void QXmppConfiguration::setResource(const QString& resource)
 /// \return host name
 ///
 
-QString QXmppConfiguration::getHost() const
+QString QXmppConfiguration::host() const
 {
     return m_host;
 }
@@ -138,7 +138,7 @@ QString QXmppConfiguration::getHost() const
 /// \return domain name
 ///
 
-QString QXmppConfiguration::getDomain() const
+QString QXmppConfiguration::domain() const
 {
     return m_domain;
 }
@@ -148,7 +148,7 @@ QString QXmppConfiguration::getDomain() const
 /// \return port number
 ///
 
-int QXmppConfiguration::getPort() const
+int QXmppConfiguration::port() const
 {
     return m_port;
 }
@@ -158,7 +158,7 @@ int QXmppConfiguration::getPort() const
 /// \return username
 ///
 
-QString QXmppConfiguration::getUser() const
+QString QXmppConfiguration::user() const
 {
     return m_user;
 }
@@ -168,7 +168,7 @@ QString QXmppConfiguration::getUser() const
 /// \return password
 ///
 
-QString QXmppConfiguration::getPasswd() const
+QString QXmppConfiguration::passwd() const
 {
     return m_passwd;
 }
@@ -178,7 +178,7 @@ QString QXmppConfiguration::getPasswd() const
 /// \return resource identifier
 ///
 
-QString QXmppConfiguration::getResource() const
+QString QXmppConfiguration::resource() const
 {
     return m_resource;
 }
@@ -189,7 +189,7 @@ QString QXmppConfiguration::getResource() const
 /// (e.g. "qxmpp.test1@gmail.com/resource" or qxmpptest@jabber.org/QXmpp156)
 ///
 
-QString QXmppConfiguration::getJid() const
+QString QXmppConfiguration::jid() const
 {
     return getJidBare() + "/" + m_resource;
 }
@@ -200,7 +200,7 @@ QString QXmppConfiguration::getJid() const
 /// (e.g. "qxmpp.test1@gmail.com" or qxmpptest@jabber.org)
 ///
 
-QString QXmppConfiguration::getJidBare() const
+QString QXmppConfiguration::jidBare() const
 {
     return m_user+"@"+m_domain;
 }
@@ -211,7 +211,7 @@ QString QXmppConfiguration::getJidBare() const
 /// true means that auto-accept-subscriptions-request is enabled else disabled for false
 ///
 
-bool QXmppConfiguration::getAutoAcceptSubscriptions() const
+bool QXmppConfiguration::autoAcceptSubscriptions() const
 {
     return m_autoAcceptSubscriptions;
 }
@@ -233,7 +233,7 @@ void QXmppConfiguration::setAutoAcceptSubscriptions(bool value)
 /// true means that auto-reconnect is enabled else disabled for false
 ///
 
-bool QXmppConfiguration::getAutoReconnectionEnabled() const
+bool QXmppConfiguration::autoReconnectionEnabled() const
 {
     return m_autoReconnectionEnabled;
 }
@@ -252,7 +252,7 @@ void QXmppConfiguration::setAutoReconnectionEnabled(bool value)
 /// Returns whether SSL errors (such as certificate validation errors)
 /// are to be ignored when connecting to the XMPP server.
 
-bool QXmppConfiguration::getIgnoreSslErrors() const
+bool QXmppConfiguration::ignoreSslErrors() const
 {
     return m_ignoreSslErrors;
 }
@@ -269,7 +269,7 @@ void QXmppConfiguration::setIgnoreSslErrors(bool value)
 /// \return true if SASL was specified else false. If the specified
 /// system is not available QXmpp will resort to the other one.
 
-bool QXmppConfiguration::getUseSASLAuthentication() const
+bool QXmppConfiguration::useSASLAuthentication() const
 {
     return m_useSASLAuthentication;
 }
@@ -288,7 +288,7 @@ void QXmppConfiguration::setUseSASLAuthentication(bool useSASL)
 /// QXmppConfiguration::TLSEnabled.
 /// \return StreamSecurityMode
 
-QXmppConfiguration::StreamSecurityMode QXmppConfiguration::getStreamSecurityMode() const
+QXmppConfiguration::StreamSecurityMode QXmppConfiguration::streamSecurityMode() const
 {
     return m_streamSecurityMode;
 }
@@ -308,7 +308,7 @@ void QXmppConfiguration::setStreamSecurityMode(
 /// \return QXmppConfiguration::NonSASLAuthMechanism
 ///
 
-QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::getNonSASLAuthMechanism() const
+QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::nonSASLAuthMechanism() const
 {
     return m_nonSASLAuthMechanism;
 }
@@ -329,7 +329,7 @@ void QXmppConfiguration::setNonSASLAuthMechanism(
 /// \return QXmppConfiguration::SASLAuthMechanism
 ///
 
-QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::getSASLAuthMechanism() const
+QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::sASLAuthMechanism() const
 {
     return m_SASLAuthMechanism;
 }
@@ -362,6 +362,87 @@ void QXmppConfiguration::setNetworkProxy(const QNetworkProxy& proxy)
 /// QNetworkProxy::setApplicationProxy().
 /// \return QNetworkProxy
 
+QNetworkProxy QXmppConfiguration::networkProxy() const
+{
+    return m_networkProxy;
+}
+
+
+QString QXmppConfiguration::getHost() const
+{
+    return m_host;
+}
+
+QString QXmppConfiguration::getDomain() const
+{
+    return m_domain;
+}
+
+int QXmppConfiguration::getPort() const
+{
+    return m_port;
+}
+
+QString QXmppConfiguration::getUser() const
+{
+    return m_user;
+}
+
+QString QXmppConfiguration::getPasswd() const
+{
+    return m_passwd;
+}
+
+QString QXmppConfiguration::getResource() const
+{
+    return m_resource;
+}
+
+QString QXmppConfiguration::getJid() const
+{
+    return getJidBare() + "/" + m_resource;
+}
+
+QString QXmppConfiguration::getJidBare() const
+{
+    return m_user+"@"+m_domain;
+}
+
+bool QXmppConfiguration::getAutoAcceptSubscriptions() const
+{
+    return m_autoAcceptSubscriptions;
+}
+
+bool QXmppConfiguration::getAutoReconnectionEnabled() const
+{
+    return m_autoReconnectionEnabled;
+}
+
+bool QXmppConfiguration::getUseSASLAuthentication() const
+{
+    return m_useSASLAuthentication;
+}
+
+bool QXmppConfiguration::getIgnoreSslErrors() const
+{
+    return m_ignoreSslErrors;
+}
+
+QXmppConfiguration::StreamSecurityMode QXmppConfiguration::getStreamSecurityMode() const
+{
+    return m_streamSecurityMode;
+}
+
+QXmppConfiguration::NonSASLAuthMechanism QXmppConfiguration::getNonSASLAuthMechanism() const
+{
+    return m_nonSASLAuthMechanism;
+}
+
+QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::getSASLAuthMechanism() const
+{
+    return m_SASLAuthMechanism;
+}
+
 QNetworkProxy QXmppConfiguration::getNetworkProxy() const
 {
     return m_networkProxy;
diff --git a/source/QXmppConfiguration.h b/source/QXmppConfiguration.h
index 291af31b..97773456 100644
--- a/source/QXmppConfiguration.h
+++ b/source/QXmppConfiguration.h
@@ -74,6 +74,24 @@ public:
     QXmppConfiguration();
     ~QXmppConfiguration();
 
+    QString host() const;
+    QString domain() const;
+    int port() const;
+    QString user() const;
+    QString passwd() const;
+    QString resource() const;
+    QString jid() const;
+    QString jidBare() const;
+
+    bool autoAcceptSubscriptions() const;
+    bool autoReconnectionEnabled() const;
+    bool useSASLAuthentication() const;
+    bool ignoreSslErrors() const;
+    QXmppConfiguration::StreamSecurityMode streamSecurityMode() const;
+    QXmppConfiguration::NonSASLAuthMechanism nonSASLAuthMechanism() const;
+    QXmppConfiguration::SASLAuthMechanism sASLAuthMechanism() const;
+    QNetworkProxy networkProxy() const;
+
     void setHost(const QString&);
     void setDomain(const QString&);
     void setPort(int);
@@ -81,39 +99,37 @@ public:
     void setPasswd(const QString&);
     void setResource(const QString&);
 
+    void setAutoAcceptSubscriptions(bool);
+    void setAutoReconnectionEnabled(bool);
+    void setUseSASLAuthentication(bool);
+    void setIgnoreSslErrors(bool);
+
+    void setStreamSecurityMode(QXmppConfiguration::StreamSecurityMode mode);
+    void setNonSASLAuthMechanism(QXmppConfiguration::NonSASLAuthMechanism);
+    void setSASLAuthMechanism(QXmppConfiguration::SASLAuthMechanism);
+
+    void setNetworkProxy(const QNetworkProxy& proxy);
+
+// deprecated accessors, use the form without "get" instead
+// obsolete start
     QString getHost() const;
     QString getDomain() const;
     int getPort() const;
     QString getUser() const;
     QString getPasswd() const;
-    QString getStatus() const;
     QString getResource() const;
     QString getJid() const;
     QString getJidBare() const;
 
     bool getAutoAcceptSubscriptions() const;
-    void setAutoAcceptSubscriptions(bool);
-
     bool getAutoReconnectionEnabled() const;
-    void setAutoReconnectionEnabled(bool);
-
     bool getUseSASLAuthentication() const;
-    void setUseSASLAuthentication(bool);
-
     bool getIgnoreSslErrors() const;
-    void setIgnoreSslErrors(bool);
-
     QXmppConfiguration::StreamSecurityMode getStreamSecurityMode() const;
-    void setStreamSecurityMode(QXmppConfiguration::StreamSecurityMode mode);
-
     QXmppConfiguration::NonSASLAuthMechanism getNonSASLAuthMechanism() const;
-    void setNonSASLAuthMechanism(QXmppConfiguration::NonSASLAuthMechanism);
-
     QXmppConfiguration::SASLAuthMechanism getSASLAuthMechanism() const;
-    void setSASLAuthMechanism(QXmppConfiguration::SASLAuthMechanism);
-
-    void setNetworkProxy(const QNetworkProxy& proxy);
     QNetworkProxy getNetworkProxy() const;
+// obsolete end
 
 private:
     QString m_host;