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

refs #420, MS review

Browse Source 
Fixes as described here https://dev.vatsim-germany.org/issues/420#note-5
This commit is contained in:
Klaus Basan
2015-05-22 01:20:39 +02:00
parent 549125ce03
commit 2d20f5bf9c
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/cli_client/client.cpp
View File

@@ -160,13 +160,13 @@ void Client::presetCallsignCmd(QTextStream &args)
void Client::presetIcaoCodesCmd(QTextStream &args) void Client::presetIcaoCodesCmd(QTextStream &args)
{ {
QString acTypeICAO; QString acTypeICAO;
QString descriptionICAO; //! \todo Is this the combined type ("L2J")? QString combinedIcaoType; // e.g. "L2J"
QString airlineICAO; QString airlineICAO;
QString livery; QString livery;
QString color; QString color;
args >> acTypeICAO >> descriptionICAO >> airlineICAO >> livery >> color; args >> acTypeICAO >> combinedIcaoType >> airlineICAO >> livery >> color;
BlackMisc::Aviation::CAircraftIcaoData icaoData( BlackMisc::Aviation::CAircraftIcaoData icaoData(
CAircraftIcaoCode(acTypeICAO, descriptionICAO), CAircraftIcaoCode(acTypeICAO, combinedIcaoType),
CAirlineIcaoCode(airlineICAO), CAirlineIcaoCode(airlineICAO),
color); color);
icaoData.setLivery(livery); icaoData.setLivery(livery);

2
src/blackcore/simulator_common.cpp
View File

@@ -209,7 +209,7 @@ namespace BlackCore
this->disconnectFrom(); // disconnect from simulator this->disconnectFrom(); // disconnect from simulator
// disconnect as many signals as possible // disconnect as many signals as possible
for (QMetaObject::Connection &c : m_remoteAircraftProviderConnections) for (const QMetaObject::Connection &c : m_remoteAircraftProviderConnections)
{ {
QObject::disconnect(c); QObject::disconnect(c);
} }

14
tests/blackcore/testnetwork.cpp
View File

@@ -1,7 +1,11 @@
/* Copyright (C) 2013 VATSIM Community / contributors /* Copyright (C) 2015
* This Source Code Form is subject to the terms of the Mozilla Public * swift project Community / Contributors
* 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/. */ * 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 "testnetwork.h"
#include "expect.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::presetServer, CServer("", "", "vatsim-germany.org", 6809, CUser("1234567", "", "", "123456")))
.send(&INetwork::presetCallsign, "SWIFT") .send(&INetwork::presetCallsign, "SWIFT")
.send(&INetwork::presetIcaoCodes, CAircraftIcaoData( .send(&INetwork::presetIcaoCodes, CAircraftIcaoData(
CAircraftIcaoCode("C172", "P1L"), CAircraftIcaoCode("C172", "L1P"),
CAirlineIcaoCode("YYY"), "white")) CAirlineIcaoCode("YYY"), "white"))
.send(&INetwork::initiateConnection) .send(&INetwork::initiateConnection)
.expect(&INetwork::connectionStatusChanged, [](INetwork::ConnectionStatus, INetwork::ConnectionStatus newStatus) .expect(&INetwork::connectionStatusChanged, [](INetwork::ConnectionStatus, INetwork::ConnectionStatus newStatus)