From 956ffd949d1a6076196dbe2b735d241559ab5617 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 22 Aug 2018 19:25:07 +0200
Subject: [PATCH] Style

---
 src/blackcore/airspacemonitor.cpp                      | 10 ++++++----
 src/blackcore/context/contextaudio.h                   |  2 +-
 src/blackcore/db/modeldatareader.cpp                   |  2 +-
 src/blackcore/vatsim/vatsimmetarreader.cpp             |  4 ++--
 .../components/dbaircrafticaoselectorcomponent.h       |  3 +--
 src/blackgui/components/dbmappingcomponentaware.h      |  2 --
 src/blackmisc/worker.h                                 |  2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp
index 571a743fa..a9e54c230 100644
--- a/src/blackcore/airspacemonitor.cpp
+++ b/src/blackcore/airspacemonitor.cpp
@@ -377,7 +377,7 @@ namespace BlackCore
     void CAirspaceMonitor::onCapabilitiesReplyReceived(const CCallsign &callsign, int clientCaps)
     {
         if (!this->isConnectedAndNotShuttingDown() || callsign.isEmpty()) { return; }
-        CClient::Capabilities caps = static_cast<CClient::Capabilities>(clientCaps);
+        const CClient::Capabilities caps = static_cast<CClient::Capabilities>(clientCaps);
         const CVoiceCapabilities voiceCaps = sApp->getWebDataServices()->getVoiceCapabilityForCallsign(callsign);
         CPropertyIndexVariantMap vm(CClient::IndexCapabilities, CVariant::from(clientCaps));
         vm.addValue({CClient::IndexVoiceCapabilities}, voiceCaps);
@@ -511,7 +511,7 @@ namespace BlackCore
         }
         else
         {
-            const CStatusMessage m = CMatchingUtils::logMessage(callsign, "Ignoring this aircraft, not found in range list, disconnected, or no callsign", CAirspaceMonitor::getLogCategories());
+            const CStatusMessage m = CMatchingUtils::logMessage(callsign, "Ignoring this aircraft, not found in range list, disconnected, or no callsign", CAirspaceMonitor::getLogCategories(), CStatusMessage::SeverityWarning);
             this->addReverseLookupMessage(callsign, m);
         }
     }
@@ -924,14 +924,16 @@ namespace BlackCore
         Q_UNUSED(oldStatus);
         switch (newStatus)
         {
-        case INetwork::Connected: break;
+        case INetwork::Connected:
+            break;
         case INetwork::Disconnected:
         case INetwork::DisconnectedError:
         case INetwork::DisconnectedLost:
         case INetwork::DisconnectedFailed:
             this->clear();
             break;
-        default: break;
+        default:
+            break;
         }
     }
 
diff --git a/src/blackcore/context/contextaudio.h b/src/blackcore/context/contextaudio.h
index cf8cd5e6a..3ad87f3d3 100644
--- a/src/blackcore/context/contextaudio.h
+++ b/src/blackcore/context/contextaudio.h
@@ -83,7 +83,7 @@ namespace BlackCore
             static IContextAudio *create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection);
 
             //! Destructor
-            virtual ~IContextAudio() {}
+            virtual ~IContextAudio() override {}
 
         signals:
             //! Voice rooms changed
diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp
index 8c4cd1f10..4ea2579dd 100644
--- a/src/blackcore/db/modeldatareader.cpp
+++ b/src/blackcore/db/modeldatareader.cpp
@@ -78,7 +78,7 @@ namespace BlackCore
 
         CLivery CModelDataReader::smartLiverySelector(const CLivery &liveryPattern) const
         {
-            const CLiveryList liveries(getLiveries()); // thread safe copy
+            const CLiveryList liveries(this->getLiveries()); // thread safe copy
             return liveries.smartLiverySelector(liveryPattern);
         }
 
diff --git a/src/blackcore/vatsim/vatsimmetarreader.cpp b/src/blackcore/vatsim/vatsimmetarreader.cpp
index 7f504d4fb..a3f72b337 100644
--- a/src/blackcore/vatsim/vatsimmetarreader.cpp
+++ b/src/blackcore/vatsim/vatsimmetarreader.cpp
@@ -127,8 +127,8 @@ namespace BlackCore
                     else { invalidLines++; }
                 }
 
-                CLogMessage(this).debug() << "METAR statistic: " << metars.size() << "Metars ( invalid:" << invalidLines << ")";
-
+                static const QString ms("METAR statistic: %1 Metars (invalid %2)");
+                CLogMessage(this).debug() << ms.arg(metars.size()).arg(invalidLines);
                 {
                     QWriteLocker l(&m_lock);
                     m_metars = metars;
diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.h b/src/blackgui/components/dbaircrafticaoselectorcomponent.h
index 936003e89..a39cabc7c 100644
--- a/src/blackgui/components/dbaircrafticaoselectorcomponent.h
+++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.h
@@ -27,7 +27,6 @@ class QDragEnterEvent;
 class QDragLeaveEvent;
 class QDragMoveEvent;
 class QDropEvent;
-class QWidget;
 
 namespace Ui { class CDbAircraftIcaoSelectorComponent; }
 namespace BlackGui
@@ -39,7 +38,7 @@ namespace BlackGui
          */
         class BLACKGUI_EXPORT CDbAircraftIcaoSelectorComponent :
             public QFrame,
-            public BlackGui::CDropBase
+            public CDropBase
         {
             Q_OBJECT
 
diff --git a/src/blackgui/components/dbmappingcomponentaware.h b/src/blackgui/components/dbmappingcomponentaware.h
index 67dd319a5..29300bb50 100644
--- a/src/blackgui/components/dbmappingcomponentaware.h
+++ b/src/blackgui/components/dbmappingcomponentaware.h
@@ -25,8 +25,6 @@ namespace BlackGui
         class BLACKGUI_EXPORT CDbMappingComponentAware
         {
         public:
-
-
             //! Set the corresponding component
             virtual void setMappingComponent(CDbMappingComponent *component);
 
diff --git a/src/blackmisc/worker.h b/src/blackmisc/worker.h
index 2f72f7a88..0b2ad7a10 100644
--- a/src/blackmisc/worker.h
+++ b/src/blackmisc/worker.h
@@ -76,7 +76,7 @@ namespace BlackMisc
         CRegularThread(QObject *parent = nullptr) : QThread(parent) {}
 
         //! Destructor
-        virtual ~CRegularThread();
+        virtual ~CRegularThread() override;
 
     protected:
         //! \copydoc QThread::run