kopia lustrzana https://gitlab.com/eliggett/wfview
Force UTF-8 codec for .ini files
rodzic
33dfb716c5
commit
38713e21a2
|
@ -1273,6 +1273,9 @@ void rigCommander::determineRigCaps()
|
||||||
}
|
}
|
||||||
rigCaps.filename = rigList.find(rigCaps.modelID).value();
|
rigCaps.filename = rigList.find(rigCaps.modelID).value();
|
||||||
QSettings* settings = new QSettings(rigCaps.filename, QSettings::Format::IniFormat);
|
QSettings* settings = new QSettings(rigCaps.filename, QSettings::Format::IniFormat);
|
||||||
|
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
|
||||||
|
settings->setIniCodec("UTF-8");
|
||||||
|
#endif
|
||||||
if (!settings->childGroups().contains("Rig"))
|
if (!settings->childGroups().contains("Rig"))
|
||||||
{
|
{
|
||||||
qWarning(logRig()) << rigCaps.filename << "Cannot be loaded!";
|
qWarning(logRig()) << rigCaps.filename << "Cannot be loaded!";
|
||||||
|
|
|
@ -119,6 +119,10 @@ void rigCreator::loadRigFile(QString file)
|
||||||
this->currentFile = file;
|
this->currentFile = file;
|
||||||
QSettings* settings = new QSettings(file, QSettings::Format::IniFormat);
|
QSettings* settings = new QSettings(file, QSettings::Format::IniFormat);
|
||||||
|
|
||||||
|
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
|
||||||
|
settings->setIniCodec("UTF-8");
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!settings->childGroups().contains("Rig"))
|
if (!settings->childGroups().contains("Rig"))
|
||||||
{
|
{
|
||||||
QFileInfo info(file);
|
QFileInfo info(file);
|
||||||
|
|
|
@ -130,6 +130,11 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
|
||||||
QStringList rigs = systemRigDir.entryList(QStringList() << "*.rig" << "*.RIG", QDir::Files);
|
QStringList rigs = systemRigDir.entryList(QStringList() << "*.rig" << "*.RIG", QDir::Files);
|
||||||
for (QString &rig: rigs) {
|
for (QString &rig: rigs) {
|
||||||
QSettings* rigSettings = new QSettings(systemRigDir.absoluteFilePath(rig), QSettings::Format::IniFormat);
|
QSettings* rigSettings = new QSettings(systemRigDir.absoluteFilePath(rig), QSettings::Format::IniFormat);
|
||||||
|
|
||||||
|
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
|
||||||
|
settings->setIniCodec("UTF-8");
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!rigSettings->childGroups().contains("Rig"))
|
if (!rigSettings->childGroups().contains("Rig"))
|
||||||
{
|
{
|
||||||
qWarning() << rig << "Does not seem to be a rig description file";
|
qWarning() << rig << "Does not seem to be a rig description file";
|
||||||
|
|
Ładowanie…
Reference in New Issue