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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2018-02-14 03:48:36 +01:00
parent 8dc25fbad7
commit 78e61e25ac
6 changed files with 40 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -571,7 +571,7 @@ namespace BlackCore
QStringList args;
int id = 0;
QString key;
if (!getCmdLineClientIdAndKey(id, key)) { return args; }
if (!CNetworkVatlib::getCmdLineClientIdAndKey(id, key)) { return args; }
args << "--idAndKey";
args << sApp->getParserValue("clientIdAndKey"); // as typed in
return args;
@@ -672,7 +672,7 @@ namespace BlackCore
void CNetworkVatlib::replyToConfigQuery(const CCallsign &callsign)
{
QJsonObject config = getOwnAircraftParts().toJson();
QJsonObject config = this->getOwnAircraftParts().toJson();
config.insert("is_full_data", true);
QString data = QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact);
data = convertToUnicodeEscaped(data);
@@ -754,11 +754,11 @@ namespace BlackCore
// split parser values
const QString clientIdAndKey = sApp->getParserValue("clientIdAndKey").toLower();
if (clientIdAndKey.isEmpty() || !clientIdAndKey.contains(':')) { return false; }
const auto stringList = clientIdAndKey.split(':');
const QStringList stringList = clientIdAndKey.split(':');
const QString clientIdAsString = stringList[0];
bool ok = true;
id = clientIdAsString.toInt(&ok, 0);
if (!ok) { return false; }
id = clientIdAsString.toInt(&ok, 0); // base 0 means C convention
if (!ok || id == 0) { return false; }
key = stringList[1];
return true;
}