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

Ref T189, no need to init const values over and over again

Browse Source
This commit is contained in:
Klaus Basan
2017-11-11 23:43:24 +01:00
parent 48adb52082
commit b08e281f85
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -770,16 +770,16 @@ namespace BlackCore
void CNetworkVatlib::broadcastAircraftConfig(const QJsonObject &config) void CNetworkVatlib::broadcastAircraftConfig(const QJsonObject &config)
{ {
QString data = QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact); static const QString dataStr = convertToUnicodeEscaped(QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact));
data = convertToUnicodeEscaped(data); static const QByteArray data(toFSD(dataStr));
Vat_SendAircraftConfigBroadcast(m_net.data(), toFSD(data)); Vat_SendAircraftConfigBroadcast(m_net.data(), data);
} }
void CNetworkVatlib::sendAircraftConfigQuery(const CCallsign &callsign) void CNetworkVatlib::sendAircraftConfigQuery(const CCallsign &callsign)
{ {
const QJsonDocument doc(JsonPackets::aircraftConfigRequest()); static const QString dataStr { QJsonDocument(JsonPackets::aircraftConfigRequest()).toJson(QJsonDocument::Compact) };
const QString data { doc.toJson(QJsonDocument::Compact) }; static const QByteArray data(toFSD(dataStr));
Vat_SendAircraftConfig(m_net.data(), toFSD(callsign), toFSD(data)); Vat_SendAircraftConfig(m_net.data(), toFSD(callsign), data);
} }
/********************************** * * * * * * * * * * * * * * * * * * * ************************************/ /********************************** * * * * * * * * * * * * * * * * * * * ************************************/
@@ -1163,9 +1163,10 @@ namespace BlackCore
CLogMessage(static_cast<CNetworkVatlib *>(nullptr)).error(message); CLogMessage(static_cast<CNetworkVatlib *>(nullptr)).error(message);
} }
QJsonObject CNetworkVatlib::JsonPackets::aircraftConfigRequest() const QJsonObject &CNetworkVatlib::JsonPackets::aircraftConfigRequest()
{ {
return { { "request", "full" } }; static const QJsonObject jsonObject{ { "request", "full" } };
return jsonObject;
} }
} // namespace } // namespace
} // namespace } // namespace

7
src/blackcore/vatsim/networkvatlib.h
View File

@@ -179,14 +179,15 @@ namespace BlackCore
static void networkLogHandler(SeverityLevel severity, const char *message); static void networkLogHandler(SeverityLevel severity, const char *message);
void sendCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data); void sendCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data);
inline QString defaultModelString() static const QString &defaultModelString()
{ {
return QStringLiteral("Cessna Skyhawk 172SP"); static const QString dm("Cessna Skyhawk 172SP");
return dm;
} }
struct JsonPackets struct JsonPackets
{ {
static QJsonObject aircraftConfigRequest(); static const QJsonObject &aircraftConfigRequest();
}; };
void process(); void process();