deprecated QXmppClient::getConfiguration

10 files changed, 20 insertions, 20 deletions

diff --git a/example/example_3_transferHandling/main.cpp b/example/example_3_transferHandling/main.cpp
index 9b379180..0bb9c403 100644
--- a/example/example_3_transferHandling/main.cpp
+++ b/example/example_3_transferHandling/main.cpp
@@ -44,7 +44,6 @@ int main(int argc, char *argv[])
     const QString username = (!strcmp(argv[1], "send")) ? QLatin1String("qxmpp.test1") : QLatin1String("qxmpp.test2");
 
     xmppClient client;
-    client.getConfiguration().setUseSASLAuthentication( false );
     client.connectToServer("talk.google.com", username, "qxmpp123", "gmail.com");
     return a.exec();
 }
diff --git a/example/example_3_transferHandling/xmppClient.cpp b/example/example_3_transferHandling/xmppClient.cpp
index 6bd18b78..dc4a9e88 100644
--- a/example/example_3_transferHandling/xmppClient.cpp
+++ b/example/example_3_transferHandling/xmppClient.cpp
@@ -88,7 +88,7 @@ void xmppClient::slotPresenceReceived(const QXmppPresence &presence)
 
     // if we are the recipient, or if the presence is not from the recipient,
     // do nothing
-    if (getConfiguration().jidBare() == recipient ||
+    if (configuration().jidBare() == recipient ||
         jidToBareJid(presence.from()) != recipient ||
         presence.type() != QXmppPresence::Available)
         return;
diff --git a/example/example_4_callHandling/main.cpp b/example/example_4_callHandling/main.cpp
index 3bcc8376..9341ba6a 100644
--- a/example/example_4_callHandling/main.cpp
+++ b/example/example_4_callHandling/main.cpp
@@ -44,7 +44,6 @@ int main(int argc, char *argv[])
     const QString username = (!strcmp(argv[1], "send")) ? QLatin1String("qxmpp.test1") : QLatin1String("qxmpp.test2");
 
     xmppClient client;
-    client.getConfiguration().setUseSASLAuthentication( false );
     client.connectToServer("talk.google.com", username, "qxmpp123", "gmail.com");
     return a.exec();
 }
diff --git a/example/example_4_callHandling/xmppClient.cpp b/example/example_4_callHandling/xmppClient.cpp
index 93bbba07..48c35391 100644
--- a/example/example_4_callHandling/xmppClient.cpp
+++ b/example/example_4_callHandling/xmppClient.cpp
@@ -101,7 +101,7 @@ void xmppClient::slotPresenceReceived(const QXmppPresence &presence)
 
     // if we are the recipient, or if the presence is not from the recipient,
     // do nothing
-    if (getConfiguration().jidBare() == recipient ||
+    if (configuration().jidBare() == recipient ||
         jidToBareJid(presence.from()) != recipient ||
         presence.type() != QXmppPresence::Available)
         return;
diff --git a/example/example_5_rpcInterface/main.cpp b/example/example_5_rpcInterface/main.cpp
index 14445caa..65cecf2f 100644
--- a/example/example_5_rpcInterface/main.cpp
+++ b/example/example_5_rpcInterface/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
     QXmppLogger::getLogger()->setLoggingType(QXmppLogger::StdoutLogging);
 
     rpcClient client;
-    client.getConfiguration().setUseSASLAuthentication( false );
+    client.configuration().setUseSASLAuthentication( false );
     client.connectToServer("jabber.geiseri.com", "server", "Passw0rd", "geiseri.com");
     return a.exec();
 }
diff --git a/example/example_6_rpcClient/main.cpp b/example/example_6_rpcClient/main.cpp
index 126339ee..728b75a8 100644
--- a/example/example_6_rpcClient/main.cpp
+++ b/example/example_6_rpcClient/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
     QXmppLogger::getLogger()->setLoggingType(QXmppLogger::StdoutLogging);
 
     rpcClient client;
-    client.getConfiguration().setUseSASLAuthentication( false );
+    client.configuration().setUseSASLAuthentication( false );
     client.connectToServer("jabber.geiseri.com", "client", "Passw0rd", "geiseri.com");
     return a.exec();
 }
diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index ab2595c7..a7f72b1b 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -141,16 +141,7 @@ QXmppClient::~QXmppClient()
 /// Returns a modifiable reference to the current configuration of QXmppClient.
 /// \return Reference to the QXmppClient's configuration for the connection.
 
-QXmppConfiguration& QXmppClient::getConfiguration()
-{
-    return m_stream->configuration();
-}
-
-/// Overloaded function. It returns a const reference to the current configuration
-/// of QXmppClient.
-/// \return Constant reference to the QXmppClient's configuration for the connection.
-
-const QXmppConfiguration& QXmppClient::getConfiguration() const
+QXmppConfiguration& QXmppClient::configuration()
 {
     return m_stream->configuration();
 }
@@ -618,6 +609,16 @@ void QXmppClient::xmppConnected()
 
 // obsolete
 
+QXmppConfiguration& QXmppClient::getConfiguration()
+{
+    return m_stream->configuration();
+}
+
+const QXmppConfiguration& QXmppClient::getConfiguration() const
+{
+    return m_stream->configuration();
+}
+
 QXmppRosterManager& QXmppClient::getRoster()
 {
     return *m_rosterManager;
diff --git a/source/QXmppClient.h b/source/QXmppClient.h
index 7427972e..5123c6a3 100644
--- a/source/QXmppClient.h
+++ b/source/QXmppClient.h
@@ -110,6 +110,7 @@ public:
     void disconnect();
     bool isConnected() const;
 
+    QXmppConfiguration &configuration();
     QXmppLogger *logger();
     void setLogger(QXmppLogger *logger);
 
@@ -125,8 +126,6 @@ public:
 
     // FIXME : these accessors should be deprecated in favour of
     // versions without the "get".
-    QXmppConfiguration& getConfiguration();
-    const QXmppConfiguration& getConfiguration() const;
     QXmppReconnectionManager* getReconnectionManager();
     bool setReconnectionManager(QXmppReconnectionManager*);
     const QXmppPresence& getClientPresence() const;
@@ -149,6 +148,8 @@ public:
                                               const QVariant &arg10 = QVariant() );
 
     // deprecated accessors, use the form without "get" instead
+    QXmppConfiguration Q_DECL_DEPRECATED & getConfiguration();
+    const QXmppConfiguration Q_DECL_DEPRECATED & getConfiguration() const;
     QXmppRosterManager Q_DECL_DEPRECATED & getRoster();
     QXmppVCardManager Q_DECL_DEPRECATED & getVCardManager();
     QAbstractSocket::SocketError Q_DECL_DEPRECATED getSocketError();
diff --git a/source/QXmppReconnectionManager.cpp b/source/QXmppReconnectionManager.cpp
index 4590e401..9595777d 100644
--- a/source/QXmppReconnectionManager.cpp
+++ b/source/QXmppReconnectionManager.cpp
@@ -89,7 +89,7 @@ void QXmppReconnectionManager::reconnect()
     if(m_client)
     {
         emit reconnectingNow();
-        m_client->connectToServer(m_client->getConfiguration(), m_client->getClientPresence());
+        m_client->connectToServer(m_client->configuration(), m_client->getClientPresence());
     }
 }
 
diff --git a/source/QXmppRemoteMethod.cpp b/source/QXmppRemoteMethod.cpp
index 635242ad..71a53394 100644
--- a/source/QXmppRemoteMethod.cpp
+++ b/source/QXmppRemoteMethod.cpp
@@ -11,7 +11,7 @@ QXmppRemoteMethod::QXmppRemoteMethod(const QString &jid, const QString &method,
         QObject(client), m_client(client)
 {
     m_payload.setTo( jid );
-    m_payload.setFrom( client->getConfiguration().jid() );
+    m_payload.setFrom( client->configuration().jid() );
     m_payload.setInterface( method.section('.', 0, 0 ) );
     m_payload.setMethod( method.section('.', 1) );
     m_payload.setArguments( args );