mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-06-30 14:04:13 +02:00
Merge pull request #524 from ispyisail/fix/collection-unicode-path
Fix #391: collection panel blank when path contains accented chars or is too long (Windows)
This commit is contained in:
@@ -703,11 +703,11 @@ pugi::xml_document ElementsLocation::pugiXml() const
|
|||||||
if (!m_project)
|
if (!m_project)
|
||||||
{
|
{
|
||||||
#ifndef Q_OS_LINUX
|
#ifndef Q_OS_LINUX
|
||||||
if (docu.load_file(m_file_system_path.toStdString().c_str())) {
|
if (docu.load_file(m_file_system_path.toStdWString().c_str())) {
|
||||||
docu.save(m_string_stream);
|
docu.save(m_string_stream);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
docu.load_file(m_file_system_path.toStdString().c_str());
|
docu.load_file(m_file_system_path.toStdWString().c_str());
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ QString FileElementCollectionItem::localName()
|
|||||||
{
|
{
|
||||||
QString str(fileSystemPath() % "/qet_directory");
|
QString str(fileSystemPath() % "/qet_directory");
|
||||||
pugi::xml_document docu;
|
pugi::xml_document docu;
|
||||||
if(docu.load_file(str.toStdString().c_str()))
|
if(docu.load_file(str.toStdWString().c_str()))
|
||||||
{
|
{
|
||||||
if (QString(docu.document_element().name())
|
if (QString(docu.document_element().name())
|
||||||
== "qet-directory")
|
== "qet-directory")
|
||||||
|
|||||||
Reference in New Issue
Block a user