From d23a5bbdc799f466bb1b0bedacf8a5fe1b68dd58 Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 2 Dec 2022 18:26:56 +0100 Subject: [PATCH] Fix wrong use of QStringLiteral and QLatin1String --- sources/TerminalStrip/terminalstrip.cpp | 2 +- sources/TerminalStrip/terminalstripdata.cpp | 22 +++++++++---------- .../TerminalStrip/ui/freeterminalmodel.cpp | 4 ++-- .../TerminalStrip/ui/terminalstripmodel.cpp | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sources/TerminalStrip/terminalstrip.cpp b/sources/TerminalStrip/terminalstrip.cpp index 629cd7be9..ba943b34d 100644 --- a/sources/TerminalStrip/terminalstrip.cpp +++ b/sources/TerminalStrip/terminalstrip.cpp @@ -976,7 +976,7 @@ QDomElement TerminalStrip::toXml(QDomDocument &parent_document) root_elmt.appendChild(m_data.toXml(parent_document)); //Undrawed terminals - auto xml_layout = parent_document.createElement("layout"); + auto xml_layout = parent_document.createElement(QStringLiteral("layout")); for (auto &phy_t : m_physical_terminals) { xml_layout.appendChild(phy_t->toXml(parent_document)); } diff --git a/sources/TerminalStrip/terminalstripdata.cpp b/sources/TerminalStrip/terminalstripdata.cpp index bd86b1a14..78d740ee3 100644 --- a/sources/TerminalStrip/terminalstripdata.cpp +++ b/sources/TerminalStrip/terminalstripdata.cpp @@ -34,7 +34,7 @@ QDomElement TerminalStripData::toXml(QDomDocument &xml_document) const root_elmt.setAttribute(QStringLiteral("uuid"), m_uuid.toString()); - auto info_elmt = xml_document.createElement("informations"); + auto info_elmt = xml_document.createElement(QStringLiteral("informations")); root_elmt.appendChild(info_elmt); if (!m_installation.isEmpty()) { @@ -65,23 +65,23 @@ bool TerminalStripData::fromXml(const QDomElement &xml_element) return false; } #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - m_uuid = QUuid::fromString(xml_element.attribute(QLatin1String("uuid"))); + m_uuid = QUuid::fromString(xml_element.attribute(QStringLiteral("uuid"))); #else m_uuid = QUuid(xml_element.attribute(QStringLiteral("uuid"))); #endif for (auto &xml_info : - QETXML::findInDomElement(xml_element.firstChildElement("informations"), - QStringLiteral("information"))) + QETXML::findInDomElement(xml_element.firstChildElement(QStringLiteral("informations")), + QStringLiteral("information"))) { - auto name = xml_info.attribute("name"); + auto name = xml_info.attribute(QStringLiteral("name")); auto value = xml_info.text(); - if (name == QStringLiteral("installation")) { m_installation = value;} - else if (name == QStringLiteral("location")) {m_location = value;} - else if (name == QStringLiteral("name")) {m_name = value;} - else if (name == QStringLiteral("comment")) {m_comment = value;} - else if (name == QStringLiteral("description")) {m_description = value;} + if (name == QLatin1String("installation")) { m_installation = value;} + else if (name == QLatin1String("location")) {m_location = value;} + else if (name == QLatin1String("name")) {m_name = value;} + else if (name == QLatin1String("comment")) {m_comment = value;} + else if (name == QLatin1String("description")) {m_description = value;} } return true; @@ -101,7 +101,7 @@ TerminalStripData &TerminalStripData::operator=(const TerminalStripData &other) QDomElement TerminalStripData::infoToXml(QDomDocument &xml_doc, const QString &name, const QString &value) { - auto xml_elmt = xml_doc.createElement("information"); + auto xml_elmt = xml_doc.createElement(QStringLiteral("information")); xml_elmt.setAttribute(QStringLiteral("name"), name); xml_elmt.appendChild(xml_doc.createTextNode(value)); diff --git a/sources/TerminalStrip/ui/freeterminalmodel.cpp b/sources/TerminalStrip/ui/freeterminalmodel.cpp index 4bd5f241b..33b782900 100644 --- a/sources/TerminalStrip/ui/freeterminalmodel.cpp +++ b/sources/TerminalStrip/ui/freeterminalmodel.cpp @@ -333,7 +333,7 @@ QWidget *FreeTerminalModelDelegate::createEditor(QWidget *parent, const QStyleOp { if (index.column() == TYPE_CELL) { auto qcb = new QComboBox(parent); - qcb->setObjectName(QLatin1String("terminal_type")); + qcb->setObjectName(QStringLiteral("terminal_type")); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTGeneric), ElementData::TTGeneric); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTFuse), ElementData::TTFuse); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTSectional), ElementData::TTSectional); @@ -344,7 +344,7 @@ QWidget *FreeTerminalModelDelegate::createEditor(QWidget *parent, const QStyleOp } if (index.column() == FUNCTION_CELL) { auto qcb = new QComboBox(parent); - qcb->setObjectName(QLatin1String("terminal_function")); + qcb->setObjectName(QStringLiteral("terminal_function")); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFGeneric), ElementData::TFGeneric); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFPhase), ElementData::TFPhase); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFNeutral), ElementData::TFNeutral); diff --git a/sources/TerminalStrip/ui/terminalstripmodel.cpp b/sources/TerminalStrip/ui/terminalstripmodel.cpp index fe37ea7da..2ca4f7ef7 100644 --- a/sources/TerminalStrip/ui/terminalstripmodel.cpp +++ b/sources/TerminalStrip/ui/terminalstripmodel.cpp @@ -794,7 +794,7 @@ QWidget *TerminalStripModelDelegate::createEditor(QWidget *parent, const QStyleO { if (index.column() == TYPE_CELL) { auto qcb = new QComboBox(parent); - qcb->setObjectName(QLatin1String("terminal_type")); + qcb->setObjectName(QStringLiteral("terminal_type")); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTGeneric), ElementData::TTGeneric); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTFuse), ElementData::TTFuse); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTSectional), ElementData::TTSectional); @@ -805,7 +805,7 @@ QWidget *TerminalStripModelDelegate::createEditor(QWidget *parent, const QStyleO } if (index.column() == FUNCTION_CELL) { auto qcb = new QComboBox(parent); - qcb->setObjectName(QLatin1String("terminal_function")); + qcb->setObjectName(QStringLiteral("terminal_function")); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFGeneric), ElementData::TFGeneric); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFPhase), ElementData::TFPhase); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFNeutral), ElementData::TFNeutral);