From 2d20f5bf9cae9b6031a0321a6b54753ae754328d Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 22 May 2015 01:20:39 +0200
Subject: [PATCH] refs #420, MS review Fixes as described here
 https://dev.vatsim-germany.org/issues/420#note-5

---
 samples/cli_client/client.cpp      |  6 +++---
 src/blackcore/simulator_common.cpp |  2 +-
 tests/blackcore/testnetwork.cpp    | 14 +++++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/samples/cli_client/client.cpp b/samples/cli_client/client.cpp
index 640764aea..4d584ee67 100644
--- a/samples/cli_client/client.cpp
+++ b/samples/cli_client/client.cpp
@@ -160,13 +160,13 @@ void Client::presetCallsignCmd(QTextStream &args)
 void Client::presetIcaoCodesCmd(QTextStream &args)
 {
     QString acTypeICAO;
-    QString descriptionICAO; //! \todo Is this the combined type ("L2J")?
+    QString combinedIcaoType; // e.g. "L2J"
     QString airlineICAO;
     QString livery;
     QString color;
-    args >> acTypeICAO >> descriptionICAO >> airlineICAO >> livery >> color;
+    args >> acTypeICAO >> combinedIcaoType >> airlineICAO >> livery >> color;
     BlackMisc::Aviation::CAircraftIcaoData icaoData(
-        CAircraftIcaoCode(acTypeICAO, descriptionICAO),
+        CAircraftIcaoCode(acTypeICAO, combinedIcaoType),
         CAirlineIcaoCode(airlineICAO),
         color);
     icaoData.setLivery(livery);
diff --git a/src/blackcore/simulator_common.cpp b/src/blackcore/simulator_common.cpp
index 71155fb53..4571dfa9a 100644
--- a/src/blackcore/simulator_common.cpp
+++ b/src/blackcore/simulator_common.cpp
@@ -209,7 +209,7 @@ namespace BlackCore
         this->disconnectFrom(); // disconnect from simulator
 
         // disconnect as many signals as possible
-        for (QMetaObject::Connection &c : m_remoteAircraftProviderConnections)
+        for (const QMetaObject::Connection &c : m_remoteAircraftProviderConnections)
         {
             QObject::disconnect(c);
         }
diff --git a/tests/blackcore/testnetwork.cpp b/tests/blackcore/testnetwork.cpp
index ea51adf77..85e6022a8 100644
--- a/tests/blackcore/testnetwork.cpp
+++ b/tests/blackcore/testnetwork.cpp
@@ -1,7 +1,11 @@
-/*  Copyright (C) 2013 VATSIM Community / contributors
- *  This Source Code Form is subject to the terms of the Mozilla Public
- *  License, v. 2.0. If a copy of the MPL was not distributed with this
- *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* Copyright (C) 2015
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
 
 #include "testnetwork.h"
 #include "expect.h"
@@ -24,7 +28,7 @@ void BlackCoreTest::CTestNetwork::networkTest(BlackCore::INetwork *net)
     .send(&INetwork::presetServer, CServer("", "", "vatsim-germany.org", 6809, CUser("1234567", "", "", "123456")))
     .send(&INetwork::presetCallsign, "SWIFT")
     .send(&INetwork::presetIcaoCodes, CAircraftIcaoData(
-              CAircraftIcaoCode("C172", "P1L"),
+              CAircraftIcaoCode("C172", "L1P"),
               CAirlineIcaoCode("YYY"), "white"))
     .send(&INetwork::initiateConnection)
     .expect(&INetwork::connectionStatusChanged, [](INetwork::ConnectionStatus, INetwork::ConnectionStatus newStatus)