store the capability verification string as a QByteArray

3 files changed, 8 insertions, 8 deletions

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 9a8bdcea..66d9a52b 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -85,7 +85,7 @@ void QXmppClientPrivate::addProperCapability(QXmppPresence& presence)
     {
         presence.setCapabilityHash("sha-1");
         presence.setCapabilityNode(QString(capabilities_node));
-        presence.setCapabilityVer(ext->capabilities().verificationString().toBase64());
+        presence.setCapabilityVer(ext->capabilities().verificationString());
     }
 }
 
diff --git a/src/QXmppPresence.cpp b/src/QXmppPresence.cpp
index 94b9ceed..f6e58b6f 100644
--- a/src/QXmppPresence.cpp
+++ b/src/QXmppPresence.cpp
@@ -100,7 +100,7 @@ void QXmppPresence::parse(const QDomElement &element)
         else if(xElement.tagName() == "c" && xElement.namespaceURI() == ns_capabilities)
         {
             m_capabilityNode = xElement.attribute("node");
-            m_capabilityVer = xElement.attribute("ver");
+            m_capabilityVer = QByteArray::fromBase64(xElement.attribute("ver").toAscii());
             m_capabilityHash = xElement.attribute("hash");
             m_capabilityExt = xElement.attribute("ext").split(" ", QString::SkipEmptyParts);
         }
@@ -166,7 +166,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const
         helperToXmlAddAttribute(xmlWriter, "xmlns", ns_capabilities);
         helperToXmlAddAttribute(xmlWriter, "hash", m_capabilityHash);
         helperToXmlAddAttribute(xmlWriter, "node", m_capabilityNode);
-        helperToXmlAddAttribute(xmlWriter, "ver", m_capabilityVer);
+        helperToXmlAddAttribute(xmlWriter, "ver", m_capabilityVer.toBase64());
         xmlWriter->writeEndElement();
     }
 
@@ -450,13 +450,13 @@ void QXmppPresence::setCapabilityNode(const QString& node)
 }
 
 /// XEP-0115: Entity Capabilities
-QString QXmppPresence::capabilityVer()
+QByteArray QXmppPresence::capabilityVer()
 {
     return m_capabilityVer;
 }
 
 /// XEP-0115: Entity Capabilities
-void QXmppPresence::setCapabilityVer(const QString& ver)
+void QXmppPresence::setCapabilityVer(const QByteArray& ver)
 {
     m_capabilityVer = ver;
 }
diff --git a/src/QXmppPresence.h b/src/QXmppPresence.h
index 10db15e3..867b1831 100644
--- a/src/QXmppPresence.h
+++ b/src/QXmppPresence.h
@@ -125,8 +125,8 @@ public:
     QString capabilityNode();
     void setCapabilityNode(const QString&);
 
-    QString capabilityVer();
-    void setCapabilityVer(const QString&);
+    QByteArray capabilityVer();
+    void setCapabilityVer(const QByteArray&);
 
     QStringList capabilityExt();
 
@@ -156,7 +156,7 @@ private:
     // XEP-0115: Entity Capabilities
     QString m_capabilityHash;
     QString m_capabilityNode;
-    QString m_capabilityVer;
+    QByteArray m_capabilityVer;
     // Legacy XEP-0115: Entity Capabilities
     QStringList m_capabilityExt;
 };