From b671c2a0a5427ccc960a3dd5f923fdfaef22805f Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 4 Aug 2018 23:39:32 +0200
Subject: [PATCH] Style, removed redundant CForm overrides

---
 src/blackcore/context/contextnetwork.h             |  2 +-
 src/blackcore/context/contextsimulator.h           |  2 +-
 src/blackcore/simulator.h                          |  2 +-
 src/blackcore/vatsim/vatsimdatafilereader.cpp      |  2 +-
 src/blackgui/editors/aircraftmodelform.h           |  3 +--
 src/blackgui/editors/airlineicaoform.h             |  2 +-
 src/blackgui/editors/cockpitcomform.h              |  2 +-
 src/blackgui/editors/coordinateform.cpp            |  7 +------
 src/blackgui/editors/coordinateform.h              |  3 +--
 src/blackgui/editors/distributorform.h             |  3 +--
 src/blackgui/editors/liveryform.h                  |  2 +-
 src/blackgui/editors/modelmappingform.h            |  4 +---
 src/blackgui/editors/modelmappingmodifyform.h      |  3 +--
 src/blackmisc/loghandler.cpp                       |  2 +-
 src/blackmisc/loghandler.h                         |  2 +-
 src/blackmisc/provider.h                           |  6 ++++++
 src/blackmisc/simulation/remoteaircraftprovider.h  |  3 +++
 .../simulation/settings/modelsettings.cpp          | 14 ++++----------
 src/blackmisc/worker.cpp                           |  2 +-
 19 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h
index 4cf8355b6..94f040136 100644
--- a/src/blackcore/context/contextnetwork.h
+++ b/src/blackcore/context/contextnetwork.h
@@ -97,7 +97,7 @@ namespace BlackCore
             static IContextNetwork *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection);
 
             //! Destructor
-            virtual ~IContextNetwork() {}
+            virtual ~IContextNetwork() override {}
 
         signals:
             //! An aircraft disappeared
diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h
index 93676ece0..e7c1b0201 100644
--- a/src/blackcore/context/contextsimulator.h
+++ b/src/blackcore/context/contextsimulator.h
@@ -80,7 +80,7 @@ namespace BlackCore
             static IContextSimulator *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection);
 
             //! Destructor
-            virtual ~IContextSimulator() {}
+            virtual ~IContextSimulator() override {}
 
         signals:
             //! Simulator combined status
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index 0e21ca04c..160a919bf 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -87,7 +87,7 @@ namespace BlackCore
         const int MaxAircraftInfinite = 100;
 
         //! Destructor
-        virtual ~ISimulator();
+        virtual ~ISimulator() override;
 
         //! Combined status
         virtual SimulatorStatus getSimulatorStatus() const;
diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp
index 995551bbf..4112e0f7f 100644
--- a/src/blackcore/vatsim/vatsimdatafilereader.cpp
+++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp
@@ -424,7 +424,7 @@ namespace BlackCore
             else
             {
                 // network error
-                CLogMessage(this).warning("Reading VATSIM data file failed %1 %2") << nwReply->errorString() << nwReply->url().toString();
+                CLogMessage(this).warning("Reading VATSIM data file failed '%1' '%2'") << nwReply->errorString() << nwReply->url().toString();
                 nwReply->abort();
                 emit this->dataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFailed, 0);
             }
diff --git a/src/blackgui/editors/aircraftmodelform.h b/src/blackgui/editors/aircraftmodelform.h
index 1027c3565..d3c9c55f9 100644
--- a/src/blackgui/editors/aircraftmodelform.h
+++ b/src/blackgui/editors/aircraftmodelform.h
@@ -13,7 +13,6 @@
 #define BLACKGUI_EDITORS_AIRCRAFTMODELFORM_H
 
 #include "form.h"
-#include <QFrame>
 
 namespace Ui { class CAircraftModelForm; }
 namespace BlackGui
@@ -32,7 +31,7 @@ namespace BlackGui
             explicit CAircraftModelForm(QWidget *parent = nullptr);
 
             //! Destructor
-            ~CAircraftModelForm();
+            virtual ~CAircraftModelForm() override;
 
             //! Allow to drop data
             void allowDrop(bool allowDrop);
diff --git a/src/blackgui/editors/airlineicaoform.h b/src/blackgui/editors/airlineicaoform.h
index 85139b446..d342753ad 100644
--- a/src/blackgui/editors/airlineicaoform.h
+++ b/src/blackgui/editors/airlineicaoform.h
@@ -39,7 +39,7 @@ namespace BlackGui
             explicit CAirlineIcaoForm(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CAirlineIcaoForm();
+            virtual ~CAirlineIcaoForm() override;
 
             //! Set value
             void setValue(const BlackMisc::Aviation::CAirlineIcaoCode &icao = BlackMisc::Aviation::CAirlineIcaoCode());
diff --git a/src/blackgui/editors/cockpitcomform.h b/src/blackgui/editors/cockpitcomform.h
index 6beba3d69..62c3e9448 100644
--- a/src/blackgui/editors/cockpitcomform.h
+++ b/src/blackgui/editors/cockpitcomform.h
@@ -37,7 +37,7 @@ namespace BlackGui
             explicit CCockpitComForm(QWidget *parent = nullptr);
 
             //! Destrutor
-            virtual ~CCockpitComForm();
+            virtual ~CCockpitComForm() override;
 
             //! COM frequencies displayed
             void setFrequencies(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2);
diff --git a/src/blackgui/editors/coordinateform.cpp b/src/blackgui/editors/coordinateform.cpp
index aa9d692af..05535b415 100644
--- a/src/blackgui/editors/coordinateform.cpp
+++ b/src/blackgui/editors/coordinateform.cpp
@@ -141,12 +141,7 @@ namespace BlackGui
             this->forceStyleSheetUpdate();
         }
 
-        void CCoordinateForm::setSelectOnly()
-        {
-            this->setReadOnly(true);
-        }
-
-        BlackMisc::CStatusMessageList CCoordinateForm::validate(bool nested) const
+        CStatusMessageList CCoordinateForm::validate(bool nested) const
         {
             Q_UNUSED(nested);
             CStatusMessageList ml;
diff --git a/src/blackgui/editors/coordinateform.h b/src/blackgui/editors/coordinateform.h
index 8b2b9fca6..41b740e49 100644
--- a/src/blackgui/editors/coordinateform.h
+++ b/src/blackgui/editors/coordinateform.h
@@ -36,7 +36,7 @@ namespace BlackGui
             explicit CCoordinateForm(QWidget *parent = nullptr);
 
             //! Dtor
-            virtual ~CCoordinateForm();
+            virtual ~CCoordinateForm() override;
 
             //! Get the coordinate
             BlackMisc::Geo::CCoordinateGeodetic getCoordinate() const { return m_coordinate; }
@@ -47,7 +47,6 @@ namespace BlackGui
             //! \name Form class implementations
             //! @{
             virtual void setReadOnly(bool readonly) override;
-            virtual void setSelectOnly() override;
             virtual BlackMisc::CStatusMessageList validate(bool nested = false) const override;
             //! @}
 
diff --git a/src/blackgui/editors/distributorform.h b/src/blackgui/editors/distributorform.h
index d7a1f3807..2ecf7c684 100644
--- a/src/blackgui/editors/distributorform.h
+++ b/src/blackgui/editors/distributorform.h
@@ -38,7 +38,7 @@ namespace BlackGui
             explicit CDistributorForm(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CDistributorForm();
+            virtual ~CDistributorForm() override;
 
             //! Get value
             BlackMisc::Simulation::CDistributor getValue() const;
@@ -75,7 +75,6 @@ namespace BlackGui
 
             QScopedPointer<Ui::CDistributorForm> ui;
             BlackMisc::Simulation::CDistributor m_currentDistributor;
-            bool m_readOnly = false;
         };
     } // ns
 } //ns
diff --git a/src/blackgui/editors/liveryform.h b/src/blackgui/editors/liveryform.h
index 62fb6a37b..39ecd80b2 100644
--- a/src/blackgui/editors/liveryform.h
+++ b/src/blackgui/editors/liveryform.h
@@ -42,7 +42,7 @@ namespace BlackGui
             explicit CLiveryForm(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CLiveryForm();
+            virtual ~CLiveryForm() override;
 
             //! Value
             BlackMisc::Aviation::CLivery getValue() const;
diff --git a/src/blackgui/editors/modelmappingform.h b/src/blackgui/editors/modelmappingform.h
index 3b5c10d90..60a614eb2 100644
--- a/src/blackgui/editors/modelmappingform.h
+++ b/src/blackgui/editors/modelmappingform.h
@@ -20,8 +20,6 @@
 #include <QObject>
 #include <QScopedPointer>
 
-class QWidget;
-
 namespace Ui { class CModelMappingForm; }
 namespace BlackGui
 {
@@ -39,7 +37,7 @@ namespace BlackGui
             explicit CModelMappingForm(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CModelMappingForm();
+            virtual ~CModelMappingForm() override;
 
             //! Value
             BlackMisc::Simulation::CAircraftModel getValue() const;
diff --git a/src/blackgui/editors/modelmappingmodifyform.h b/src/blackgui/editors/modelmappingmodifyform.h
index 719e10291..87a17f516 100644
--- a/src/blackgui/editors/modelmappingmodifyform.h
+++ b/src/blackgui/editors/modelmappingmodifyform.h
@@ -20,7 +20,6 @@
 #include <QScopedPointer>
 
 class QCheckBox;
-class QWidget;
 
 namespace Ui { class CModelMappingModifyForm; }
 namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
@@ -40,7 +39,7 @@ namespace BlackGui
             explicit CModelMappingModifyForm(QWidget *parent = nullptr);
 
             //! Destructor
-            virtual ~CModelMappingModifyForm();
+            virtual ~CModelMappingModifyForm() override;
 
             //! Get the values
             BlackMisc::CPropertyIndexVariantMap getValues() const;
diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp
index cfe8ffff5..f7ba37dc7 100644
--- a/src/blackmisc/loghandler.cpp
+++ b/src/blackmisc/loghandler.cpp
@@ -25,7 +25,7 @@
 #include <tuple>
 
 #ifdef Q_OS_WIN
-#include <windows.h>
+#include <Windows.h>
 #endif
 
 namespace BlackMisc
diff --git a/src/blackmisc/loghandler.h b/src/blackmisc/loghandler.h
index 99d6a1274..21172cb34 100644
--- a/src/blackmisc/loghandler.h
+++ b/src/blackmisc/loghandler.h
@@ -47,7 +47,7 @@ namespace BlackMisc
         CLogHandler();
 
         //! \private Destructor.
-        ~CLogHandler();
+        virtual ~CLogHandler();
 
         //! Return pointer to the CLogHandler singleton.
         //! \warning This can not be called from within a plugin, because the returned instance will be wrong.
diff --git a/src/blackmisc/provider.h b/src/blackmisc/provider.h
index 9b97be78b..ec25cce43 100644
--- a/src/blackmisc/provider.h
+++ b/src/blackmisc/provider.h
@@ -23,6 +23,9 @@ namespace BlackMisc
     class IProvider
     {
     public:
+        //! Dtor
+        virtual ~IProvider() {}
+
         //! Return as QObject
         virtual QObject *asQObject() { return nullptr; }
     };
@@ -34,6 +37,9 @@ namespace BlackMisc
         //! Ctor
         IProviderAware(PROVIDER *provider = nullptr) { this->setProvider(provider); }
 
+        //! Dtor
+        virtual ~IProviderAware() {}
+
         //! Has provider?
         bool hasProvider() const { return m_provider; }
 
diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h
index c16e717c4..27392c410 100644
--- a/src/blackmisc/simulation/remoteaircraftprovider.h
+++ b/src/blackmisc/simulation/remoteaircraftprovider.h
@@ -448,6 +448,9 @@ namespace BlackMisc
         class BLACKMISC_EXPORT CRemoteAircraftAware : public IProviderAware<IRemoteAircraftProvider>
         {
         public:
+            //! Destructor
+            virtual ~CRemoteAircraftAware() {}
+
             //! \copydoc IRemoteAircraftProvider::getAircraftInRange
             CSimulatedAircraftList getAircraftInRange() const;
 
diff --git a/src/blackmisc/simulation/settings/modelsettings.cpp b/src/blackmisc/simulation/settings/modelsettings.cpp
index 438bdef24..8bca5ec6c 100644
--- a/src/blackmisc/simulation/settings/modelsettings.cpp
+++ b/src/blackmisc/simulation/settings/modelsettings.cpp
@@ -32,10 +32,8 @@ namespace BlackMisc
                 const ColumnIndex i = index.frontCasted<ColumnIndex>();
                 switch (i)
                 {
-                case IndexAllowExclude:
-                    return CVariant::fromValue(this->m_allowExcludeModels);
-                default:
-                    return CValueObject::propertyByIndex(index);
+                case IndexAllowExclude: return CVariant::fromValue(this->m_allowExcludeModels);
+                default: return CValueObject::propertyByIndex(index);
                 }
             }
 
@@ -45,12 +43,8 @@ namespace BlackMisc
                 const ColumnIndex i = index.frontCasted<ColumnIndex>();
                 switch (i)
                 {
-                case IndexAllowExclude:
-                    this->setAllowExcludedModels(variant.toBool());
-                    break;
-                default:
-                    CValueObject::setPropertyByIndex(index, variant);
-                    break;
+                case IndexAllowExclude: this->setAllowExcludedModels(variant.toBool()); break;
+                default: CValueObject::setPropertyByIndex(index, variant); break;
                 }
             }
         } // ns
diff --git a/src/blackmisc/worker.cpp b/src/blackmisc/worker.cpp
index 9356c45e8..0caf4cf83 100644
--- a/src/blackmisc/worker.cpp
+++ b/src/blackmisc/worker.cpp
@@ -15,7 +15,7 @@
 #include <QPointer>
 
 #ifdef Q_OS_WIN32
-#include <windows.h>
+#include <Windows.h>
 #endif
 
 namespace BlackMisc