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

QT6: QTextStream::setCodec use QTextStream::setEncoding

Browse Source
This commit is contained in:
Simon De Backer
2020-10-03 09:37:53 +02:00
parent caac531de1
commit 0e10b4adfa
2 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sources/qetxml.cpp
View File

@@ -274,7 +274,14 @@ bool QETXML::writeXmlFile(
}
QTextStream out(&file);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
out.setCodec("UTF-8");
#else
#if TODO_LIST
#pragma message("@TODO remove code for QT 6 or later")
#endif
out.setEncoding(QStringConverter::Utf8);
#endif
out.setGenerateByteOrderMark(false);
out << xml_document.toString(4);
file.close();
@@ -314,9 +321,9 @@ QVector<QDomElement> QETXML::directChild(
{
QVector<QDomElement> return_list;
for (
QDomNode node = element.firstChild() ;
!node.isNull() ;
node = node.nextSibling())
QDomNode node = element.firstChild() ;
!node.isNull() ;
node = node.nextSibling())
{
if (!node.isElement()) continue;
QDomElement element = node.toElement();
@@ -345,18 +352,18 @@ QVector<QDomElement> QETXML::subChild(
QVector<QDomElement> return_list;
for (
QDomNode child = element.firstChild() ;
!child.isNull() ;
child = child.nextSibling())
QDomNode child = element.firstChild() ;
!child.isNull() ;
child = child.nextSibling())
{
QDomElement parents = child.toElement();
if (parents.isNull() || parents.tagName() != parent_tag_name)
continue;
for (
QDomNode node_children = parents.firstChild() ;
!node_children.isNull() ;
node_children = node_children.nextSibling())
QDomNode node_children = parents.firstChild() ;
!node_children.isNull() ;
node_children = node_children.nextSibling())
{
QDomElement n_children = node_children.toElement();
if (!n_children.isNull() && n_children.tagName() == children_tag_name)