From 9f3c33e464c8e388074ff21908c25819a5c97ece Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Fri, 3 Sep 2010 09:47:01 +0000
Subject: Rename QXmppServer::loadedExtensions to QXmppServer::extensions

---
 src/server/mod_disco.cpp   |  6 ++++--
 src/server/mod_ping.cpp    |  2 ++
 src/server/mod_proxy65.cpp |  2 ++
 src/server/mod_stats.cpp   | 10 ++++++----
 src/server/mod_version.cpp |  2 ++
 5 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'src/server')

diff --git a/src/server/mod_disco.cpp b/src/server/mod_disco.cpp
index 680de497..48c92580 100644
--- a/src/server/mod_disco.cpp
+++ b/src/server/mod_disco.cpp
@@ -54,6 +54,8 @@ QStringList QXmppServerDiscovery::discoveryItems() const
 
 bool QXmppServerDiscovery::handleStanza(QXmppStream *stream, const QDomElement &element)
 {
+    Q_UNUSED(stream);
+
     if (element.attribute("to") != server()->domain())
         return false;
 
@@ -74,7 +76,7 @@ bool QXmppServerDiscovery::handleStanza(QXmppStream *stream, const QDomElement &
         if (request.queryType() == QXmppDiscoveryIq::ItemsQuery)
         {
             QList<QXmppDiscoveryIq::Item> items;
-            foreach (QXmppServerExtension *extension, server()->loadedExtensions())
+            foreach (QXmppServerExtension *extension, server()->extensions())
             {
                 foreach (const QString &jid, extension->discoveryItems())
                 {
@@ -96,7 +98,7 @@ bool QXmppServerDiscovery::handleStanza(QXmppStream *stream, const QDomElement &
 
             // features
             QStringList features;
-            foreach (QXmppServerExtension *extension, server()->loadedExtensions())
+            foreach (QXmppServerExtension *extension, server()->extensions())
                 features += extension->discoveryFeatures();
             response.setFeatures(features);
         }
diff --git a/src/server/mod_ping.cpp b/src/server/mod_ping.cpp
index 79d297e7..f59393a9 100644
--- a/src/server/mod_ping.cpp
+++ b/src/server/mod_ping.cpp
@@ -38,6 +38,8 @@ QStringList QXmppServerPing::discoveryFeatures() const
 
 bool QXmppServerPing::handleStanza(QXmppStream *stream, const QDomElement &element)
 {
+    Q_UNUSED(stream);
+
     if (element.attribute("to") != server()->domain())
         return false;
 
diff --git a/src/server/mod_proxy65.cpp b/src/server/mod_proxy65.cpp
index 6fef3e21..f0ee7a01 100644
--- a/src/server/mod_proxy65.cpp
+++ b/src/server/mod_proxy65.cpp
@@ -268,6 +268,8 @@ QStringList QXmppServerProxy65::discoveryItems() const
 
 bool QXmppServerProxy65::handleStanza(QXmppStream *stream, const QDomElement &element)
 {
+    Q_UNUSED(stream);
+
     if (element.attribute("to") != d->jid)
         return false;
 
diff --git a/src/server/mod_stats.cpp b/src/server/mod_stats.cpp
index 8d8eaeac..2b86d813 100644
--- a/src/server/mod_stats.cpp
+++ b/src/server/mod_stats.cpp
@@ -39,7 +39,7 @@
 
 static QXmppServerExtension *findExtension(QXmppServer *server, const QString &name)
 {
-    foreach (QXmppServerExtension *extension, server->loadedExtensions())
+    foreach (QXmppServerExtension *extension, server->extensions())
         if (extension->extensionName() == name)
             return extension;
     return 0;
@@ -66,7 +66,7 @@ void QXmppServerStats::readStatistics()
     if (!d->statistics)
         return;
 
-    foreach (QXmppServerExtension *extension, server()->loadedExtensions())
+    foreach (QXmppServerExtension *extension, server()->extensions())
     {
         QVariantMap stats;
 
@@ -87,7 +87,7 @@ void QXmppServerStats::writeStatistics()
     if (!d->statistics)
         return;
 
-    foreach (QXmppServerExtension *extension, server()->loadedExtensions())
+    foreach (QXmppServerExtension *extension, server()->extensions())
     {
         const QVariantMap stats = extension->statistics();
         if (stats.isEmpty())
@@ -185,6 +185,8 @@ QVariantMap QXmppServerStats::statistics() const
 
 bool QXmppServerStats::handleStanza(QXmppStream *stream, const QDomElement &element)
 {
+    Q_UNUSED(stream);
+
     if (element.attribute("to") != d->jid)
         return false;
 
@@ -246,7 +248,7 @@ bool QXmppServerStats::handleStanza(QXmppStream *stream, const QDomElement &elem
                 QList<QXmppDiscoveryIq::Item> items;
                 if (!extension)
                 {
-                    foreach (QXmppServerExtension *extension, server()->loadedExtensions())
+                    foreach (QXmppServerExtension *extension, server()->extensions())
                     {
                         if (extension->statistics().isEmpty())
                             continue;
diff --git a/src/server/mod_version.cpp b/src/server/mod_version.cpp
index eeacbd4d..f8b5b9cc 100644
--- a/src/server/mod_version.cpp
+++ b/src/server/mod_version.cpp
@@ -39,6 +39,8 @@ QStringList QXmppServerVersion::discoveryFeatures() const
 
 bool QXmppServerVersion::handleStanza(QXmppStream *stream, const QDomElement &element)
 {
+    Q_UNUSED(stream);
+
     if (element.attribute("to") != server()->domain())
         return false;
 
-- 
cgit v1.2.3