flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T709, move case insensitive compare to utils (so it can be used elsewhere)

Browse Source
This commit is contained in:
Klaus Basan
2019-07-25 16:05:21 +02:00
committed by Mat Sutcliffe
parent 14bb3ea249
commit cc4b8b61ae
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/simulation/xplane/qtfreeutils.h
View File

@@ -129,6 +129,16 @@ namespace BlackMisc
return s;
}
//! Compare case insensitive
inline bool stringCompareCaseInsensitive(const std::string &str1, const std::string &str2)
{
if (str1.size() != str2.size()) { return false; }
return std::equal(str1.begin(), str1.end(), str2.begin(), [](const char &c1, const char &c2)
{
return (c1 == c2 || std::toupper(c1) == std::toupper(c2));
});
}
//! Trim whitespace from the beginning and end, and replace sequences of whitespace with single space characters
inline std::string simplifyWhitespace(const std::string &s)
{

24
src/xswiftbus/config.cpp
View File

@@ -8,23 +8,17 @@
#include "config.h"
#include "utils.h"
#include "blackmisc/simulation/xplane/qtfreeutils.h"
#include <fstream>
#include <string>
#include <cctype>
#include <algorithm>
using namespace BlackMisc::Simulation::XPlane::QtFreeUtils;
namespace XSwiftBus
{
//! Case insensitive string compare
bool stringCompare(const std::string & str1, const std::string &str2)
{
if (str1.size() != str2.size()) { return false; }
return std::equal(str1.begin(), str1.end(), str2.begin(), [](const char & c1, const char & c2)
{
return (c1 == c2 || std::toupper(c1) == std::toupper(c2));
});
}
CConfig::CConfig()
{}
@@ -62,9 +56,9 @@ namespace XSwiftBus
}
bool valid = true;
if (stringCompare(key, "dbusMode")) { valid = parseDBusMode(value); }
else if (stringCompare(key, "dbusAddress")) { valid = parseDBusAddress(value); }
else if (stringCompare(key, "dbusPort")) { valid = parseDBusPort(value); }
if (stringCompareCaseInsensitive(key, "dbusMode")) { valid = parseDBusMode(value); }
else if (stringCompareCaseInsensitive(key, "dbusAddress")) { valid = parseDBusAddress(value); }
else if (stringCompareCaseInsensitive(key, "dbusPort")) { valid = parseDBusPort(value); }
else
{
WARNING_LOG("xswiftbus.conf line " + std::to_string(lineNo) + ": Unknown variable " + value + "!");
@@ -93,8 +87,8 @@ namespace XSwiftBus
bool CConfig::parseDBusMode(const std::string &value)
{
if (stringCompare(value, "session")) { m_dbusMode = CConfig::DBusSession; return true; }
else if (stringCompare(value, "P2P")) { m_dbusMode = CConfig::DBusP2P; return true; }
if (stringCompareCaseInsensitive(value, "session")) { m_dbusMode = CConfig::DBusSession; return true; }
else if (stringCompareCaseInsensitive(value, "P2P")) { m_dbusMode = CConfig::DBusP2P; return true; }
else { return false; }
}