Expand QSL and QBL

So they don't leak into the public API

1 files changed, 108 insertions, 108 deletions

diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp
index 30a6bc65..b1096d4f 100644
--- a/src/base/QXmppVCardIq.cpp
+++ b/src/base/QXmppVCardIq.cpp
@@ -32,20 +32,20 @@
 static QString getImageType(const QByteArray &contents)
 {
     if (contents.startsWith("\x89PNG\x0d\x0a\x1a\x0a"))
-        return QSL("image/png");
+        return QStringLiteral("image/png");
     else if (contents.startsWith("\x8aMNG"))
-        return QSL("video/x-mng");
+        return QStringLiteral("video/x-mng");
     else if (contents.startsWith("GIF8"))
-        return QSL("image/gif");
+        return QStringLiteral("image/gif");
     else if (contents.startsWith("BM"))
-        return QSL("image/bmp");
+        return QStringLiteral("image/bmp");
     else if (contents.contains("/* XPM */"))
-        return QSL("image/x-xpm");
+        return QStringLiteral("image/x-xpm");
     else if (contents.contains("<?xml") && contents.contains("<svg"))
-        return QSL("image/svg+xml");
+        return QStringLiteral("image/svg+xml");
     else if (contents.startsWith("\xFF\xD8\xFF\xE0"))
-        return QSL("image/jpeg");
-    return QSL("image/unknown");
+        return QStringLiteral("image/jpeg");
+    return QStringLiteral("image/unknown");
 }
 
 class QXmppVCardAddressPrivate : public QSharedData
@@ -192,44 +192,44 @@ void QXmppVCardAddress::setType(QXmppVCardAddress::Type type)
 /// \cond
 void QXmppVCardAddress::parse(const QDomElement &element)
 {
-    if (!element.firstChildElement(QSL("HOME")).isNull())
+    if (!element.firstChildElement(QStringLiteral("HOME")).isNull())
         d->type |= Home;
-    if (!element.firstChildElement(QSL("WORK")).isNull())
+    if (!element.firstChildElement(QStringLiteral("WORK")).isNull())
         d->type |= Work;
-    if (!element.firstChildElement(QSL("POSTAL")).isNull())
+    if (!element.firstChildElement(QStringLiteral("POSTAL")).isNull())
         d->type |= Postal;
-    if (!element.firstChildElement(QSL("PREF")).isNull())
+    if (!element.firstChildElement(QStringLiteral("PREF")).isNull())
         d->type |= Preferred;
 
-    d->country = element.firstChildElement(QSL("CTRY")).text();
-    d->locality = element.firstChildElement(QSL("LOCALITY")).text();
-    d->postcode = element.firstChildElement(QSL("PCODE")).text();
-    d->region = element.firstChildElement(QSL("REGION")).text();
-    d->street = element.firstChildElement(QSL("STREET")).text();
+    d->country = element.firstChildElement(QStringLiteral("CTRY")).text();
+    d->locality = element.firstChildElement(QStringLiteral("LOCALITY")).text();
+    d->postcode = element.firstChildElement(QStringLiteral("PCODE")).text();
+    d->region = element.firstChildElement(QStringLiteral("REGION")).text();
+    d->street = element.firstChildElement(QStringLiteral("STREET")).text();
 }
 
 void QXmppVCardAddress::toXml(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement(QSL("ADR"));
+    writer->writeStartElement(QStringLiteral("ADR"));
     if (d->type & Home)
-        writer->writeEmptyElement(QSL("HOME"));
+        writer->writeEmptyElement(QStringLiteral("HOME"));
     if (d->type & Work)
-        writer->writeEmptyElement(QSL("WORK"));
+        writer->writeEmptyElement(QStringLiteral("WORK"));
     if (d->type & Postal)
-        writer->writeEmptyElement(QSL("POSTAL"));
+        writer->writeEmptyElement(QStringLiteral("POSTAL"));
     if (d->type & Preferred)
-        writer->writeEmptyElement(QSL("PREF"));
+        writer->writeEmptyElement(QStringLiteral("PREF"));
 
     if (!d->country.isEmpty())
-        writer->writeTextElement(QSL("CTRY"), d->country);
+        writer->writeTextElement(QStringLiteral("CTRY"), d->country);
     if (!d->locality.isEmpty())
-        writer->writeTextElement(QSL("LOCALITY"), d->locality);
+        writer->writeTextElement(QStringLiteral("LOCALITY"), d->locality);
     if (!d->postcode.isEmpty())
-        writer->writeTextElement(QSL("PCODE"), d->postcode);
+        writer->writeTextElement(QStringLiteral("PCODE"), d->postcode);
     if (!d->region.isEmpty())
-        writer->writeTextElement(QSL("REGION"), d->region);
+        writer->writeTextElement(QStringLiteral("REGION"), d->region);
     if (!d->street.isEmpty())
-        writer->writeTextElement(QSL("STREET"), d->street);
+        writer->writeTextElement(QStringLiteral("STREET"), d->street);
 
     writer->writeEndElement();
 }
@@ -315,33 +315,33 @@ void QXmppVCardEmail::setType(QXmppVCardEmail::Type type)
 /// \cond
 void QXmppVCardEmail::parse(const QDomElement &element)
 {
-    if (!element.firstChildElement(QSL("HOME")).isNull())
+    if (!element.firstChildElement(QStringLiteral("HOME")).isNull())
         d->type |= Home;
-    if (!element.firstChildElement(QSL("WORK")).isNull())
+    if (!element.firstChildElement(QStringLiteral("WORK")).isNull())
         d->type |= Work;
-    if (!element.firstChildElement(QSL("INTERNET")).isNull())
+    if (!element.firstChildElement(QStringLiteral("INTERNET")).isNull())
         d->type |= Internet;
-    if (!element.firstChildElement(QSL("PREF")).isNull())
+    if (!element.firstChildElement(QStringLiteral("PREF")).isNull())
         d->type |= Preferred;
-    if (!element.firstChildElement(QSL("X400")).isNull())
+    if (!element.firstChildElement(QStringLiteral("X400")).isNull())
         d->type |= X400;
-    d->address = element.firstChildElement(QSL("USERID")).text();
+    d->address = element.firstChildElement(QStringLiteral("USERID")).text();
 }
 
 void QXmppVCardEmail::toXml(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement(QSL("EMAIL"));
+    writer->writeStartElement(QStringLiteral("EMAIL"));
     if (d->type & Home)
-        writer->writeEmptyElement(QSL("HOME"));
+        writer->writeEmptyElement(QStringLiteral("HOME"));
     if (d->type & Work)
-        writer->writeEmptyElement(QSL("WORK"));
+        writer->writeEmptyElement(QStringLiteral("WORK"));
     if (d->type & Internet)
-        writer->writeEmptyElement(QSL("INTERNET"));
+        writer->writeEmptyElement(QStringLiteral("INTERNET"));
     if (d->type & Preferred)
-        writer->writeEmptyElement(QSL("PREF"));
+        writer->writeEmptyElement(QStringLiteral("PREF"));
     if (d->type & X400)
-        writer->writeEmptyElement(QSL("X400"));
-    writer->writeTextElement(QSL("USERID"), d->address);
+        writer->writeEmptyElement(QStringLiteral("X400"));
+    writer->writeTextElement(QStringLiteral("USERID"), d->address);
     writer->writeEndElement();
 }
 /// \endcond
@@ -426,65 +426,65 @@ void QXmppVCardPhone::setType(QXmppVCardPhone::Type type)
 /// \cond
 void QXmppVCardPhone::parse(const QDomElement &element)
 {
-    if (!element.firstChildElement(QSL("HOME")).isNull())
+    if (!element.firstChildElement(QStringLiteral("HOME")).isNull())
         d->type |= Home;
-    if (!element.firstChildElement(QSL("WORK")).isNull())
+    if (!element.firstChildElement(QStringLiteral("WORK")).isNull())
         d->type |= Work;
-    if (!element.firstChildElement(QSL("VOICE")).isNull())
+    if (!element.firstChildElement(QStringLiteral("VOICE")).isNull())
         d->type |= Voice;
-    if (!element.firstChildElement(QSL("FAX")).isNull())
+    if (!element.firstChildElement(QStringLiteral("FAX")).isNull())
         d->type |= Fax;
-    if (!element.firstChildElement(QSL("PAGER")).isNull())
+    if (!element.firstChildElement(QStringLiteral("PAGER")).isNull())
         d->type |= Pager;
-    if (!element.firstChildElement(QSL("MSG")).isNull())
+    if (!element.firstChildElement(QStringLiteral("MSG")).isNull())
         d->type |= Messaging;
-    if (!element.firstChildElement(QSL("CELL")).isNull())
+    if (!element.firstChildElement(QStringLiteral("CELL")).isNull())
         d->type |= Cell;
-    if (!element.firstChildElement(QSL("VIDEO")).isNull())
+    if (!element.firstChildElement(QStringLiteral("VIDEO")).isNull())
         d->type |= Video;
-    if (!element.firstChildElement(QSL("BBS")).isNull())
+    if (!element.firstChildElement(QStringLiteral("BBS")).isNull())
         d->type |= BBS;
-    if (!element.firstChildElement(QSL("MODEM")).isNull())
+    if (!element.firstChildElement(QStringLiteral("MODEM")).isNull())
         d->type |= Modem;
-    if (!element.firstChildElement(QSL("ISDN")).isNull())
+    if (!element.firstChildElement(QStringLiteral("ISDN")).isNull())
         d->type |= ISDN;
-    if (!element.firstChildElement(QSL("PCS")).isNull())
+    if (!element.firstChildElement(QStringLiteral("PCS")).isNull())
         d->type |= PCS;
-    if (!element.firstChildElement(QSL("PREF")).isNull())
+    if (!element.firstChildElement(QStringLiteral("PREF")).isNull())
         d->type |= Preferred;
-    d->number = element.firstChildElement(QSL("NUMBER")).text();
+    d->number = element.firstChildElement(QStringLiteral("NUMBER")).text();
 }
 
 void QXmppVCardPhone::toXml(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement(QSL("TEL"));
+    writer->writeStartElement(QStringLiteral("TEL"));
     if (d->type & Home)
-        writer->writeEmptyElement(QSL("HOME"));
+        writer->writeEmptyElement(QStringLiteral("HOME"));
     if (d->type & Work)
-        writer->writeEmptyElement(QSL("WORK"));
+        writer->writeEmptyElement(QStringLiteral("WORK"));
     if (d->type & Voice)
-        writer->writeEmptyElement(QSL("VOICE"));
+        writer->writeEmptyElement(QStringLiteral("VOICE"));
     if (d->type & Fax)
-        writer->writeEmptyElement(QSL("FAX"));
+        writer->writeEmptyElement(QStringLiteral("FAX"));
     if (d->type & Pager)
-        writer->writeEmptyElement(QSL("PAGER"));
+        writer->writeEmptyElement(QStringLiteral("PAGER"));
     if (d->type & Messaging)
-        writer->writeEmptyElement(QSL("MSG"));
+        writer->writeEmptyElement(QStringLiteral("MSG"));
     if (d->type & Cell)
-        writer->writeEmptyElement(QSL("CELL"));
+        writer->writeEmptyElement(QStringLiteral("CELL"));
     if (d->type & Video)
-        writer->writeEmptyElement(QSL("VIDEO"));
+        writer->writeEmptyElement(QStringLiteral("VIDEO"));
     if (d->type & BBS)
-        writer->writeEmptyElement(QSL("BBS"));
+        writer->writeEmptyElement(QStringLiteral("BBS"));
     if (d->type & Modem)
-        writer->writeEmptyElement(QSL("MODEM"));
+        writer->writeEmptyElement(QStringLiteral("MODEM"));
     if (d->type & ISDN)
-        writer->writeEmptyElement(QSL("ISDN"));
+        writer->writeEmptyElement(QStringLiteral("ISDN"));
     if (d->type & PCS)
-        writer->writeEmptyElement(QSL("PCS"));
+        writer->writeEmptyElement(QStringLiteral("PCS"));
     if (d->type & Preferred)
-        writer->writeEmptyElement(QSL("PREF"));
-    writer->writeTextElement(QSL("NUMBER"), d->number);
+        writer->writeEmptyElement(QStringLiteral("PREF"));
+    writer->writeTextElement(QStringLiteral("NUMBER"), d->number);
     writer->writeEndElement();
 }
 /// \endcond
@@ -600,25 +600,25 @@ void QXmppVCardOrganization::setTitle(const QString &title)
 /// \cond
 void QXmppVCardOrganization::parse(const QDomElement &cardElem)
 {
-    d->title = cardElem.firstChildElement(QSL("TITLE")).text();
-    d->role = cardElem.firstChildElement(QSL("ROLE")).text();
+    d->title = cardElem.firstChildElement(QStringLiteral("TITLE")).text();
+    d->role = cardElem.firstChildElement(QStringLiteral("ROLE")).text();
 
-    const QDomElement &orgElem = cardElem.firstChildElement(QSL("ORG"));
-    d->organization = orgElem.firstChildElement(QSL("ORGNAME")).text();
-    d->unit = orgElem.firstChildElement(QSL("ORGUNIT")).text();
+    const QDomElement &orgElem = cardElem.firstChildElement(QStringLiteral("ORG"));
+    d->organization = orgElem.firstChildElement(QStringLiteral("ORGNAME")).text();
+    d->unit = orgElem.firstChildElement(QStringLiteral("ORGUNIT")).text();
 }
 
 void QXmppVCardOrganization::toXml(QXmlStreamWriter *stream) const
 {
     if (!d->unit.isEmpty() || !d->organization.isEmpty()) {
-        stream->writeStartElement(QSL("ORG"));
-        stream->writeTextElement(QSL("ORGNAME"), d->organization);
-        stream->writeTextElement(QSL("ORGUNIT"), d->unit);
+        stream->writeStartElement(QStringLiteral("ORG"));
+        stream->writeTextElement(QStringLiteral("ORGNAME"), d->organization);
+        stream->writeTextElement(QStringLiteral("ORGUNIT"), d->unit);
         stream->writeEndElement();
     }
 
-    helperToXmlAddTextElement(stream, QSL("TITLE"), d->title);
-    helperToXmlAddTextElement(stream, QSL("ROLE"), d->role);
+    helperToXmlAddTextElement(stream, QStringLiteral("TITLE"), d->title);
+    helperToXmlAddTextElement(stream, QStringLiteral("ROLE"), d->role);
 }
 /// \endcond
 
@@ -959,38 +959,38 @@ void QXmppVCardIq::setOrganization(const QXmppVCardOrganization &org)
 /// \cond
 bool QXmppVCardIq::isVCard(const QDomElement &nodeRecv)
 {
-    return nodeRecv.firstChildElement(QSL("vCard")).namespaceURI() == ns_vcard;
+    return nodeRecv.firstChildElement(QStringLiteral("vCard")).namespaceURI() == ns_vcard;
 }
 
 void QXmppVCardIq::parseElementFromChild(const QDomElement &nodeRecv)
 {
     // vCard
-    QDomElement cardElement = nodeRecv.firstChildElement(QSL("vCard"));
-    d->birthday = QDate::fromString(cardElement.firstChildElement(QSL("BDAY")).text(), QSL("yyyy-MM-dd"));
-    d->description = cardElement.firstChildElement(QSL("DESC")).text();
-    d->fullName = cardElement.firstChildElement(QSL("FN")).text();
-    d->nickName = cardElement.firstChildElement(QSL("NICKNAME")).text();
-    QDomElement nameElement = cardElement.firstChildElement(QSL("N"));
-    d->firstName = nameElement.firstChildElement(QSL("GIVEN")).text();
-    d->lastName = nameElement.firstChildElement(QSL("FAMILY")).text();
-    d->middleName = nameElement.firstChildElement(QSL("MIDDLE")).text();
-    d->url = cardElement.firstChildElement(QSL("URL")).text();
-    QDomElement photoElement = cardElement.firstChildElement(QSL("PHOTO"));
-    QByteArray base64data = photoElement.firstChildElement(QSL("BINVAL")).text().toLatin1();
+    QDomElement cardElement = nodeRecv.firstChildElement(QStringLiteral("vCard"));
+    d->birthday = QDate::fromString(cardElement.firstChildElement(QStringLiteral("BDAY")).text(), QStringLiteral("yyyy-MM-dd"));
+    d->description = cardElement.firstChildElement(QStringLiteral("DESC")).text();
+    d->fullName = cardElement.firstChildElement(QStringLiteral("FN")).text();
+    d->nickName = cardElement.firstChildElement(QStringLiteral("NICKNAME")).text();
+    QDomElement nameElement = cardElement.firstChildElement(QStringLiteral("N"));
+    d->firstName = nameElement.firstChildElement(QStringLiteral("GIVEN")).text();
+    d->lastName = nameElement.firstChildElement(QStringLiteral("FAMILY")).text();
+    d->middleName = nameElement.firstChildElement(QStringLiteral("MIDDLE")).text();
+    d->url = cardElement.firstChildElement(QStringLiteral("URL")).text();
+    QDomElement photoElement = cardElement.firstChildElement(QStringLiteral("PHOTO"));
+    QByteArray base64data = photoElement.firstChildElement(QStringLiteral("BINVAL")).text().toLatin1();
     d->photo = QByteArray::fromBase64(base64data);
-    d->photoType = photoElement.firstChildElement(QSL("TYPE")).text();
+    d->photoType = photoElement.firstChildElement(QStringLiteral("TYPE")).text();
 
     QDomElement child = cardElement.firstChildElement();
     while (!child.isNull()) {
-        if (child.tagName() == QSL("ADR")) {
+        if (child.tagName() == QStringLiteral("ADR")) {
             QXmppVCardAddress address;
             address.parse(child);
             d->addresses << address;
-        } else if (child.tagName() == QSL("EMAIL")) {
+        } else if (child.tagName() == QStringLiteral("EMAIL")) {
             QXmppVCardEmail email;
             email.parse(child);
             d->emails << email;
-        } else if (child.tagName() == QSL("TEL")) {
+        } else if (child.tagName() == QStringLiteral("TEL")) {
             QXmppVCardPhone phone;
             phone.parse(child);
             d->phones << phone;
@@ -1003,46 +1003,46 @@ void QXmppVCardIq::parseElementFromChild(const QDomElement &nodeRecv)
 
 void QXmppVCardIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement(QSL("vCard"));
+    writer->writeStartElement(QStringLiteral("vCard"));
     writer->writeDefaultNamespace(ns_vcard);
     for (const QXmppVCardAddress &address : d->addresses)
         address.toXml(writer);
     if (d->birthday.isValid())
-        helperToXmlAddTextElement(writer, QSL("BDAY"), d->birthday.toString(QSL("yyyy-MM-dd")));
+        helperToXmlAddTextElement(writer, QStringLiteral("BDAY"), d->birthday.toString(QStringLiteral("yyyy-MM-dd")));
     if (!d->description.isEmpty())
-        helperToXmlAddTextElement(writer, QSL("DESC"), d->description);
+        helperToXmlAddTextElement(writer, QStringLiteral("DESC"), d->description);
     for (const QXmppVCardEmail &email : d->emails)
         email.toXml(writer);
     if (!d->fullName.isEmpty())
-        helperToXmlAddTextElement(writer, QSL("FN"), d->fullName);
+        helperToXmlAddTextElement(writer, QStringLiteral("FN"), d->fullName);
     if (!d->nickName.isEmpty())
-        helperToXmlAddTextElement(writer, QSL("NICKNAME"), d->nickName);
+        helperToXmlAddTextElement(writer, QStringLiteral("NICKNAME"), d->nickName);
     if (!d->firstName.isEmpty() ||
         !d->lastName.isEmpty() ||
         !d->middleName.isEmpty()) {
         writer->writeStartElement("N");
         if (!d->firstName.isEmpty())
-            helperToXmlAddTextElement(writer, QSL("GIVEN"), d->firstName);
+            helperToXmlAddTextElement(writer, QStringLiteral("GIVEN"), d->firstName);
         if (!d->lastName.isEmpty())
-            helperToXmlAddTextElement(writer, QSL("FAMILY"), d->lastName);
+            helperToXmlAddTextElement(writer, QStringLiteral("FAMILY"), d->lastName);
         if (!d->middleName.isEmpty())
-            helperToXmlAddTextElement(writer, QSL("MIDDLE"), d->middleName);
+            helperToXmlAddTextElement(writer, QStringLiteral("MIDDLE"), d->middleName);
         writer->writeEndElement();
     }
 
     for (const QXmppVCardPhone &phone : d->phones)
         phone.toXml(writer);
     if (!photo().isEmpty()) {
-        writer->writeStartElement(QSL("PHOTO"));
+        writer->writeStartElement(QStringLiteral("PHOTO"));
         QString photoType = d->photoType;
         if (photoType.isEmpty())
             photoType = getImageType(d->photo);
-        helperToXmlAddTextElement(writer, QSL("TYPE"), photoType);
-        helperToXmlAddTextElement(writer, QSL("BINVAL"), d->photo.toBase64());
+        helperToXmlAddTextElement(writer, QStringLiteral("TYPE"), photoType);
+        helperToXmlAddTextElement(writer, QStringLiteral("BINVAL"), d->photo.toBase64());
         writer->writeEndElement();
     }
     if (!d->url.isEmpty())
-        helperToXmlAddTextElement(writer, QSL("URL"), d->url);
+        helperToXmlAddTextElement(writer, QStringLiteral("URL"), d->url);
 
     d->organization.toXml(writer);