aboutsummaryrefslogtreecommitdiff
path: root/source/QXmppClient.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2010-08-09 17:04:06 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2010-08-09 17:04:06 +0000
commitb9ec343db542bd36003175cadce1e901a5960079 (patch)
tree3daf51e45a68dd855da54d9a3e082839535830ec /source/QXmppClient.cpp
parent389bec1132aea986e327e984bc5b176bcbc02d04 (diff)
downloadqxmpp-b9ec343db542bd36003175cadce1e901a5960079.tar.gz
deprecated QXmppClient::getConfiguration
Diffstat (limited to 'source/QXmppClient.cpp')
-rw-r--r--source/QXmppClient.cpp21
1 files changed, 11 insertions, 10 deletions
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;