From 3289e26459043ea86d05f5f4b71708f5ca5d9350 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 12 May 2019 22:36:50 +0200 Subject: [PATCH] Style --- src/blackcore/aircraftmatcher.h | 12 +++++++++--- src/blackgui/components/modelmatcherlogcomponent.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/blackcore/aircraftmatcher.h b/src/blackcore/aircraftmatcher.h index 742c62e5f..f01ca5f81 100644 --- a/src/blackcore/aircraftmatcher.h +++ b/src/blackcore/aircraftmatcher.h @@ -58,6 +58,12 @@ namespace BlackCore //! \remark saves a log of removed models if any virtual ~CAircraftMatcher() override; + //! Copy constructor + CAircraftMatcher(const CAircraftMatcher &) = delete; + + //! Copy assignment operator + CAircraftMatcher &operator =(const CAircraftMatcher &) = delete; + //! Set the setup bool setSetup(const BlackMisc::Simulation::CAircraftMatcherSetup &setup); @@ -114,7 +120,7 @@ namespace BlackCore //! \ingroup reverselookup static BlackMisc::Aviation::CAircraftIcaoCode reverseLookupAircraftIcao( const BlackMisc::Aviation::CAircraftIcaoCode &icaoDesignator, - const BlackMisc::Aviation::CCallsign &logCallsign = BlackMisc::Aviation::CCallsign(), + const BlackMisc::Aviation::CCallsign &logCallsign = {}, BlackMisc::CStatusMessageList *log = nullptr); //! Lookup of ICAO by id @@ -127,7 +133,7 @@ namespace BlackCore //! \ingroup reverselookup static BlackMisc::Aviation::CAirlineIcaoCode reverseLookupAirlineIcao( const BlackMisc::Aviation::CAirlineIcaoCode &icaoPattern, - const BlackMisc::Aviation::CCallsign &callsign = BlackMisc::Aviation::CCallsign(), BlackMisc::CStatusMessageList *log = nullptr); + const BlackMisc::Aviation::CCallsign &callsign = {}, BlackMisc::CStatusMessageList *log = nullptr); //! Lookup of standard livery //! \threadsafe @@ -208,7 +214,7 @@ namespace BlackCore void setDefaultModel(const BlackMisc::Simulation::CAircraftModel &defaultModel); //! The current statistics - BlackMisc::Simulation::CMatchingStatistics getCurrentStatistics() const { return m_statistics; } + const BlackMisc::Simulation::CMatchingStatistics &getCurrentStatistics() const { return m_statistics; } //! Clear the statistics void clearMatchingStatistics() { m_statistics.clear(); } diff --git a/src/blackgui/components/modelmatcherlogcomponent.h b/src/blackgui/components/modelmatcherlogcomponent.h index 7e5ba743e..8d2f3ef83 100644 --- a/src/blackgui/components/modelmatcherlogcomponent.h +++ b/src/blackgui/components/modelmatcherlogcomponent.h @@ -33,7 +33,7 @@ namespace BlackGui explicit CModelMatcherLogComponent(QWidget *parent = nullptr); //! Constructor - virtual ~CModelMatcherLogComponent(); + virtual ~CModelMatcherLogComponent() override; private: QScopedPointer ui;