kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix wrong use of QStringLiteral and QLatin1String

Browse Source
This commit is contained in:
joshua
2022-12-02 18:26:56 +01:00
parent 81640015e5
commit d23a5bbdc7
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/TerminalStrip/terminalstrip.cpp
View File

@@ -976,7 +976,7 @@ QDomElement TerminalStrip::toXml(QDomDocument &parent_document)
root_elmt.appendChild(m_data.toXml(parent_document)); root_elmt.appendChild(m_data.toXml(parent_document));
//Undrawed terminals //Undrawed terminals
auto xml_layout = parent_document.createElement("layout"); auto xml_layout = parent_document.createElement(QStringLiteral("layout"));
for (auto &phy_t : m_physical_terminals) { for (auto &phy_t : m_physical_terminals) {
xml_layout.appendChild(phy_t->toXml(parent_document)); xml_layout.appendChild(phy_t->toXml(parent_document));
} }

22
sources/TerminalStrip/terminalstripdata.cpp
View File

@@ -34,7 +34,7 @@ QDomElement TerminalStripData::toXml(QDomDocument &xml_document) const
root_elmt.setAttribute(QStringLiteral("uuid"), m_uuid.toString()); 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); root_elmt.appendChild(info_elmt);
if (!m_installation.isEmpty()) { if (!m_installation.isEmpty()) {
@@ -65,23 +65,23 @@ bool TerminalStripData::fromXml(const QDomElement &xml_element)
return false; return false;
} }
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) #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 #else
m_uuid = QUuid(xml_element.attribute(QStringLiteral("uuid"))); m_uuid = QUuid(xml_element.attribute(QStringLiteral("uuid")));
#endif #endif
for (auto &xml_info : for (auto &xml_info :
QETXML::findInDomElement(xml_element.firstChildElement("informations"), QETXML::findInDomElement(xml_element.firstChildElement(QStringLiteral("informations")),
QStringLiteral("information"))) QStringLiteral("information")))
{ {
auto name = xml_info.attribute("name"); auto name = xml_info.attribute(QStringLiteral("name"));
auto value = xml_info.text(); auto value = xml_info.text();
if (name == QStringLiteral("installation")) { m_installation = value;} if (name == QLatin1String("installation")) { m_installation = value;}
else if (name == QStringLiteral("location")) {m_location = value;} else if (name == QLatin1String("location")) {m_location = value;}
else if (name == QStringLiteral("name")) {m_name = value;} else if (name == QLatin1String("name")) {m_name = value;}
else if (name == QStringLiteral("comment")) {m_comment = value;} else if (name == QLatin1String("comment")) {m_comment = value;}
else if (name == QStringLiteral("description")) {m_description = value;} else if (name == QLatin1String("description")) {m_description = value;}
} }
return true; return true;
@@ -101,7 +101,7 @@ TerminalStripData &TerminalStripData::operator=(const TerminalStripData &other)
QDomElement TerminalStripData::infoToXml(QDomDocument &xml_doc, const QString &name, const QString &value) 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.setAttribute(QStringLiteral("name"), name);
xml_elmt.appendChild(xml_doc.createTextNode(value)); xml_elmt.appendChild(xml_doc.createTextNode(value));

4
sources/TerminalStrip/ui/freeterminalmodel.cpp
View File

@@ -333,7 +333,7 @@ QWidget *FreeTerminalModelDelegate::createEditor(QWidget *parent, const QStyleOp
{ {
if (index.column() == TYPE_CELL) { if (index.column() == TYPE_CELL) {
auto qcb = new QComboBox(parent); 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::TTGeneric), ElementData::TTGeneric);
qcb->addItem(ElementData::translatedTerminalType(ElementData::TTFuse), ElementData::TTFuse); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTFuse), ElementData::TTFuse);
qcb->addItem(ElementData::translatedTerminalType(ElementData::TTSectional), ElementData::TTSectional); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTSectional), ElementData::TTSectional);
@@ -344,7 +344,7 @@ QWidget *FreeTerminalModelDelegate::createEditor(QWidget *parent, const QStyleOp
} }
if (index.column() == FUNCTION_CELL) { if (index.column() == FUNCTION_CELL) {
auto qcb = new QComboBox(parent); 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::TFGeneric), ElementData::TFGeneric);
qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFPhase), ElementData::TFPhase); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFPhase), ElementData::TFPhase);
qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFNeutral), ElementData::TFNeutral); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFNeutral), ElementData::TFNeutral);

4
sources/TerminalStrip/ui/terminalstripmodel.cpp
View File

@@ -794,7 +794,7 @@ QWidget *TerminalStripModelDelegate::createEditor(QWidget *parent, const QStyleO
{ {
if (index.column() == TYPE_CELL) { if (index.column() == TYPE_CELL) {
auto qcb = new QComboBox(parent); 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::TTGeneric), ElementData::TTGeneric);
qcb->addItem(ElementData::translatedTerminalType(ElementData::TTFuse), ElementData::TTFuse); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTFuse), ElementData::TTFuse);
qcb->addItem(ElementData::translatedTerminalType(ElementData::TTSectional), ElementData::TTSectional); qcb->addItem(ElementData::translatedTerminalType(ElementData::TTSectional), ElementData::TTSectional);
@@ -805,7 +805,7 @@ QWidget *TerminalStripModelDelegate::createEditor(QWidget *parent, const QStyleO
} }
if (index.column() == FUNCTION_CELL) { if (index.column() == FUNCTION_CELL) {
auto qcb = new QComboBox(parent); 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::TFGeneric), ElementData::TFGeneric);
qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFPhase), ElementData::TFPhase); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFPhase), ElementData::TFPhase);
qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFNeutral), ElementData::TFNeutral); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFNeutral), ElementData::TFNeutral);