diff options
| author | Linus Jahn <lnj@kaidan.im> | 2020-01-29 18:30:46 +0100 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-01-29 19:11:49 +0100 |
| commit | 7472d8d86a1da384104690db2a22977dcc135e24 (patch) | |
| tree | 14c749a5f2b68d9fd62949f8643f3e40eaa12151 /src/base/QXmppPresence.cpp | |
| parent | 0a074f6baa11970686c0fdb63903cd167bf3945a (diff) | |
| download | qxmpp-7472d8d86a1da384104690db2a22977dcc135e24.tar.gz | |
Replace manual xmlns writing by writeDefaultNamespace()
This is the result of:
sed -i 's/writeAttribute("xmlns", /writeDefaultNamespace(/g' \
$(find . -iname "*.cpp" -or -iname "*.h")
Diffstat (limited to 'src/base/QXmppPresence.cpp')
| -rw-r--r-- | src/base/QXmppPresence.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp index 986f3508..f0353b8d 100644 --- a/src/base/QXmppPresence.cpp +++ b/src/base/QXmppPresence.cpp @@ -490,7 +490,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const // XEP-0045: Multi-User Chat if (d->mucSupported) { xmlWriter->writeStartElement(QStringLiteral("x")); - xmlWriter->writeAttribute(QStringLiteral("xmlns"), ns_muc); + xmlWriter->writeDefaultNamespace(ns_muc); if (!d->mucPassword.isEmpty()) xmlWriter->writeTextElement(QStringLiteral("password"), d->mucPassword); xmlWriter->writeEndElement(); @@ -498,7 +498,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const if (!d->mucItem.isNull() || !d->mucStatusCodes.isEmpty()) { xmlWriter->writeStartElement(QStringLiteral("x")); - xmlWriter->writeAttribute(QStringLiteral("xmlns"), ns_muc_user); + xmlWriter->writeDefaultNamespace(ns_muc_user); if (!d->mucItem.isNull()) d->mucItem.toXml(xmlWriter); for (const auto code : d->mucStatusCodes) { @@ -514,7 +514,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const !d->capabilityVer.isEmpty() && !d->capabilityHash.isEmpty()) { xmlWriter->writeStartElement(QStringLiteral("c")); - xmlWriter->writeAttribute(QStringLiteral("xmlns"), ns_capabilities); + xmlWriter->writeDefaultNamespace(ns_capabilities); helperToXmlAddAttribute(xmlWriter, QStringLiteral("hash"), d->capabilityHash); helperToXmlAddAttribute(xmlWriter, QStringLiteral("node"), d->capabilityNode); helperToXmlAddAttribute(xmlWriter, QStringLiteral("ver"), d->capabilityVer.toBase64()); @@ -524,7 +524,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const // XEP-0153: vCard-Based Avatars if (d->vCardUpdateType != VCardUpdateNone) { xmlWriter->writeStartElement(QStringLiteral("x")); - xmlWriter->writeAttribute(QStringLiteral("xmlns"), ns_vcard_update); + xmlWriter->writeDefaultNamespace(ns_vcard_update); switch(d->vCardUpdateType) { case VCardUpdateNoPhoto: xmlWriter->writeEmptyElement(QStringLiteral("photo")); @@ -541,7 +541,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const // XEP-0319: Last User Interaction in Presence if (!d->lastUserInteraction.isNull() && d->lastUserInteraction.isValid()) { xmlWriter->writeStartElement(QStringLiteral("idle")); - xmlWriter->writeAttribute(QStringLiteral("xmlns"), ns_idle); + xmlWriter->writeDefaultNamespace(ns_idle); helperToXmlAddAttribute(xmlWriter, QStringLiteral("since"), QXmppUtils::datetimeToString(d->lastUserInteraction)); xmlWriter->writeEndElement(); } @@ -549,7 +549,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const // XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements if (!d->mixUserJid.isEmpty() || !d->mixUserNick.isEmpty()) { xmlWriter->writeStartElement(QStringLiteral("mix")); - xmlWriter->writeAttribute(QStringLiteral("xmlns"), ns_mix_presence); + xmlWriter->writeDefaultNamespace(ns_mix_presence); if (!d->mixUserJid.isEmpty()) helperToXmlAddTextElement(xmlWriter, QStringLiteral("jid"), d->mixUserJid); if (!d->mixUserNick.isEmpty()) |