flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 10:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T682 Don't convert text codec name to lower case, as it is case sensitive.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-06-17 14:44:41 +01:00
parent 81352d8f07
commit e9dc7f8da8
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/editors/fsdsetupform.cpp
View File

@@ -37,7 +37,7 @@ namespace BlackGui
CFsdSetup CFsdSetupForm::getValue() const CFsdSetup CFsdSetupForm::getValue() const
{ {
if (!this->isEnabled()) { return this->getDisabledValue(); } if (!this->isEnabled()) { return this->getDisabledValue(); }
CFsdSetup s(ui->le_TextCodec->text().trimmed().toLower()); CFsdSetup s(ui->le_TextCodec->text().trimmed());
s.setSendReceiveDetails( s.setSendReceiveDetails(
ui->cb_AircraftPartsSend->isChecked(), ui->cb_AircraftPartsReceive->isChecked(), ui->cb_AircraftPartsSend->isChecked(), ui->cb_AircraftPartsReceive->isChecked(),
ui->cb_GndFlagSend->isChecked(), ui->cb_GndFlagReceive->isChecked(), ui->cb_GndFlagSend->isChecked(), ui->cb_GndFlagReceive->isChecked(),

2
src/blackmisc/network/fsdsetup.h
View File

@@ -78,7 +78,7 @@ namespace BlackMisc
const QString &getTextCodec() const { return m_textCodec; } const QString &getTextCodec() const { return m_textCodec; }
//! Set codec //! Set codec
void setTextCodec(const QString &codec) { m_textCodec = codec.trimmed().toLower(); } void setTextCodec(const QString &codec) { m_textCodec = codec.trimmed(); }
//! Get send / receive details //! Get send / receive details
SendReceiveDetails getSendReceiveDetails() const; SendReceiveDetails getSendReceiveDetails() const;

19
tests/blackmisc/teststringutils/teststringutils.cpp
View File

@@ -18,6 +18,7 @@
#include <QTest> #include <QTest>
#include <QTime> #include <QTime>
#include <QTextCodec>
using namespace BlackMisc; using namespace BlackMisc;
@@ -34,6 +35,7 @@ namespace BlackMiscTest
void testIndexOf(); void testIndexOf();
void testSplit(); void testSplit();
void testTimestampParsing(); void testTimestampParsing();
void testCodecs();
}; };
void CTestStringUtils::testRemove() void CTestStringUtils::testRemove()
@@ -138,6 +140,23 @@ namespace BlackMiscTest
qDebug() << "Parsing date/time, optimized" << elapsedOptimized << "vs. QDateTime: " << elapsedQt; qDebug() << "Parsing date/time, optimized" << elapsedOptimized << "vs. QDateTime: " << elapsedQt;
QVERIFY2(elapsedOptimized < elapsedQt, "Expect optimized being faster as QDateTim::fromString"); QVERIFY2(elapsedOptimized < elapsedQt, "Expect optimized being faster as QDateTim::fromString");
} }
void CTestStringUtils::testCodecs()
{
QTextCodec *latin1 = QTextCodec::codecForName("latin1");
QTextCodec *cp1251 = QTextCodec::codecForName("windows-1251");
QTextCodec *utf8 = QTextCodec::codecForName("UTF-8");
const QString testEnglish = QStringLiteral(u"test");
const QString testRussian = QStringLiteral(u"тест");
bool okEn1 = latin1->toUnicode(latin1->fromUnicode(testEnglish)) == testEnglish;
bool okEn2 = utf8->toUnicode(utf8->fromUnicode(testEnglish)) == testEnglish;
bool okRu1 = cp1251->toUnicode(cp1251->fromUnicode(testRussian)) == testRussian;
bool okRu2 = utf8->toUnicode(utf8->fromUnicode(testRussian)) == testRussian;
QVERIFY2(okEn1, "English \"test\" equal after round-trip with latin1");
QVERIFY2(okEn2, "English \"test\" equal after round-trip with utf8");
QVERIFY2(okRu1, "Russian \"test\" equal after round-trip with cp1251");
QVERIFY2(okRu2, "Russian \"test\" equal after round-trip with utf8");
}
} }
//! main //! main