From ff2ab95367f4ebbc003ac73d697cdd74dbe8f4ef Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 11 Nov 2019 18:41:45 +0100 Subject: [PATCH] Style --- samples/fsd/main.cpp | 3 --- src/blackcore/airspacemonitor.cpp | 14 +++----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/samples/fsd/main.cpp b/samples/fsd/main.cpp index ab16971d5..16de8117c 100644 --- a/samples/fsd/main.cpp +++ b/samples/fsd/main.cpp @@ -25,9 +25,6 @@ using namespace BlackCore::Fsd; int main(int argc, char *argv[]) { QCoreApplication qa(argc, argv); - - - COwnAircraftProviderDummy::instance()->updateOwnCallsign("BER368"); CFSDClient client(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(), CRemoteAircraftProviderDummy::instance(), &qa); diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 1054c5a44..410bc987c 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -313,14 +313,6 @@ namespace BlackCore { m_queryPilot.enqueue(aircraft.getCallsign()); } - - /** - m_network->sendFrequencyQuery(cs); - if (!aircraft.hasAircraftDesignator()) - { - m_network->sendIcaoCodesQuery(cs); - } - **/ } } @@ -951,8 +943,8 @@ namespace BlackCore if (!airlineIcao.isLoadedFromDb()) { if (!airlineIcao.hasValidDesignator()) { airlineIcao.setDesignator(airlineIcaoString.isEmpty() ? callsign.getAirlinePrefix() : airlineIcaoString); } - if (!airlineNameLookup.isEmpty()) { airlineIcao.setName(airlineNameLookup); } - if (!telephonyLookup.isEmpty()) { airlineIcao.setTelephonyDesignator(telephonyLookup); } + if (!airlineNameLookup.isEmpty()) { airlineIcao.setName(airlineNameLookup); } + if (!telephonyLookup.isEmpty()) { airlineIcao.setTelephonyDesignator(telephonyLookup); } // already try to resolve at this stage by a smart lookup with all the filled data from above airlineIcao = CAircraftMatcher::reverseLookupAirlineIcao(airlineIcao, callsign, log); @@ -1347,7 +1339,7 @@ namespace BlackCore } } - Q_UNUSED(haveRequestedElevation); + Q_UNUSED(haveRequestedElevation) return correctedSituation; }