From 61545703c7bb0956c046655e97095370ea52c46e Mon Sep 17 00:00:00 2001
From: Manjeet Dahiya <manjeetdahiya@gmail.com>
Date: Mon, 13 Sep 2010 20:45:48 +0000
Subject: remove local capabilitiesNode  definitions and usages

---
 src/QXmppDiscoveryManager.cpp | 4 +---
 src/QXmppOutgoingClient.cpp   | 6 ++----
 src/QXmppStream.cpp           | 1 -
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/QXmppDiscoveryManager.cpp b/src/QXmppDiscoveryManager.cpp
index 591c6e53..914396ce 100644
--- a/src/QXmppDiscoveryManager.cpp
+++ b/src/QXmppDiscoveryManager.cpp
@@ -31,8 +31,6 @@
 #include "QXmppDiscoveryIq.h"
 #include "QXmppStream.h"
 
-static const QString capabilitiesNode = "http://code.google.com/p/qxmpp";
-
 bool QXmppDiscoveryManager::handleStanza(QXmppStream *stream, const QDomElement &element)
 {
     if (element.tagName() == "iq" && QXmppDiscoveryIq::isDiscoveryIq(element))
@@ -42,7 +40,7 @@ bool QXmppDiscoveryManager::handleStanza(QXmppStream *stream, const QDomElement
 
         if(infoIq.type() == QXmppIq::Get &&
            infoIq.queryType() == QXmppDiscoveryIq::InfoQuery &&
-           (infoIq.queryNode().isEmpty() || infoIq.queryNode().startsWith(capabilitiesNode)))
+           (infoIq.queryNode().isEmpty() || infoIq.queryNode().startsWith(QString(capabilities_node))))
         {
             // respond to query
             QXmppDiscoveryIq qxmppFeatures = capabilities();
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index 0eebcbeb..ad640b9b 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -61,8 +61,6 @@
 #include <QXmlStreamWriter>
 #include <QTimer>
 
-static const QString capabilitiesNode = "http://code.google.com/p/qxmpp";
-
 class QXmppOutgoingClientPrivate
 {
 public:
@@ -489,7 +487,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
 
                 if (discoIq.type() == QXmppIq::Get &&
                     discoIq.queryType() == QXmppDiscoveryIq::InfoQuery &&
-                    (discoIq.queryNode().isEmpty() || discoIq.queryNode().startsWith(capabilitiesNode)))
+                    (discoIq.queryNode().isEmpty() || discoIq.queryNode().startsWith(QString(capabilities_node))))
                 {
                     // respond to info query
 //                    QXmppDiscoveryIq qxmppFeatures = capabilities();
@@ -862,7 +860,7 @@ QXmppElementList QXmppOutgoingClient::presenceExtensions() const
     caps.setTagName("c");
     caps.setAttribute("xmlns", ns_capabilities);
     caps.setAttribute("hash", "sha-1");
-    caps.setAttribute("node", capabilitiesNode);
+    caps.setAttribute("node", QString(capabilities_node));
     caps.setAttribute("ver", capabilities().verificationString().toBase64());
     extensions << caps;
 
diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp
index 63dfd843..502d538c 100644
--- a/src/QXmppStream.cpp
+++ b/src/QXmppStream.cpp
@@ -39,7 +39,6 @@
 #include <QXmlStreamWriter>
 
 static bool randomSeeded = false;
-static const QString capabilitiesNode = "http://code.google.com/p/qxmpp";
 static const QByteArray streamRootElementEnd = "</stream:stream>";
 
 class QXmppStreamPrivate
-- 
cgit v1.2.3