From a0e59546f0012cb74e646293e0199f1ba7f7f036 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Tue, 10 Jan 2017 23:37:49 +0000 Subject: [PATCH] fixed mistakes caught by clang --- src/blackcore/context/contextsimulatorimpl.h | 2 +- src/blackmisc/network/fsdsetup.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h index 90eff82a5..9594a9d9a 100644 --- a/src/blackcore/context/contextsimulatorimpl.h +++ b/src/blackcore/context/contextsimulatorimpl.h @@ -101,7 +101,7 @@ namespace BlackCore virtual BlackMisc::CStatusMessageList getMatchingMessages(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual bool isMatchingMessagesEnabled() const override; virtual void enableMatchingMessages(bool enabled) override; - BlackMisc::Simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const; + BlackMisc::Simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const override; //! @} //! \ingroup commandline diff --git a/src/blackmisc/network/fsdsetup.cpp b/src/blackmisc/network/fsdsetup.cpp index 1c1d1c8c6..e532c1b41 100644 --- a/src/blackmisc/network/fsdsetup.cpp +++ b/src/blackmisc/network/fsdsetup.cpp @@ -36,8 +36,7 @@ namespace BlackMisc { Q_UNUSED(i18n); static const QString s("Codec: '%1' details: '%2'"); - s.arg(this->getTextCodec(), CFsdSetup::sendReceiveDetailsToString(this->getSendReceiveDetails())); - return s; + return s.arg(this->getTextCodec(), CFsdSetup::sendReceiveDetailsToString(this->getSendReceiveDetails())); } QString CFsdSetup::sendReceiveDetailsToString(SendReceiveDetails details)