diff options
| author | Jonah BrĂ¼chert <jbb.prv@gmx.de> | 2020-03-22 22:24:26 +0100 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-03-28 18:07:47 +0100 |
| commit | 1ac7b9d2a25d50b7680bd75ff68f29055b196d80 (patch) | |
| tree | 9adf6bbeefd37ed2fe1dbd23592d321183c6e87b /src/base/QXmppStreamFeatures.cpp | |
| parent | 88451aa1597afd0a1a1c3b3fb59d5a95d3011736 (diff) | |
base: Convert to QStringLiteral
Two new macros were added:
* QBL (short alias for QByteArrayLiteral)
* QSL (short alias for QStringLiteral)
Diffstat (limited to 'src/base/QXmppStreamFeatures.cpp')
| -rw-r--r-- | src/base/QXmppStreamFeatures.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/base/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp index 8dd68e40..de852330 100644 --- a/src/base/QXmppStreamFeatures.cpp +++ b/src/base/QXmppStreamFeatures.cpp @@ -188,7 +188,7 @@ void QXmppStreamFeatures::setRegisterMode(const QXmppStreamFeatures::Mode ®is bool QXmppStreamFeatures::isStreamFeatures(const QDomElement &element) { return element.namespaceURI() == ns_stream && - element.tagName() == "features"; + element.tagName() == QSL("features"); } static QXmppStreamFeatures::Mode readFeature(const QDomElement &element, const char *tagName, const char *tagNs) @@ -197,7 +197,7 @@ static QXmppStreamFeatures::Mode readFeature(const QDomElement &element, const c QXmppStreamFeatures::Mode mode = QXmppStreamFeatures::Disabled; while (!subElement.isNull()) { if (subElement.namespaceURI() == tagNs) { - if (!subElement.firstChildElement("required").isNull()) + if (!subElement.firstChildElement(QSL("required")).isNull()) mode = QXmppStreamFeatures::Required; else if (mode != QXmppStreamFeatures::Required) mode = QXmppStreamFeatures::Enabled; @@ -218,22 +218,22 @@ void QXmppStreamFeatures::parse(const QDomElement &element) d->registerMode = readFeature(element, "register", ns_register_feature); // parse advertised compression methods - QDomElement compression = element.firstChildElement("compression"); + QDomElement compression = element.firstChildElement(QSL("compression")); if (compression.namespaceURI() == ns_compressFeature) { - QDomElement subElement = compression.firstChildElement("method"); + QDomElement subElement = compression.firstChildElement(QSL("method")); while (!subElement.isNull()) { d->compressionMethods << subElement.text(); - subElement = subElement.nextSiblingElement("method"); + subElement = subElement.nextSiblingElement(QSL("method")); } } // parse advertised SASL Authentication mechanisms - QDomElement mechs = element.firstChildElement("mechanisms"); + QDomElement mechs = element.firstChildElement(QSL("mechanisms")); if (mechs.namespaceURI() == ns_sasl) { - QDomElement subElement = mechs.firstChildElement("mechanism"); + QDomElement subElement = mechs.firstChildElement(QSL("mechanism")); while (!subElement.isNull()) { d->authMechanisms << subElement.text(); - subElement = subElement.nextSiblingElement("mechanism"); + subElement = subElement.nextSiblingElement(QSL("mechanism")); } } } @@ -244,14 +244,14 @@ static void writeFeature(QXmlStreamWriter *writer, const char *tagName, const ch writer->writeStartElement(tagName); writer->writeDefaultNamespace(tagNs); if (mode == QXmppStreamFeatures::Required) - writer->writeEmptyElement("required"); + writer->writeEmptyElement(QSL("required")); writer->writeEndElement(); } } void QXmppStreamFeatures::toXml(QXmlStreamWriter *writer) const { - writer->writeStartElement("stream:features"); + writer->writeStartElement(QSL("stream:features")); writeFeature(writer, "bind", ns_bind, d->bindMode); writeFeature(writer, "session", ns_session, d->sessionMode); writeFeature(writer, "auth", ns_authFeature, d->nonSaslAuthMode); @@ -261,17 +261,17 @@ void QXmppStreamFeatures::toXml(QXmlStreamWriter *writer) const writeFeature(writer, "register", ns_register_feature, d->registerMode); if (!d->compressionMethods.isEmpty()) { - writer->writeStartElement("compression"); + writer->writeStartElement(QSL("compression")); writer->writeDefaultNamespace(ns_compressFeature); for (const auto &method : d->compressionMethods) - writer->writeTextElement("method", method); + writer->writeTextElement(QSL("method"), method); writer->writeEndElement(); } if (!d->authMechanisms.isEmpty()) { - writer->writeStartElement("mechanisms"); + writer->writeStartElement(QSL("mechanisms")); writer->writeDefaultNamespace(ns_sasl); for (const auto &mechanism : d->authMechanisms) - writer->writeTextElement("mechanism", mechanism); + writer->writeTextElement(QSL("mechanism"), mechanism); writer->writeEndElement(); } writer->writeEndElement(); |
