* rename getArchiveManager to archiveManager

* rename getTransferManager to transferManager

5 files changed, 12 insertions, 12 deletions

diff --git a/example/example_3_ibbTransferSource/ibbClient.cpp b/example/example_3_ibbTransferSource/ibbClient.cpp
index ba7587f0..3db6973a 100644
--- a/example/example_3_ibbTransferSource/ibbClient.cpp
+++ b/example/example_3_ibbTransferSource/ibbClient.cpp
@@ -41,8 +41,8 @@ ibbClient::ibbClient(QObject *parent)
 
 void ibbClient::slotConnected()
 {
-    getTransferManager().setSupportedMethods(QXmppTransferJob::InBandMethod);
-    QXmppTransferJob *job = getTransferManager().sendFile( "client@geiseri.com/QXmpp", "ibbClient.cpp" );
+    transferManager().setSupportedMethods(QXmppTransferJob::InBandMethod);
+    QXmppTransferJob *job = transferManager().sendFile( "client@geiseri.com/QXmpp", "ibbClient.cpp" );
 
     bool check = connect( job, SIGNAL(error(QXmppTransferJob::Error)),
              this, SLOT(slotError(QXmppTransferJob::Error)) );
diff --git a/example/example_4_ibbTransferTarget/ibbTransferTarget.cpp b/example/example_4_ibbTransferTarget/ibbTransferTarget.cpp
index a7f507c7..b70dcd85 100644
--- a/example/example_4_ibbTransferTarget/ibbTransferTarget.cpp
+++ b/example/example_4_ibbTransferTarget/ibbTransferTarget.cpp
@@ -34,12 +34,12 @@ IbbTransferTarget::IbbTransferTarget(QObject *parent)
 {
     m_buffer = new QBuffer(this);
 
-    bool check = connect(&getTransferManager(), SIGNAL(fileReceived(QXmppTransferJob*)),
+    bool check = connect(&transferManager(), SIGNAL(fileReceived(QXmppTransferJob*)),
                     this, SLOT(slotFileReceived(QXmppTransferJob*)));
     Q_ASSERT(check);
     Q_UNUSED(check);
 
-    getTransferManager().setSupportedMethods(QXmppTransferJob::InBandMethod);
+    transferManager().setSupportedMethods(QXmppTransferJob::InBandMethod);
 }
 
 IbbTransferTarget::~IbbTransferTarget()
diff --git a/example/example_7_archiveHandling/xmppClient.cpp b/example/example_7_archiveHandling/xmppClient.cpp
index acf20498..5b4fbae1 100644
--- a/example/example_7_archiveHandling/xmppClient.cpp
+++ b/example/example_7_archiveHandling/xmppClient.cpp
@@ -37,11 +37,11 @@ xmppClient::xmppClient(QObject *parent)
         SLOT(clientConnected()));
     Q_ASSERT(check);
 
-    check = connect(&this->getArchiveManager(), SIGNAL(archiveChatReceived(const QXmppArchiveChat &)),
+    check = connect(&archiveManager(), SIGNAL(archiveChatReceived(const QXmppArchiveChat &)),
         SLOT(archiveChatReceived(const QXmppArchiveChat &)));
     Q_ASSERT(check);
 
-    check = connect(&this->getArchiveManager(), SIGNAL(archiveListReceived(const QList<QXmppArchiveChat> &)),
+    check = connect(&archiveManager(), SIGNAL(archiveListReceived(const QList<QXmppArchiveChat> &)),
         SLOT(archiveListReceived(const QList<QXmppArchiveChat> &)));
     Q_ASSERT(check);
 }
@@ -54,7 +54,7 @@ xmppClient::~xmppClient()
 void xmppClient::clientConnected()
 {
     std::cout << "example_7_archiveHandling:: CONNECTED" << std::endl;
-    getArchiveManager().listCollections("",
+    archiveManager().listCollections("",
             QDateTime::currentDateTime().addDays(-7));
 }
 
@@ -62,7 +62,7 @@ void xmppClient::archiveListReceived(const QList<QXmppArchiveChat> &chats)
 {
     std::cout << "example_7_archiveHandling:: LIST RECEIVED" << std::endl;
     foreach (const QXmppArchiveChat &chat, chats)
-        getArchiveManager().retrieveCollection(chat.with(), chat.start());
+        archiveManager().retrieveCollection(chat.with(), chat.start());
 }
 
 void xmppClient::archiveChatReceived(const QXmppArchiveChat &chat)
diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index fc93ba88..1e62fdbe 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -525,7 +525,7 @@ QXmppRemoteMethodResult QXmppClient::callRemoteMethod( const QString &jid,
 /// http://xmpp.org/extensions/xep-0136.html
 ///
 
-QXmppArchiveManager& QXmppClient::getArchiveManager()
+QXmppArchiveManager& QXmppClient::archiveManager()
 {
     return *m_archiveManager;
 }
@@ -545,7 +545,7 @@ QXmppMucManager& QXmppClient::mucManager()
 ///  * XEP-0096: SI File Transfer
 ///
 
-QXmppTransferManager& QXmppClient::getTransferManager()
+QXmppTransferManager& QXmppClient::transferManager()
 {
     return *m_transferManager;
 }
diff --git a/source/QXmppClient.h b/source/QXmppClient.h
index f87656a8..131f2dd8 100644
--- a/source/QXmppClient.h
+++ b/source/QXmppClient.h
@@ -102,7 +102,9 @@ public:
                          QXmppPresence());
     void disconnect();
 
+    QXmppArchiveManager& archiveManager();
     QXmppMucManager& mucManager();
+    QXmppTransferManager& transferManager();
 
     // FIXME : these accessors should be deprecated in favour of
     // versions without the "get".
@@ -113,8 +115,6 @@ public:
     bool setReconnectionManager(QXmppReconnectionManager*);
     const QXmppPresence& getClientPresence() const;
     QXmppVCardManager& getVCardManager();
-    QXmppArchiveManager& getArchiveManager();
-    QXmppTransferManager& getTransferManager();
 
 signals: