From 315df4bceb30d7baae859da5864ff5d774d87509 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 5 Jun 2022 10:03:48 +0200 Subject: [PATCH] Remove unused method parameters --- src/blackmisc/aviation/airportlist.cpp | 10 +++++----- src/blackmisc/aviation/airportlist.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackmisc/aviation/airportlist.cpp b/src/blackmisc/aviation/airportlist.cpp index a174b4e0b..860514dd2 100644 --- a/src/blackmisc/aviation/airportlist.cpp +++ b/src/blackmisc/aviation/airportlist.cpp @@ -52,14 +52,14 @@ namespace BlackMisc::Aviation } } - CAirport CAirportList::findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound) const + CAirport CAirportList::findFirstByIcao(const CAirportIcaoCode &icao) const { - return this->findFirstByOrDefault(&CAirport::getIcao, icao, ifNotFound); + return this->findFirstByOrDefault(&CAirport::getIcao, icao, CAirport()); } - CAirport CAirportList::findFirstByNameOrLocation(const QString &nameOrLocation, const CAirport &ifNotFound) const + CAirport CAirportList::findFirstByNameOrLocation(const QString &nameOrLocation) const { - if (this->isEmpty() || nameOrLocation.isEmpty()) { return ifNotFound; } + if (this->isEmpty() || nameOrLocation.isEmpty()) { return CAirport(); } CAirportList airports = this->findBy([&](const CAirport & airport) { return airport.matchesDescriptiveName(nameOrLocation); @@ -71,7 +71,7 @@ namespace BlackMisc::Aviation return airport.matchesLocation(nameOrLocation); }); if (!airports.isEmpty()) { return airports.frontOrDefault(); } - return ifNotFound; + return CAirport(); } QStringList CAirportList::allIcaoCodes(bool sorted) const diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h index 33b27f7f9..16ec30860 100644 --- a/src/blackmisc/aviation/airportlist.h +++ b/src/blackmisc/aviation/airportlist.h @@ -45,11 +45,11 @@ namespace BlackMisc::Aviation //! Find 0..n airports by ICAO code CAirportList findByIcao(const CAirportIcaoCode &icao) const; - //! Find first station by callsign, if not return given value / default - CAirport findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound = CAirport()) const; + //! Find first station by callsign, if not return default + CAirport findFirstByIcao(const CAirportIcaoCode &icao) const; - //! Find first by name or location, if not return given value / default - CAirport findFirstByNameOrLocation(const QString &nameOrLocation, const CAirport &ifNotFound = CAirport()) const; + //! Find first by name or location, if not return default + CAirport findFirstByNameOrLocation(const QString &nameOrLocation) const; //! Containing an airport with given ICAO code? bool containsAirportWithIcaoCode(const CAirportIcaoCode &icao) const;