From b9ec343db542bd36003175cadce1e901a5960079 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 9 Aug 2010 17:04:06 +0000
Subject: deprecated QXmppClient::getConfiguration

---
 source/QXmppClient.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'source/QXmppClient.cpp')

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;
-- 
cgit v1.2.3