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/QXmppArchiveIq.cpp | |
| parent | 88451aa1597afd0a1a1c3b3fb59d5a95d3011736 (diff) | |
| download | qxmpp-1ac7b9d2a25d50b7680bd75ff68f29055b196d80.tar.gz | |
base: Convert to QStringLiteral
Two new macros were added:
* QBL (short alias for QByteArrayLiteral)
* QSL (short alias for QStringLiteral)
Diffstat (limited to 'src/base/QXmppArchiveIq.cpp')
| -rw-r--r-- | src/base/QXmppArchiveIq.cpp | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp index 290a3ef0..38fdde2b 100644 --- a/src/base/QXmppArchiveIq.cpp +++ b/src/base/QXmppArchiveIq.cpp @@ -88,22 +88,22 @@ QXmppArchiveChat::QXmppArchiveChat() /// \cond void QXmppArchiveChat::parse(const QDomElement &element) { - m_with = element.attribute("with"); - m_start = QXmppUtils::datetimeFromString(element.attribute("start")); - m_subject = element.attribute("subject"); - m_thread = element.attribute("thread"); - m_version = element.attribute("version").toInt(); + m_with = element.attribute(QSL("with")); + m_start = QXmppUtils::datetimeFromString(element.attribute(QSL("start"))); + m_subject = element.attribute(QSL("subject")); + m_thread = element.attribute(QSL("thread")); + m_version = element.attribute(QSL("version")).toInt(); QDateTime timeAccu = m_start; QDomElement child = element.firstChildElement(); while (!child.isNull()) { - if ((child.tagName() == "from") || (child.tagName() == "to")) { + if ((child.tagName() == QSL("from")) || (child.tagName() == QSL("to"))) { QXmppArchiveMessage message; - message.setBody(child.firstChildElement("body").text()); - timeAccu = timeAccu.addSecs(child.attribute("secs").toInt()); + message.setBody(child.firstChildElement(QSL("body")).text()); + timeAccu = timeAccu.addSecs(child.attribute(QSL("secs")).toInt()); message.setDate(timeAccu); - message.setReceived(child.tagName() == "from"); + message.setReceived(child.tagName() == QSL("from")); m_messages << message; } child = child.nextSiblingElement(); @@ -112,22 +112,22 @@ void QXmppArchiveChat::parse(const QDomElement &element) void QXmppArchiveChat::toXml(QXmlStreamWriter *writer, const QXmppResultSetReply &rsm) const { - writer->writeStartElement("chat"); + writer->writeStartElement(QSL("chat")); writer->writeDefaultNamespace(ns_archive); - helperToXmlAddAttribute(writer, "with", m_with); + helperToXmlAddAttribute(writer, QSL("with"), m_with); if (m_start.isValid()) - helperToXmlAddAttribute(writer, "start", QXmppUtils::datetimeToString(m_start)); - helperToXmlAddAttribute(writer, "subject", m_subject); - helperToXmlAddAttribute(writer, "thread", m_thread); + helperToXmlAddAttribute(writer, QSL("start"), QXmppUtils::datetimeToString(m_start)); + helperToXmlAddAttribute(writer, QSL("subject"), m_subject); + helperToXmlAddAttribute(writer, QSL("thread"), m_thread); if (m_version) - helperToXmlAddAttribute(writer, "version", QString::number(m_version)); + helperToXmlAddAttribute(writer, QSL("version"), QString::number(m_version)); QDateTime prevTime = m_start; for (const QXmppArchiveMessage &message : m_messages) { - writer->writeStartElement(message.isReceived() ? "from" : "to"); - helperToXmlAddAttribute(writer, "secs", QString::number(prevTime.secsTo(message.date()))); - writer->writeTextElement("body", message.body()); + writer->writeStartElement(message.isReceived() ? QSL("from") : QSL("to")); + helperToXmlAddAttribute(writer, QSL("secs"), QString::number(prevTime.secsTo(message.date()))); + writer->writeTextElement(QSL("body"), message.body()); writer->writeEndElement(); prevTime = message.date(); } @@ -256,14 +256,14 @@ void QXmppArchiveChatIq::setResultSetReply(const QXmppResultSetReply &rsm) /// \cond bool QXmppArchiveChatIq::isArchiveChatIq(const QDomElement &element) { - QDomElement chatElement = element.firstChildElement("chat"); - return !chatElement.attribute("with").isEmpty(); + QDomElement chatElement = element.firstChildElement(QSL("chat")); + return !chatElement.attribute(QSL("with")).isEmpty(); //return (chatElement.namespaceURI() == ns_archive); } void QXmppArchiveChatIq::parseElementFromChild(const QDomElement &element) { - QDomElement chatElement = element.firstChildElement("chat"); + QDomElement chatElement = element.firstChildElement(QSL("chat")); m_chat.parse(chatElement); m_rsmReply.parse(chatElement); } @@ -385,23 +385,23 @@ void QXmppArchiveListIq::setResultSetReply(const QXmppResultSetReply &rsm) /// \cond bool QXmppArchiveListIq::isArchiveListIq(const QDomElement &element) { - QDomElement listElement = element.firstChildElement("list"); + QDomElement listElement = element.firstChildElement(QSL("list")); return (listElement.namespaceURI() == ns_archive); } void QXmppArchiveListIq::parseElementFromChild(const QDomElement &element) { - QDomElement listElement = element.firstChildElement("list"); - m_with = listElement.attribute("with"); - m_start = QXmppUtils::datetimeFromString(listElement.attribute("start")); - m_end = QXmppUtils::datetimeFromString(listElement.attribute("end")); + QDomElement listElement = element.firstChildElement(QSL("list")); + m_with = listElement.attribute(QSL("with")); + m_start = QXmppUtils::datetimeFromString(listElement.attribute(QSL("start"))); + m_end = QXmppUtils::datetimeFromString(listElement.attribute(QSL("end"))); m_rsmQuery.parse(listElement); m_rsmReply.parse(listElement); QDomElement child = listElement.firstChildElement(); while (!child.isNull()) { - if (child.tagName() == "chat") { + if (child.tagName() == QSL("chat")) { QXmppArchiveChat chat; chat.parse(child); m_chats << chat; @@ -412,14 +412,14 @@ void QXmppArchiveListIq::parseElementFromChild(const QDomElement &element) void QXmppArchiveListIq::toXmlElementFromChild(QXmlStreamWriter *writer) const { - writer->writeStartElement("list"); + writer->writeStartElement(QSL("list")); writer->writeDefaultNamespace(ns_archive); if (!m_with.isEmpty()) - helperToXmlAddAttribute(writer, "with", m_with); + helperToXmlAddAttribute(writer, QSL("with"), m_with); if (m_start.isValid()) - helperToXmlAddAttribute(writer, "start", QXmppUtils::datetimeToString(m_start)); + helperToXmlAddAttribute(writer, QSL("start"), QXmppUtils::datetimeToString(m_start)); if (m_end.isValid()) - helperToXmlAddAttribute(writer, "end", QXmppUtils::datetimeToString(m_end)); + helperToXmlAddAttribute(writer, QSL("end"), QXmppUtils::datetimeToString(m_end)); if (!m_rsmQuery.isNull()) m_rsmQuery.toXml(writer); else if (!m_rsmReply.isNull()) @@ -431,19 +431,19 @@ void QXmppArchiveListIq::toXmlElementFromChild(QXmlStreamWriter *writer) const bool QXmppArchivePrefIq::isArchivePrefIq(const QDomElement &element) { - QDomElement prefElement = element.firstChildElement("pref"); + QDomElement prefElement = element.firstChildElement(QSL("pref")); return (prefElement.namespaceURI() == ns_archive); } void QXmppArchivePrefIq::parseElementFromChild(const QDomElement &element) { - QDomElement queryElement = element.firstChildElement("pref"); + QDomElement queryElement = element.firstChildElement(QSL("pref")); Q_UNUSED(queryElement); } void QXmppArchivePrefIq::toXmlElementFromChild(QXmlStreamWriter *writer) const { - writer->writeStartElement("pref"); + writer->writeStartElement(QSL("pref")); writer->writeDefaultNamespace(ns_archive); writer->writeEndElement(); } @@ -503,28 +503,28 @@ void QXmppArchiveRemoveIq::setEnd(const QDateTime &end) /// \cond bool QXmppArchiveRemoveIq::isArchiveRemoveIq(const QDomElement &element) { - QDomElement retrieveElement = element.firstChildElement("remove"); + QDomElement retrieveElement = element.firstChildElement(QSL("remove")); return (retrieveElement.namespaceURI() == ns_archive); } void QXmppArchiveRemoveIq::parseElementFromChild(const QDomElement &element) { - QDomElement listElement = element.firstChildElement("remove"); - m_with = listElement.attribute("with"); - m_start = QXmppUtils::datetimeFromString(listElement.attribute("start")); - m_end = QXmppUtils::datetimeFromString(listElement.attribute("end")); + QDomElement listElement = element.firstChildElement(QSL("remove")); + m_with = listElement.attribute(QSL("with")); + m_start = QXmppUtils::datetimeFromString(listElement.attribute(QSL("start"))); + m_end = QXmppUtils::datetimeFromString(listElement.attribute(QSL("end"))); } void QXmppArchiveRemoveIq::toXmlElementFromChild(QXmlStreamWriter *writer) const { - writer->writeStartElement("remove"); + writer->writeStartElement(QSL("remove")); writer->writeDefaultNamespace(ns_archive); if (!m_with.isEmpty()) - helperToXmlAddAttribute(writer, "with", m_with); + helperToXmlAddAttribute(writer, QSL("with"), m_with); if (m_start.isValid()) - helperToXmlAddAttribute(writer, "start", QXmppUtils::datetimeToString(m_start)); + helperToXmlAddAttribute(writer, QSL("start"), QXmppUtils::datetimeToString(m_start)); if (m_end.isValid()) - helperToXmlAddAttribute(writer, "end", QXmppUtils::datetimeToString(m_end)); + helperToXmlAddAttribute(writer, QSL("end"), QXmppUtils::datetimeToString(m_end)); writer->writeEndElement(); } /// \endcond @@ -589,25 +589,25 @@ void QXmppArchiveRetrieveIq::setResultSetQuery(const QXmppResultSetQuery &rsm) /// \cond bool QXmppArchiveRetrieveIq::isArchiveRetrieveIq(const QDomElement &element) { - QDomElement retrieveElement = element.firstChildElement("retrieve"); + QDomElement retrieveElement = element.firstChildElement(QSL("retrieve")); return (retrieveElement.namespaceURI() == ns_archive); } void QXmppArchiveRetrieveIq::parseElementFromChild(const QDomElement &element) { - QDomElement retrieveElement = element.firstChildElement("retrieve"); - m_with = retrieveElement.attribute("with"); - m_start = QXmppUtils::datetimeFromString(retrieveElement.attribute("start")); + QDomElement retrieveElement = element.firstChildElement(QSL("retrieve")); + m_with = retrieveElement.attribute(QSL("with")); + m_start = QXmppUtils::datetimeFromString(retrieveElement.attribute(QSL("start"))); m_rsmQuery.parse(retrieveElement); } void QXmppArchiveRetrieveIq::toXmlElementFromChild(QXmlStreamWriter *writer) const { - writer->writeStartElement("retrieve"); + writer->writeStartElement(QSL("retrieve")); writer->writeDefaultNamespace(ns_archive); - helperToXmlAddAttribute(writer, "with", m_with); - helperToXmlAddAttribute(writer, "start", QXmppUtils::datetimeToString(m_start)); + helperToXmlAddAttribute(writer, QSL("with"), m_with); + helperToXmlAddAttribute(writer, QSL("start"), QXmppUtils::datetimeToString(m_start)); if (!m_rsmQuery.isNull()) m_rsmQuery.toXml(writer); writer->writeEndElement(); |
