From b08e281f85796e84f334fa913b937ab5e0149745 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 11 Nov 2017 23:43:24 +0100
Subject: [PATCH] Ref T189, no need to init const values over and over again

---
 src/blackcore/vatsim/networkvatlib.cpp | 17 +++++++++--------
 src/blackcore/vatsim/networkvatlib.h   |  7 ++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp
index 7ec91003b..f091ddf77 100644
--- a/src/blackcore/vatsim/networkvatlib.cpp
+++ b/src/blackcore/vatsim/networkvatlib.cpp
@@ -770,16 +770,16 @@ namespace BlackCore
 
         void CNetworkVatlib::broadcastAircraftConfig(const QJsonObject &config)
         {
-            QString data = QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact);
-            data = convertToUnicodeEscaped(data);
-            Vat_SendAircraftConfigBroadcast(m_net.data(), toFSD(data));
+            static const QString dataStr = convertToUnicodeEscaped(QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact));
+            static const QByteArray data(toFSD(dataStr));
+            Vat_SendAircraftConfigBroadcast(m_net.data(), data);
         }
 
         void CNetworkVatlib::sendAircraftConfigQuery(const CCallsign &callsign)
         {
-            const QJsonDocument doc(JsonPackets::aircraftConfigRequest());
-            const QString data { doc.toJson(QJsonDocument::Compact) };
-            Vat_SendAircraftConfig(m_net.data(), toFSD(callsign), toFSD(data));
+            static const QString dataStr { QJsonDocument(JsonPackets::aircraftConfigRequest()).toJson(QJsonDocument::Compact) };
+            static const QByteArray data(toFSD(dataStr));
+            Vat_SendAircraftConfig(m_net.data(), toFSD(callsign), data);
         }
 
         /********************************** * * * * * * * * * * * * * * * * * * * ************************************/
@@ -1163,9 +1163,10 @@ namespace BlackCore
             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
diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h
index 90765d9c8..e13c95b34 100644
--- a/src/blackcore/vatsim/networkvatlib.h
+++ b/src/blackcore/vatsim/networkvatlib.h
@@ -179,14 +179,15 @@ namespace BlackCore
             static void networkLogHandler(SeverityLevel severity, const char *message);
             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
             {
-                static QJsonObject aircraftConfigRequest();
+                static const QJsonObject &aircraftConfigRequest();
             };
 
             void process();