flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed to simplifyAccents (actually the chars are not removed, but replaced)

Browse Source
This commit is contained in:
Klaus Basan
2018-09-14 19:00:30 +02:00
parent c26af17b2f
commit c3cf39e102
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/aviation/flightplan.cpp
View File

@@ -83,7 +83,7 @@ namespace BlackMisc
{
QString r = remarksIn;
r.replace(':', ' ');
r = asciiOnlyString(removeAccents(remarksIn));
r = asciiOnlyString(simplifyAccents(remarksIn));
return r;
}

2
src/blackmisc/country.cpp
View File

@@ -208,7 +208,7 @@ namespace BlackMisc
void CCountry::setSimplifiedNameIfNotSame()
{
const QString simplified = removeAccents(m_name);
const QString simplified = simplifyAccents(m_name);
m_simplifiedName = m_name == simplified ? "" : simplified;
}
} // namespace

2
src/blackmisc/network/user.cpp
View File

@@ -91,7 +91,7 @@ namespace BlackMisc
void CUser::setRealName(const QString &realname)
{
QString rn(removeAccents(decode(realname).simplified()));
QString rn(simplifyAccents(decode(realname).simplified()));
if (rn.isEmpty())
{
m_realname.clear();

12
src/blackmisc/stringutils.cpp
View File

@@ -99,8 +99,8 @@ namespace BlackMisc
const QString bStr = str1.length() >= str2.length() ? str2 : str1;
// starts/ends with
float s1 = aStr.length();
float s2 = bStr.length();
const double s1 = aStr.length();
const double s2 = bStr.length();
if (aStr.endsWith(bStr, cs)) { return qRound(s1 / s2 * 100); }
if (aStr.startsWith(bStr, cs)) { return qRound(s1 / s2 * 100); }
@@ -108,7 +108,7 @@ namespace BlackMisc
if (aStr.contains(bStr, cs)) { return qRound(s1 / s2 * 100); }
// char by char
float points = 0;
double points = 0;
for (int p = 0; p < aStr.length(); p++)
{
if (p < bStr.length() && aStr[p] == bStr[p])
@@ -150,7 +150,7 @@ namespace BlackMisc
QString h;
for (int i = 0; i < bytes.size(); i++)
{
int b = static_cast<int>(bytes.at(i));
const int b = static_cast<int>(bytes.at(i));
h.append(intToHex(b, 2));
}
return h;
@@ -163,7 +163,7 @@ namespace BlackMisc
while (pos + 1 < hexString.length())
{
bool ok;
QString h = hexString.mid(pos, 2);
const QString h = hexString.mid(pos, 2);
int hex = h.toInt(&ok, 16);
Q_ASSERT_X(ok, Q_FUNC_INFO, "Invalid hex");
if (!ok) { return QByteArray(); }
@@ -219,7 +219,7 @@ namespace BlackMisc
}
// http://www.codegur.online/14009522/how-to-remove-accents-diacritic-marks-from-a-string-in-qt
QString removeAccents(const QString &candidate)
QString simplifyAccents(const QString &candidate)
{
static const QString diacriticLetters = QString::fromUtf8("ŠŒŽšœžŸ¥µÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ");
static const QStringList noDiacriticLetters({"S", "OE", "Z", "s", "oe", "z", "Y", "Y", "u", "A", "A", "A", "A", "A", "A", "AE", "C", "E", "E", "E", "E", "I", "I", "I", "I", "D", "N", "O", "O", "O", "O", "O", "O", "U", "U", "U", "U", "Y", "s", "a", "a", "a", "a", "a", "a", "ae", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "y"});

2
src/blackmisc/stringutils.h
View File

@@ -220,7 +220,7 @@ namespace BlackMisc
BLACKMISC_EXPORT QStringList textCodecNames(bool simpleNames, bool mibNames);
//! Remove accents / diacritic marks from a string
BLACKMISC_EXPORT QString removeAccents(const QString &candidate);
BLACKMISC_EXPORT QString simplifyAccents(const QString &candidate);
//! Case insensitive string compare
BLACKMISC_EXPORT bool caseInsensitiveStringCompare(const QString &c1, const QString &c2);