flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-12 07:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Style, typos

Browse Source
This commit is contained in:
Klaus Basan
2018-06-09 00:45:36 +02:00
parent 39943c1365
commit a27f2b3a9c
11 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/algorithm.h
View File

@@ -63,7 +63,7 @@ namespace BlackMisc
* Split the range [in,end) into n equal chunks and use the random number generator rng to choose one element from each.
*/
template <typename ForwardIt, typename OutputIt, typename Generator>
void copySampleElements(ForwardIt in, ForwardIt end, OutputIt out, const int n, Generator &&rng)
void copySampleElements(ForwardIt in, ForwardIt end, OutputIt out, int n, Generator &&rng)
{
const auto size = static_cast<int>(std::distance(in, end));
for (int i = 0; i < std::min(n, size); ++i)

48
src/blackmisc/simplecommandparser.cpp
View File

@@ -30,20 +30,20 @@ namespace BlackMisc
void CSimpleCommandParser::parse(const QString &commandLine)
{
this->m_knownCommand = false;
this->m_originalLine = commandLine;
this->m_cleanedLine = commandLine.trimmed().simplified();
if (!this->m_cleanedLine.isEmpty())
m_knownCommand = false;
m_originalLine = commandLine;
m_cleanedLine = commandLine.trimmed().simplified();
if (!m_cleanedLine.isEmpty())
{
this->m_splitParts = m_cleanedLine.split(' ');
if (!this->m_splitParts.isEmpty())
m_splitParts = m_cleanedLine.split(' ');
if (!m_splitParts.isEmpty())
{
const QString &first = this->m_splitParts.constFirst();
const QString &first = m_splitParts.constFirst();
const QString formatted = formatCommand(first);
if (isCommand(first))
{
this->m_commandPart = formatted;
this->m_knownCommand = this->m_knownCommands.contains(formatted);
m_commandPart = formatted;
m_knownCommand = m_knownCommands.contains(formatted);
}
}
}
@@ -52,22 +52,22 @@ namespace BlackMisc
const QString &CSimpleCommandParser::part(int index) const
{
static const QString empty("");
if (index < 0 || index >= this->m_splitParts.size()) return empty;
return this->m_splitParts.at(index);
if (index < 0 || index >= m_splitParts.size()) return empty;
return m_splitParts.at(index);
}
QString CSimpleCommandParser::remainingStringAfter(int index) const
{
if (index < 0) { return this->m_originalLine.trimmed(); }
if (index < 0) { return m_originalLine.trimmed(); }
const QString p = this->part(index);
int fi = this->m_originalLine.indexOf(p, 0, Qt::CaseInsensitive);
int fi = m_originalLine.indexOf(p, 0, Qt::CaseInsensitive);
if (fi < 0) { return ""; }
return this->m_originalLine.mid(fi).trimmed();
return m_originalLine.mid(fi).trimmed();
}
int CSimpleCommandParser::countParts() const
{
return this->m_splitParts.count();
return m_splitParts.count();
}
bool CSimpleCommandParser::hasPart(int index) const
@@ -206,30 +206,30 @@ namespace BlackMisc
bool CSimpleCommandParser::matchesCommand(const QString &checkCommand, const QString &alias1, const QString &alias2)
{
if (this->m_commandPart.isEmpty()) { return false; }
if (!checkCommand.isEmpty() && formatCommand(checkCommand) == this->m_commandPart) { return true; }
if (!alias1.isEmpty() && formatCommand(alias1) == this->m_commandPart) { return true; }
if (!alias2.isEmpty() && formatCommand(alias2) == this->m_commandPart) { return true; }
if (m_commandPart.isEmpty()) { return false; }
if (!checkCommand.isEmpty() && formatCommand(checkCommand) == m_commandPart) { return true; }
if (!alias1.isEmpty() && formatCommand(alias1) == m_commandPart) { return true; }
if (!alias2.isEmpty() && formatCommand(alias2) == m_commandPart) { return true; }
return false;
}
bool CSimpleCommandParser::commandStartsWith(const QString &startPattern) const
{
if (this->m_commandPart.isEmpty()) { return false; }
return this->m_commandPart.startsWith(formatCommand(startPattern));
if (m_commandPart.isEmpty()) { return false; }
return m_commandPart.startsWith(formatCommand(startPattern));
}
bool CSimpleCommandParser::commandEndsWith(const QString &endPattern) const
{
if (this->m_commandPart.isEmpty()) { return false; }
return this->m_commandPart.endsWith(endPattern);
if (m_commandPart.isEmpty()) { return false; }
return m_commandPart.endsWith(endPattern);
}
void CSimpleCommandParser::setCheckedCommandList(const QStringList &commands)
{
for (const QString &c : commands)
{
this->m_knownCommands.append(formatCommand(c));
m_knownCommands.append(formatCommand(c));
}
}
} // namespace

4
src/blackmisc/simulation/fsx/simconnectutilities.cpp
View File

@@ -107,10 +107,10 @@ namespace BlackMisc
QString CSimConnectUtilities::resolveEnumToString(const DWORD id, const char *enumName)
{
const int i = CSimConnectUtilities::staticMetaObject.indexOfEnumerator(enumName);
if (i < 0) return QString("No enumerator for %1").arg(enumName);
if (i < 0) { return QString("No enumerator for %1").arg(enumName); }
const QMetaEnum m = CSimConnectUtilities::staticMetaObject.enumerator(i);
const char *k = m.valueToKey(id);
return (k) ? QLatin1String(k) : QString("Id %1 not found for %2").arg(id).arg(enumName);
return (k) ? QLatin1String(k) : QString("Id '%1' not found for %2").arg(id).arg(enumName);
}
const QString &CSimConnectUtilities::simConnectIniFilename()

3
src/blackmisc/simulation/simulationenvironmentprovider.cpp
View File

@@ -20,10 +20,11 @@ namespace BlackMisc
bool ISimulationEnvironmentProvider::rememberGroundElevation(const ICoordinateGeodetic &elevationCoordinate, const CLength &epsilon)
{
{
// no 2nd elevation nearby
// no 2nd elevation nearby?
QReadLocker l(&m_lockElvCoordinates);
if (m_elvCoordinates.containsObjectInRange(elevationCoordinate, minRange(epsilon))) { return false; }
}
{
// we keep latest at front
// * we assume we find them faster