1 files changed, 30 insertions, 28 deletions

diff --git a/src/base/QXmppStreamManagement.cpp b/src/base/QXmppStreamManagement.cpp
index 8f27f3c0..6629a556 100644
--- a/src/base/QXmppStreamManagement.cpp
+++ b/src/base/QXmppStreamManagement.cpp
@@ -25,6 +25,8 @@
 #include "QXmppStanza_p.h"
 #include "QXmppStreamManagement_p.h"
 
+#include "QXmppGlobal.h"
+
 QXmppStreamManagementEnable::QXmppStreamManagementEnable(const bool resume, const unsigned max)
     : m_resume(resume), m_max(max)
 {
@@ -58,19 +60,19 @@ bool QXmppStreamManagementEnable::isStreamManagementEnable(const QDomElement &el
 
 void QXmppStreamManagementEnable::parse(const QDomElement &element)
 {
-    QString resume = element.attribute("resume");
-    m_resume = resume == QString("true") || resume == QString("1");
-    m_max = element.attribute("max").toUInt();
+    QString resume = element.attribute(QSL("resume"));
+    m_resume = resume == QSL("true") || resume == QSL("1");
+    m_max = element.attribute(QSL("max")).toUInt();
 }
 
 void QXmppStreamManagementEnable::toXml(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement("enable");
+    writer->writeStartElement(QSL("enable"));
     writer->writeDefaultNamespace(ns_stream_management);
     if (m_resume)
-        writer->writeAttribute("resume", "true");
+        writer->writeAttribute(QSL("resume"), QSL("true"));
     if (m_max > 0)
-        writer->writeAttribute("max", QString::number(m_max));
+        writer->writeAttribute(QSL("max"), QString::number(m_max));
     writer->writeEndElement();
 }
 
@@ -127,22 +129,22 @@ bool QXmppStreamManagementEnabled::isStreamManagementEnabled(const QDomElement &
 
 void QXmppStreamManagementEnabled::parse(const QDomElement &element)
 {
-    QString resume = element.attribute("resume");
-    m_resume = resume == QString("true") || resume == QString("1");
-    m_max = element.attribute("max").toUInt();
-    m_location = element.attribute("location");
+    QString resume = element.attribute(QSL("resume"));
+    m_resume = resume == QSL("true") || resume == QSL("1");
+    m_max = element.attribute(QSL("max")).toUInt();
+    m_location = element.attribute(QSL("location"));
 }
 
 void QXmppStreamManagementEnabled::toXml(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement("enable");
+    writer->writeStartElement(QSL("enable"));
     writer->writeDefaultNamespace(ns_stream_management);
     if (m_resume)
-        writer->writeAttribute("resume", "true");
+        writer->writeAttribute(QSL("resume"), QSL("true"));
     if (m_max > 0)
-        writer->writeAttribute("max", QString::number(m_max));
+        writer->writeAttribute(QSL("max"), QString::number(m_max));
     if (!m_location.isEmpty())
-        writer->writeAttribute("location", m_location);
+        writer->writeAttribute(QSL("location"), m_location);
     writer->writeEndElement();
 }
 
@@ -179,15 +181,15 @@ bool QXmppStreamManagementResume::isStreamManagementResume(const QDomElement &el
 
 void QXmppStreamManagementResume::parse(const QDomElement &element)
 {
-    m_h = element.attribute("h").toUInt();
-    m_previd = element.attribute("previd");
+    m_h = element.attribute(QSL("h")).toUInt();
+    m_previd = element.attribute(QSL("previd"));
 }
 
 void QXmppStreamManagementResume::toXml(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement("resume");
-    writer->writeAttribute("h", QString::number(m_h));
-    writer->writeAttribute("previd", m_previd);
+    writer->writeStartElement(QSL("resume"));
+    writer->writeAttribute(QSL("h"), QString::number(m_h));
+    writer->writeAttribute(QSL("previd"), m_previd);
     writer->writeEndElement();
 }
 
@@ -224,15 +226,15 @@ bool QXmppStreamManagementResumed::isStreamManagementResumed(const QDomElement &
 
 void QXmppStreamManagementResumed::parse(const QDomElement &element)
 {
-    m_h = element.attribute("h").toUInt();
-    m_previd = element.attribute("previd");
+    m_h = element.attribute(QSL("h")).toUInt();
+    m_previd = element.attribute(QSL("previd"));
 }
 
 void QXmppStreamManagementResumed::toXml(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement("resumed");
-    writer->writeAttribute("h", QString::number(m_h));
-    writer->writeAttribute("previd", m_previd);
+    writer->writeStartElement(QSL("resumed"));
+    writer->writeAttribute(QSL("h"), QString::number(m_h));
+    writer->writeAttribute(QSL("previd"), m_previd);
     writer->writeEndElement();
 }
 
@@ -269,7 +271,7 @@ void QXmppStreamManagementFailed::toXml(QXmlStreamWriter *writer) const
 {
     QString errorString = strFromCondition(m_error);
 
-    writer->writeStartElement("failed");
+    writer->writeStartElement(QSL("failed"));
     writer->writeDefaultNamespace(ns_stream_management);
     writer->writeStartElement(errorString, ns_stanza);
     writer->writeEndElement();
@@ -293,14 +295,14 @@ void QXmppStreamManagementAck::setSeqNo(const unsigned seqNo)
 
 void QXmppStreamManagementAck::parse(const QDomElement &element)
 {
-    m_seqNo = element.attribute("h").toUInt();
+    m_seqNo = element.attribute(QSL("h")).toUInt();
 }
 
 void QXmppStreamManagementAck::toXml(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement("a");
+    writer->writeStartElement(QSL("a"));
     writer->writeDefaultNamespace(ns_stream_management);
-    writer->writeAttribute("h", QString::number(m_seqNo));
+    writer->writeAttribute(QSL("h"), QString::number(m_seqNo));
     writer->writeEndElement();
 }