diff --git a/src/blackmisc/audiodevice.h b/src/blackmisc/audiodevice.h
index 7cfe365aa..78673029d 100644
--- a/src/blackmisc/audiodevice.h
+++ b/src/blackmisc/audiodevice.h
@@ -28,7 +28,6 @@ namespace BlackMisc
         class CAudioDevice : public BlackMisc::CValueObject
         {
         public:
-
             //! Type
             enum DeviceType : uint
             {
@@ -141,9 +140,8 @@ namespace BlackMisc
             //! We use a DBus based system. Hence an audio device can reside on a differen computers, this here is its name
             QString m_hostName;
         };
-
-    } // Audio
-} // BlackMisc
+    } // namespace
+} // namespace
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Audio::CAudioDevice, (o.m_type, o.m_deviceIndex, o.m_deviceName, o.m_hostName))
 Q_DECLARE_METATYPE(BlackMisc::Audio::CAudioDevice)
diff --git a/src/blackmisc/avaircraft.h b/src/blackmisc/avaircraft.h
index f9619635b..3cb568d24 100644
--- a/src/blackmisc/avaircraft.h
+++ b/src/blackmisc/avaircraft.h
@@ -272,7 +272,6 @@ namespace BlackMisc
             BlackMisc::Aviation::CTransponder m_transponder;
             CAircraftIcao m_icao;
             BlackMisc::PhysicalQuantities::CLength m_distanceToPlane;
-
         };
     } // namespace
 } // namespace
diff --git a/src/blackmisc/avaircrafticao.h b/src/blackmisc/avaircrafticao.h
index dcd3ac125..04e511f81 100644
--- a/src/blackmisc/avaircrafticao.h
+++ b/src/blackmisc/avaircrafticao.h
@@ -25,7 +25,6 @@ namespace BlackMisc
         class CAircraftIcao : public BlackMisc::CValueObject
         {
         public:
-
             //! Properties by index
             enum ColumnIndex
             {
@@ -37,7 +36,7 @@ namespace BlackMisc
             };
 
             //! Default constructor.
-            CAircraftIcao() {}
+            CAircraftIcao() = default;
 
             //! Constructor.
             explicit CAircraftIcao(const QString &icao) : m_aircraftDesignator(icao.trimmed().toUpper()) {}
diff --git a/src/blackmisc/avaircraftsituation.h b/src/blackmisc/avaircraftsituation.h
index 9cc667a62..4b3210e03 100644
--- a/src/blackmisc/avaircraftsituation.h
+++ b/src/blackmisc/avaircraftsituation.h
@@ -29,7 +29,6 @@ namespace BlackMisc
         class CAircraftSituation : public BlackMisc::CValueObject, public BlackMisc::Geo::ICoordinateGeodetic
         {
         public:
-
             //! Properties by index
             enum ColumnIndex
             {
@@ -160,7 +159,6 @@ namespace BlackMisc
             BlackMisc::PhysicalQuantities::CAngle m_bank;
             BlackMisc::PhysicalQuantities::CSpeed m_groundspeed;
             QDateTime m_timestamp;
-
         };
     } // namespace
 } // namespace
diff --git a/src/blackmisc/avaircraftsituationlist.h b/src/blackmisc/avaircraftsituationlist.h
index 61c9d9943..cd504965d 100644
--- a/src/blackmisc/avaircraftsituationlist.h
+++ b/src/blackmisc/avaircraftsituationlist.h
@@ -27,21 +27,16 @@ namespace BlackMisc
 
             /*!
              * Get a list of situations before dateTime
-             * \param dateTime
-             * \return
              */
             CAircraftSituationList findBefore (const QDateTime& dateTime) const;
 
             /*!
              * Get a list of situations after dateTime
-             * \param dateTime
-             * \return
              */
             CAircraftSituationList findAfter (const QDateTime& dateTime) const;
 
             /*!
              * Remove situations with timestamp before dateTime
-             * \param dateTime
              */
             void removeBefore(const QDateTime& dateTime);
 
diff --git a/src/blackmisc/avairport.cpp b/src/blackmisc/avairport.cpp
index 90d43ef45..14051292e 100644
--- a/src/blackmisc/avairport.cpp
+++ b/src/blackmisc/avairport.cpp
@@ -18,7 +18,6 @@ namespace BlackMisc
 {
     namespace Aviation
     {
-
         /*
          * Constructor
          */
diff --git a/src/blackmisc/avairport.h b/src/blackmisc/avairport.h
index b1f0943e6..33dbb7bce 100644
--- a/src/blackmisc/avairport.h
+++ b/src/blackmisc/avairport.h
@@ -25,7 +25,6 @@ namespace BlackMisc
          */
         class CAirport : public BlackMisc::CValueObject, public BlackMisc::Geo::ICoordinateGeodetic
         {
-
         public:
             //! Properties by index
             enum ColumnIndex
@@ -170,7 +169,6 @@ namespace BlackMisc
             BlackMisc::PhysicalQuantities::CAngle m_bearingToPlane;
             BlackMisc::PhysicalQuantities::CLength m_distanceToPlane; // make mutable ?
         };
-
     } // namespace
 } // namespace
 
diff --git a/src/blackmisc/avairporticao.cpp b/src/blackmisc/avairporticao.cpp
index 6d91964e7..a4c13f223 100644
--- a/src/blackmisc/avairporticao.cpp
+++ b/src/blackmisc/avairporticao.cpp
@@ -26,7 +26,6 @@ namespace BlackMisc
          */
         int CAirportIcao::compareImpl(const CValueObject &otherBase) const
         {
-            // intentionally compare on string only!
             const auto &other = static_cast<const CAirportIcao &>(otherBase);
             return this->m_icaoCode.compare(other.m_icaoCode, Qt::CaseInsensitive);
         }
@@ -97,7 +96,6 @@ namespace BlackMisc
         bool CAirportIcao::operator ==(const CAirportIcao &other) const
         {
             if (this == &other) return true;
-            // intentionally not via Tupel converter, compare on string only
             return this->asString().compare(other.asString(), Qt::CaseInsensitive) == 0;
         }
 
diff --git a/src/blackmisc/avairporticao.h b/src/blackmisc/avairporticao.h
index 85b1cbeaa..fecf1d2c0 100644
--- a/src/blackmisc/avairporticao.h
+++ b/src/blackmisc/avairporticao.h
@@ -22,19 +22,15 @@ namespace BlackMisc
         //! Value object encapsulating information of a callsign.
         class CAirportIcao : public BlackMisc::CValueObject
         {
-
         public:
             //! Default constructor.
-            CAirportIcao() {}
+            CAirportIcao() = default;
 
             //! Constructor
-            CAirportIcao(const QString &icaoCode) : m_icaoCode(CAirportIcao::unifyAirportCode(icaoCode))
-            {}
+            CAirportIcao(const QString &icaoCode) : m_icaoCode(CAirportIcao::unifyAirportCode(icaoCode)) {}
 
             //! Constructor, needed to disambiguate implicit conversion from string literal.
-            CAirportIcao(const char *icaoCode)
-                : m_icaoCode(CAirportIcao::unifyAirportCode(icaoCode))
-            {}
+            CAirportIcao(const char *icaoCode) : m_icaoCode(CAirportIcao::unifyAirportCode(icaoCode)) {}
 
             //! \copydoc CValueObject::toQVariant()
             virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
diff --git a/src/blackmisc/avaltitude.h b/src/blackmisc/avaltitude.h
index b5e8c774c..6e1e992bb 100644
--- a/src/blackmisc/avaltitude.h
+++ b/src/blackmisc/avaltitude.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_AVALTITUDE_H
 #define BLACKMISC_AVALTITUDE_H
+
 #include "blackmisc/pqlength.h"
 
 namespace BlackMisc
@@ -34,10 +35,6 @@ namespace BlackMisc
                 FlightLevel         //!< Flight level
             };
 
-        private:
-            BLACK_ENABLE_TUPLE_CONVERSION(CAltitude)
-            ReferenceDatum m_datum; //!< MSL or AGL?
-
         protected:
             //! \copydoc CValueObject::convertToQString
             virtual QString convertToQString(bool i18n) const override;
@@ -61,12 +58,7 @@ namespace BlackMisc
             //! Default constructor: 0 Altitude true
             CAltitude() : BlackMisc::PhysicalQuantities::CLength(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel) {}
 
-            /*!
-             * Constructor
-             * \param value
-             * \param datum MSL or AGL?
-             * \param unit
-             */
+            //! Constructor
             CAltitude(double value, ReferenceDatum datum, const BlackMisc::PhysicalQuantities::CLengthUnit &unit) : BlackMisc::PhysicalQuantities::CLength(value, unit), m_datum(datum) {}
 
             //! Altitude as string
@@ -120,15 +112,17 @@ namespace BlackMisc
             //! \copydoc CValueObject::toIcon
             BlackMisc::CIcon toIcon() const override;
 
+        private:
+            BLACK_ENABLE_TUPLE_CONVERSION(CAltitude)
+            ReferenceDatum m_datum; //!< MSL or AGL?
             //! Register metadata
             static void registerMetadata();
 
             //! JSON member names
             static const QStringList &jsonMembers();
         };
-
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAltitude, (o.m_datum))
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CAltitude)
diff --git a/src/blackmisc/avatcstation.h b/src/blackmisc/avatcstation.h
index 91e1c8d6c..777bd3694 100644
--- a/src/blackmisc/avatcstation.h
+++ b/src/blackmisc/avatcstation.h
@@ -34,7 +34,6 @@ namespace BlackMisc
          */
         class CAtcStation : public BlackMisc::CValueObject, public BlackMisc::Geo::ICoordinateGeodetic
         {
-
         public:
             //! Properties by index
             enum ColumnIndex
@@ -152,7 +151,6 @@ namespace BlackMisc
             /*!
              * Syncronize controller data
              * Updates two stations (namely a booked and online ATC station) with complementary data
-             * \param otherStation
              */
             void syncronizeControllerData(CAtcStation &otherStation);
 
@@ -232,7 +230,6 @@ namespace BlackMisc
              * negative values mean booking in past,
              * positive values mean booking in future,
              * no booking dates will result in - 1 year
-             * \return
              */
             BlackMisc::PhysicalQuantities::CTime bookedWhen() const;
 
@@ -324,7 +321,6 @@ namespace BlackMisc
             CInformationMessage m_metar;
             BlackMisc::Audio::CVoiceRoom m_voiceRoom;
         };
-
     } // namespace
 } // namespace
 
diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp
index 1f2cc7538..edd904de9 100644
--- a/src/blackmisc/avcallsign.cpp
+++ b/src/blackmisc/avcallsign.cpp
@@ -84,7 +84,6 @@ namespace BlackMisc
          */
         int CCallsign::compareImpl(const CValueObject &otherBase) const
         {
-            // intentionally compare on string only!
             const auto &other = static_cast<const CCallsign &>(otherBase);
             return this->m_callsign.compare(other.m_callsign, Qt::CaseInsensitive);
         }
@@ -182,7 +181,6 @@ namespace BlackMisc
         bool CCallsign::operator ==(const CCallsign &other) const
         {
             if (this == &other) return true;
-            // intentionally not via Tupel converter, compare on string only
             return this->asString().compare(other.asString(), Qt::CaseInsensitive) == 0;
         }
 
diff --git a/src/blackmisc/avcallsign.h b/src/blackmisc/avcallsign.h
index 94ca9d6be..2ebc9a82f 100644
--- a/src/blackmisc/avcallsign.h
+++ b/src/blackmisc/avcallsign.h
@@ -23,7 +23,6 @@ namespace BlackMisc
         //! Value object encapsulating information of a callsign.
         class CCallsign : public BlackMisc::CValueObject
         {
-
         public:
             //! Indexes
             enum ColumnIndex
@@ -34,7 +33,7 @@ namespace BlackMisc
             };
 
             //! Default constructor.
-            CCallsign() {}
+            CCallsign() = default;
 
             //! Constructor
             CCallsign(const QString &callsign, const QString &telephonyDesignator = "")
@@ -125,11 +124,7 @@ namespace BlackMisc
             //! \copydoc CValueObject::unmarshallFromDbus()
             virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
 
-            /*!
-             * Unify the callsign
-             * \param callsign
-             * \return unified callsign
-             */
+            //! Unify the callsign
             static QString unifyCallsign(const QString &callsign);
 
             //! representing icon
diff --git a/src/blackmisc/avflightplan.h b/src/blackmisc/avflightplan.h
index 1ea642359..2cd93b49f 100644
--- a/src/blackmisc/avflightplan.h
+++ b/src/blackmisc/avflightplan.h
@@ -43,7 +43,7 @@ namespace BlackMisc
             static const int MaxRouteLength = 150; //!< Max route length
 
             //! Default constructor
-            CFlightPlan() {}
+            CFlightPlan() = default;
 
             //! Constructor
             CFlightPlan(const QString &equipmentIcao, const CAirportIcao &originAirportIcao, const CAirportIcao &destinationAirportIcao, const CAirportIcao &alternateAirportIcao,
diff --git a/src/blackmisc/avheading.h b/src/blackmisc/avheading.h
index c51e91693..e164ec222 100644
--- a/src/blackmisc/avheading.h
+++ b/src/blackmisc/avheading.h
@@ -34,10 +34,6 @@ namespace BlackMisc
                 True = 1        //!< true north
             };
 
-        private:
-            BLACK_ENABLE_TUPLE_CONVERSION(CHeading)
-            ReferenceNorth m_north; //!< magnetic or true?
-
         protected:
             //! \copydoc CValueObject::convertToQString
             virtual QString convertToQString(bool i18n = false) const override;
@@ -55,12 +51,7 @@ namespace BlackMisc
             //! \brief Default constructor: 0 heading true
             CHeading() : CAngle(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}
 
-            /*!
-             * \brief Constructor
-             * \param value
-             * \param north
-             * \param unit
-             */
+            //! \brief Constructor
             CHeading(double value, ReferenceNorth north, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CAngle(value, unit), m_north(north) {}
 
             //! \brief Constructor by CAngle
@@ -84,6 +75,9 @@ namespace BlackMisc
             //! \brief Get reference north (magnetic or true)
             ReferenceNorth getReferenceNorth() const { return m_north; }
 
+        private:
+            BLACK_ENABLE_TUPLE_CONVERSION(CHeading)
+            ReferenceNorth m_north; //!< magnetic or true?
             //! \copydoc CValueObject::toQVariant
             virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
 
@@ -102,9 +96,8 @@ namespace BlackMisc
             //! JSON member names
             static const QStringList &jsonMembers();
         };
-
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CHeading, (o.m_north))
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CHeading)
diff --git a/src/blackmisc/avinformationmessage.h b/src/blackmisc/avinformationmessage.h
index c68e5e799..39f42eef3 100644
--- a/src/blackmisc/avinformationmessage.h
+++ b/src/blackmisc/avinformationmessage.h
@@ -48,8 +48,6 @@ namespace BlackMisc
 
             /*!
              * Information message of type
-             * \param type
-             * \param message
              */
             CInformationMessage(InformationType type, const QString &message)
                 : m_type(type), m_message(message)
diff --git a/src/blackmisc/avioadfsystem.h b/src/blackmisc/avioadfsystem.h
index 1e6dd8175..d4375bca9 100644
--- a/src/blackmisc/avioadfsystem.h
+++ b/src/blackmisc/avioadfsystem.h
@@ -25,10 +25,9 @@ namespace BlackMisc
          */
         class CAdfSystem : public CModulator<CAdfSystem>
         {
-
         public:
             //! Default constructor
-            CAdfSystem() : CModulator() {}
+            CAdfSystem() = default;
 
             //! Constructor
             CAdfSystem(const QString &name, const PhysicalQuantities::CFrequency &activeFrequency, const PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet()):
@@ -88,11 +87,10 @@ namespace BlackMisc
                     this->isValidFrequency(this->getFrequencyActive()) &&
                     this->isValidFrequency(this->getFrequencyStandby());
             }
-
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CAdfSystem)
 
diff --git a/src/blackmisc/aviobase.h b/src/blackmisc/aviobase.h
index 2143582ef..c1128f047 100644
--- a/src/blackmisc/aviobase.h
+++ b/src/blackmisc/aviobase.h
@@ -6,7 +6,8 @@
 #ifndef BLACKMISC_AVIOBASE_H
 #define BLACKMISC_AVIOBASE_H
 
-// QtGlobal is required for asserts
+//! \file
+
 #include "blackmisc/valueobject.h"
 #include "blackmisc/pqconstants.h"
 #include <QtGlobal>
@@ -59,9 +60,6 @@ namespace BlackMisc
             virtual uint getValueHash() const override;
 
         public:
-            //! \brief Virtual destructor
-            virtual ~CAvionicsBase() {}
-
             //! \brief Name
             QString getName() const
             {
@@ -78,8 +76,8 @@ namespace BlackMisc
             BLACK_ENABLE_TUPLE_CONVERSION(CAvionicsBase)
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAvionicsBase, (o.m_name))
 
diff --git a/src/blackmisc/aviocomsystem.cpp b/src/blackmisc/aviocomsystem.cpp
index fc4427728..67e8f5137 100644
--- a/src/blackmisc/aviocomsystem.cpp
+++ b/src/blackmisc/aviocomsystem.cpp
@@ -11,6 +11,7 @@
 #include "blackmisc/aviocomsystem.h"
 
 using namespace BlackMisc::PhysicalQuantities;
+using namespace BlackMisc::Math;
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/aviocomsystem.h b/src/blackmisc/aviocomsystem.h
index 434eacdd9..1909871cc 100644
--- a/src/blackmisc/aviocomsystem.h
+++ b/src/blackmisc/aviocomsystem.h
@@ -32,7 +32,7 @@ namespace BlackMisc
             };
 
             //! Default constructor
-            CComSystem() : CModulator(), m_channelSpacing(ChannelSpacing25KHz) {}
+            CComSystem() : m_channelSpacing(ChannelSpacing25KHz) {}
 
             //! Constructor
             CComSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet()):
@@ -180,10 +180,9 @@ namespace BlackMisc
              * \remarks Just a helper method, that is why no CFrequency is returned
              */
             static double channelSpacingToFrequencyKHz(ChannelSpacing channelSpacing);
-
         };
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CComSystem, (o.m_channelSpacing))
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CComSystem)
diff --git a/src/blackmisc/aviomodulator.h b/src/blackmisc/aviomodulator.h
index 4886f0dbf..713d53919 100644
--- a/src/blackmisc/aviomodulator.h
+++ b/src/blackmisc/aviomodulator.h
@@ -17,8 +17,6 @@
 #include "blackmisc/mathematics.h"
 #include "blackmisc/blackmiscfreefunctions.h"
 
-using namespace BlackMisc::Math;
-
 namespace BlackMisc
 {
     namespace Aviation
@@ -29,9 +27,7 @@ namespace BlackMisc
          */
         template <class AVIO> class CModulator : public CAvionicsBase
         {
-
         public:
-
             //! Column indexes
             enum ColumnIndex
             {
@@ -42,9 +38,6 @@ namespace BlackMisc
                 IndexEnabled
             };
 
-            //! Virtual destructor
-            virtual ~CModulator() {}
-
             //! Default value?
             virtual bool isDefaultValue() const
             {
@@ -153,14 +146,14 @@ namespace BlackMisc
             //! Set active frequency
             void setFrequencyActiveMHz(double frequencyMHz)
             {
-                frequencyMHz = CMath::round(frequencyMHz, 3);
+                frequencyMHz = Math::CMath::round(frequencyMHz, 3);
                 this->m_frequencyActive = BlackMisc::PhysicalQuantities::CFrequency(frequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz());
             }
 
             //! Set standby frequency
             void setFrequencyStandbyMHz(double frequencyMHz)
             {
-                frequencyMHz = CMath::round(frequencyMHz, 3);
+                frequencyMHz = Math::CMath::round(frequencyMHz, 3);
                 this->m_frequencyStandby = BlackMisc::PhysicalQuantities::CFrequency(frequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz());
             }
 
@@ -258,11 +251,10 @@ namespace BlackMisc
 
             //! Easy access to derived class (CRTP template parameter)
             AVIO *derived() { return static_cast<AVIO *>(this); }
-
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION_TEMPLATE(BlackMisc::Aviation::CModulator, (o.m_frequencyActive, o.m_frequencyStandby, o.m_volumeInput , o.m_volumeOutput, o.m_enabled))
 
diff --git a/src/blackmisc/avionavsystem.h b/src/blackmisc/avionavsystem.h
index cea2b2cba..205b408dc 100644
--- a/src/blackmisc/avionavsystem.h
+++ b/src/blackmisc/avionavsystem.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_AVIONAVSYSTEM_H
 #define BLACKMISC_AVIONAVSYSTEM_H
+
 #include "blackmisc/aviomodulator.h"
 
 namespace BlackMisc
@@ -20,10 +21,9 @@ namespace BlackMisc
         //! NAV system (radio navigation)
         class CNavSystem : public CModulator<CNavSystem>
         {
-
         public:
             //! Default constructor
-            CNavSystem() : CModulator() {}
+            CNavSystem() = default;
 
             //! Constructor
             CNavSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency):
diff --git a/src/blackmisc/aviotransponder.h b/src/blackmisc/aviotransponder.h
index e099b6d01..1749908ca 100644
--- a/src/blackmisc/aviotransponder.h
+++ b/src/blackmisc/aviotransponder.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_AVIOTRANSPONDER_H
 #define BLACKMISC_AVIOTRANSPONDER_H
+
 #include "blackmisc/aviobase.h"
 
 namespace BlackMisc
@@ -47,10 +48,6 @@ namespace BlackMisc
             //! Default constructor
             CTransponder() : CAvionicsBase("transponder"), m_transponderCode(0), m_transponderMode(StateStandby) {}
 
-            //! Copy constructor
-            CTransponder(const CTransponder &other) : CAvionicsBase(other.getName()),
-                m_transponderCode(other.m_transponderCode), m_transponderMode(other.m_transponderMode) {}
-
             //! Constructor
             CTransponder(const QString &name, qint32 transponderCode, TransponderMode transponderMode) :
                 CAvionicsBase(name), m_transponderCode(transponderCode), m_transponderMode(transponderMode)
@@ -210,10 +207,10 @@ namespace BlackMisc
             BLACK_ENABLE_TUPLE_CONVERSION(CTransponder)
             qint32 m_transponderCode;          //!< Transponder code
             TransponderMode m_transponderMode; //!< Transponder mode
-
         };
-    } // namespace
-} // namespace
+
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTransponder, (o.m_transponderCode, o.m_transponderMode))
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CTransponder)
diff --git a/src/blackmisc/avselcal.h b/src/blackmisc/avselcal.h
index 7ca1249f6..f869ed2a7 100644
--- a/src/blackmisc/avselcal.h
+++ b/src/blackmisc/avselcal.h
@@ -26,10 +26,9 @@ namespace BlackMisc
          */
         class CSelcal : public BlackMisc::CValueObject
         {
-
         public:
             //! Default constructor.
-            CSelcal() {}
+            CSelcal() = default;
 
             //! Constructor.
             CSelcal(const QString &code) : m_code(code.trimmed()) {}
diff --git a/src/blackmisc/avtrack.h b/src/blackmisc/avtrack.h
index f6f31b147..fb353eff1 100644
--- a/src/blackmisc/avtrack.h
+++ b/src/blackmisc/avtrack.h
@@ -18,7 +18,6 @@ namespace BlackMisc
 {
     namespace Aviation
     {
-
         /*!
          * \brief Track as used in aviation, can be true or magnetic Track
          * \remarks Intentionally allowing +/- BlackMisc::PhysicalQuantities::CAngle ,
@@ -107,8 +106,8 @@ namespace BlackMisc
             ReferenceNorth m_north; //!< magnetic or true?
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTrack, (o.m_north))
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CTrack)
diff --git a/src/blackmisc/coordinateecef.h b/src/blackmisc/coordinateecef.h
index ab5099303..5e1025089 100644
--- a/src/blackmisc/coordinateecef.h
+++ b/src/blackmisc/coordinateecef.h
@@ -5,6 +5,9 @@
 
 #ifndef BLACKMISC_COORDINATEECEF_H
 #define BLACKMISC_COORDINATEECEF_H
+
+//! \file
+
 #include "blackmisc/mathvector3d.h"
 
 namespace BlackMisc
@@ -21,19 +24,15 @@ namespace BlackMisc
             /*!
              * \brief Default constructor
              */
-            CCoordinateEcef() : CVector3DBase() {}
+            CCoordinateEcef() = default;
 
             /*!
              * \brief Constructor by values
-             * \param x
-             * \param y
-             * \param z
              */
             CCoordinateEcef(double x, double y, double z) : CVector3DBase(x, y, z) {}
 
             /*!
              * \brief Constructor by math vector
-             * \param vector
              */
             explicit CCoordinateEcef(const BlackMisc::Math::CVector3D vector) : CVector3DBase(vector.i(), vector.j(), vector.k()) {}
 
@@ -78,7 +77,6 @@ namespace BlackMisc
 
             /*!
              * \brief Concrete implementation of a 3D vector
-             * \return
              */
             BlackMisc::Math::CVector3D toMathVector() const
             {
@@ -98,8 +96,8 @@ namespace BlackMisc
             }
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::Geo::CCoordinateEcef)
 
diff --git a/src/blackmisc/coordinategeodetic.h b/src/blackmisc/coordinategeodetic.h
index 9e6c18ca2..ab94d63a3 100644
--- a/src/blackmisc/coordinategeodetic.h
+++ b/src/blackmisc/coordinategeodetic.h
@@ -95,12 +95,6 @@ namespace BlackMisc
                 IndexGeodeticHeightAsString
             };
 
-        private:
-            BLACK_ENABLE_TUPLE_CONVERSION(CCoordinateGeodetic)
-            BlackMisc::Geo::CLatitude m_latitude; //!< Latitude
-            BlackMisc::Geo::CLongitude m_longitude; //!< Longitude
-            BlackMisc::PhysicalQuantities::CLength m_geodeticHeight; //!< height, ellipsoidal or geodetic height
-
         protected:
             //! \copydoc CValueObject::convertToQString
             virtual QString convertToQString(bool i18n = false) const override;
@@ -122,7 +116,7 @@ namespace BlackMisc
 
         public:
             //! Default constructor
-            CCoordinateGeodetic() : m_latitude(), m_longitude(), m_geodeticHeight() {}
+            CCoordinateGeodetic() = default;
 
             //! Constructor by values
             CCoordinateGeodetic(CLatitude latitude, CLongitude longitude, BlackMisc::PhysicalQuantities::CLength height) :
@@ -204,10 +198,15 @@ namespace BlackMisc
             //! Coordinate by WGS84 position data
             static CCoordinateGeodetic fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const BlackMisc::PhysicalQuantities::CLength &geodeticHeight = {});
 
+        private:
+            BLACK_ENABLE_TUPLE_CONVERSION(CCoordinateGeodetic)
+            BlackMisc::Geo::CLatitude m_latitude; //!< Latitude
+            BlackMisc::Geo::CLongitude m_longitude; //!< Longitude
+            BlackMisc::PhysicalQuantities::CLength m_geodeticHeight; //!< height, ellipsoidal or geodetic height
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Geo::CCoordinateGeodetic, (o.m_latitude, o.m_longitude, o.m_geodeticHeight))
 Q_DECLARE_METATYPE(BlackMisc::Geo::CCoordinateGeodetic)
diff --git a/src/blackmisc/coordinatened.h b/src/blackmisc/coordinatened.h
index ba81164af..e815b43bb 100644
--- a/src/blackmisc/coordinatened.h
+++ b/src/blackmisc/coordinatened.h
@@ -5,6 +5,9 @@
 
 #ifndef BLACKMISC_COORDINATENED_H
 #define BLACKMISC_COORDINATENED_H
+
+//! \file
+
 #include "blackmisc/mathvector3d.h"
 #include "blackmisc/mathmatrix3x3.h"
 #include "blackmisc/coordinategeodetic.h"
@@ -19,11 +22,6 @@ namespace BlackMisc
          */
         class CCoordinateNed : public BlackMisc::Math::CVector3DBase<CCoordinateNed>
         {
-        private:
-            BLACK_ENABLE_TUPLE_CONVERSION(CCoordinateNed)
-            CCoordinateGeodetic m_referencePosition; //!< geodetic reference position
-            bool m_hasReferencePosition; //!< valid reference position?
-
         protected:
             //! \copydoc CValueObject::marshallFromDbus()
             virtual void marshallToDbus(QDBusArgument &argument) const override;
@@ -49,45 +47,30 @@ namespace BlackMisc
             /*!
              * \brief Default constructor
              */
-            CCoordinateNed() : CVector3DBase(), m_referencePosition(), m_hasReferencePosition(false) {}
+            CCoordinateNed() : m_hasReferencePosition(false) {}
 
             /*!
              * \brief Constructor with reference position
-             * \param referencePosition
              */
-            CCoordinateNed(const CCoordinateGeodetic &referencePosition) : CVector3DBase(), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
+            CCoordinateNed(const CCoordinateGeodetic &referencePosition) : m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
 
             /*!
              * \brief Constructor by values
-             * \param referencePosition
-             * \param north
-             * \param east
-             * \param down
              */
             CCoordinateNed(const CCoordinateGeodetic &referencePosition, double north, double east, double down) : CVector3DBase(north, east, down), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
 
             /*!
              * \brief Constructor by values
-             * \param north
-             * \param east
-             * \param down
              */
             CCoordinateNed(double north, double east, double down) : CVector3DBase(north, east, down), m_referencePosition(), m_hasReferencePosition(false) {}
 
-            //! \brief Copy constructor
-            CCoordinateNed(const CCoordinateNed &other) :
-                CVector3DBase(other), m_referencePosition(other.m_referencePosition), m_hasReferencePosition(other.m_hasReferencePosition) {}
-
             /*!
              * \brief Constructor by math vector
-             * \param vector
              */
             explicit CCoordinateNed(const BlackMisc::Math::CVector3D &vector) : CVector3DBase(vector.i(), vector.j(), vector.k()), m_referencePosition(), m_hasReferencePosition(false) {}
 
             /*!
              * \brief Constructor by math vector and reference position
-             * \param referencePosition
-             * \param vector
              */
             CCoordinateNed(const CCoordinateGeodetic &referencePosition, const BlackMisc::Math::CVector3D &vector) : CVector3DBase(vector.i(), vector.j(), vector.k()), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
 
@@ -119,7 +102,6 @@ namespace BlackMisc
 
             /*!
              * \brief Corresponding reference position
-             * \return
              */
             CCoordinateGeodetic referencePosition() const
             {
@@ -128,7 +110,6 @@ namespace BlackMisc
 
             /*!
              * \brief Corresponding reference position
-             * \return
              */
             bool hasReferencePosition() const
             {
@@ -137,7 +118,6 @@ namespace BlackMisc
 
             /*!
              * \brief North
-             * \return
              */
             double north() const
             {
@@ -146,7 +126,6 @@ namespace BlackMisc
 
             /*!
              * \brief East
-             * \return
              */
             double east() const
             {
@@ -155,7 +134,6 @@ namespace BlackMisc
 
             /*!
              * \brief Down
-             * \return
              */
             double down() const
             {
@@ -164,7 +142,6 @@ namespace BlackMisc
 
             /*!
              * \brief Set north
-             * \param north
              */
             void setNorth(double north)
             {
@@ -173,7 +150,6 @@ namespace BlackMisc
 
             /*!
              * \brief Set east
-             * \param east
              */
             void setEast(double east)
             {
@@ -182,7 +158,6 @@ namespace BlackMisc
 
             /*!
              * \brief Set down
-             * \param down
              */
             void setDown(double down)
             {
@@ -191,7 +166,6 @@ namespace BlackMisc
 
             /*!
              * \brief Corresponding reference position
-             * \param referencePosition
              */
             void setReferencePosition(const CCoordinateGeodetic &referencePosition)
             {
@@ -201,16 +175,19 @@ namespace BlackMisc
 
             /*!
              * \brief Concrete implementation of a 3D vector
-             * \return
              */
             BlackMisc::Math::CVector3D toMathVector() const
             {
                 return BlackMisc::Math::CVector3D(this->north(), this->east(), this->down());
             }
-        };
 
-    } // namespace
-} // namespace
+        private:
+            BLACK_ENABLE_TUPLE_CONVERSION(CCoordinateNed)
+            CCoordinateGeodetic m_referencePosition; //!< geodetic reference position
+            bool m_hasReferencePosition; //!< valid reference position?
+        };
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Geo::CCoordinateNed, (o.m_referencePosition, o.m_hasReferencePosition))
 Q_DECLARE_METATYPE(BlackMisc::Geo::CCoordinateNed)
diff --git a/src/blackmisc/eveventhotkeyfunction.cpp b/src/blackmisc/eveventhotkeyfunction.cpp
index 092ee9228..d97edf63d 100644
--- a/src/blackmisc/eveventhotkeyfunction.cpp
+++ b/src/blackmisc/eveventhotkeyfunction.cpp
@@ -13,11 +13,6 @@ namespace BlackMisc
 {
     namespace Event
     {
-        CEventHotkeyFunction::CEventHotkeyFunction()
-        {
-
-        }
-
         CEventHotkeyFunction::CEventHotkeyFunction(CHotkeyFunction func, bool argument)
             : m_hotkeyFunc(func), m_hotkeyFuncArgument(argument)
         {
diff --git a/src/blackmisc/eveventhotkeyfunction.h b/src/blackmisc/eveventhotkeyfunction.h
index 44325b090..5d6e8c9ef 100644
--- a/src/blackmisc/eveventhotkeyfunction.h
+++ b/src/blackmisc/eveventhotkeyfunction.h
@@ -25,9 +25,8 @@ namespace BlackMisc
         class CEventHotkeyFunction : public BlackMisc::CValueObject
         {
         public:
-
             //! Default constructor.
-            CEventHotkeyFunction();
+            CEventHotkeyFunction() = default;
 
             //! Constructor.
             CEventHotkeyFunction(CHotkeyFunction func, bool argument);
diff --git a/src/blackmisc/evoriginator.cpp b/src/blackmisc/evoriginator.cpp
index 51995320f..e0f679ba2 100644
--- a/src/blackmisc/evoriginator.cpp
+++ b/src/blackmisc/evoriginator.cpp
@@ -23,18 +23,6 @@ namespace BlackMisc
         {
         }
 
-        // Copy Constructor
-        COriginator::COriginator(const COriginator &other)
-            : CValueObject(other),
-              m_originatorName(other.m_originatorName),
-              m_machineId(other.m_machineId),
-              m_primaryIpAddress(other.m_primaryIpAddress),
-              m_objectId(other.m_objectId),
-              m_processId(other.m_processId),
-              m_processName(other.m_processName)
-        {
-        }
-
         // Hash
         uint COriginator::getValueHash() const
         {
@@ -120,5 +108,5 @@ namespace BlackMisc
         {
             argument >> TupleConverter<COriginator>::toTuple(*this);
         }
-    } // namespace Event
+    }
 }
diff --git a/src/blackmisc/evoriginator.h b/src/blackmisc/evoriginator.h
index 6ac8a1941..09712d163 100644
--- a/src/blackmisc/evoriginator.h
+++ b/src/blackmisc/evoriginator.h
@@ -26,13 +26,9 @@ namespace BlackMisc
         class COriginator : public BlackMisc::CValueObject
         {
         public:
-
             //! Default constructor.
             COriginator();
 
-            //! Copy constructor
-            COriginator(const COriginator &other);
-
             //! Get machine id
             QByteArray getMachineId() const {return m_machineId;}
 
@@ -91,7 +87,7 @@ namespace BlackMisc
             qint32 m_processId;
             QString m_processName;
         };
-    } // namespace Event
+    }
 }
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Event::COriginator, (o.m_originatorName, o.m_machineId, o.m_primaryIpAddress, o.m_objectId, o.m_processId, o.m_processName))
diff --git a/src/blackmisc/geoearthangle.h b/src/blackmisc/geoearthangle.h
index da04e7ebb..7a43f1761 100644
--- a/src/blackmisc/geoearthangle.h
+++ b/src/blackmisc/geoearthangle.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_GEOEARTHANGLE_H
 #define BLACKMISC_GEOEARTHANGLE_H
+
 #include "blackmisc/pqangle.h"
 
 namespace BlackMisc
@@ -22,11 +23,7 @@ namespace BlackMisc
          */
         template <class LATorLON> class CEarthAngle : public BlackMisc::PhysicalQuantities::CAngle
         {
-
         public:
-            //! Virtual destructor
-            virtual ~CEarthAngle() {}
-
             //! Equal operator ==
             bool operator==(const CEarthAngle &latOrLon) const
             {
@@ -171,8 +168,7 @@ namespace BlackMisc
             //! Easy access to derived class (CRTP template parameter)
             LATorLON *derived() { return static_cast<LATorLON *>(this); }
         };
-
-    } // namespace
-} // namespace
+    }
+}
 
 #endif // guard
diff --git a/src/blackmisc/geolatitude.h b/src/blackmisc/geolatitude.h
index 4407d4d75..495945eb0 100644
--- a/src/blackmisc/geolatitude.h
+++ b/src/blackmisc/geolatitude.h
@@ -37,20 +37,17 @@ namespace BlackMisc
 
         public:
             //! Default constructor
-            CLatitude() : CEarthAngle() {}
+            CLatitude() = default;
 
             //! Constructor
             explicit CLatitude(const BlackMisc::PhysicalQuantities::CAngle &angle) : CEarthAngle(angle) {}
 
             //! Init by double value
             CLatitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CEarthAngle(value, unit) {}
-
-            //! Virtual destructor
-            virtual ~CLatitude() {}
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::Geo::CLatitude)
 
diff --git a/src/blackmisc/geolongitude.h b/src/blackmisc/geolongitude.h
index 0b947fdef..b9acd0a5d 100644
--- a/src/blackmisc/geolongitude.h
+++ b/src/blackmisc/geolongitude.h
@@ -34,20 +34,17 @@ namespace BlackMisc
 
         public:
             //! Default constructor
-            CLongitude() : CEarthAngle() {}
+            CLongitude() = default;
 
             //! Constructor
             explicit CLongitude(const BlackMisc::PhysicalQuantities::CAngle &angle) : CEarthAngle(angle) {}
 
             //! Init by double value
             CLongitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CEarthAngle(value, unit) {}
-
-            //! Virtual destructor
-            virtual ~CLongitude() {}
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::Geo::CLongitude)
 
diff --git a/src/blackmisc/hotkeyfunction.h b/src/blackmisc/hotkeyfunction.h
index 628fa2526..d494d5e2c 100644
--- a/src/blackmisc/hotkeyfunction.h
+++ b/src/blackmisc/hotkeyfunction.h
@@ -21,7 +21,6 @@ namespace BlackMisc
     class CHotkeyFunction : public CValueObject
     {
     public:
-
         //! Function type
         enum Function
         {
diff --git a/src/blackmisc/hwjoystickbutton.h b/src/blackmisc/hwjoystickbutton.h
index a28c09ebe..fc601907f 100644
--- a/src/blackmisc/hwjoystickbutton.h
+++ b/src/blackmisc/hwjoystickbutton.h
@@ -24,7 +24,6 @@ namespace BlackMisc
         class CJoystickButton : public CValueObject
         {
         public:
-
             //! Properties by index
             enum ColumnIndex
             {
@@ -34,14 +33,11 @@ namespace BlackMisc
             };
 
             //! Default constructor
-            CJoystickButton() {}
+            CJoystickButton() = default;
 
             //! Constructor
             CJoystickButton(qint32 buttonIndex);
 
-            //! Destructor
-            ~CJoystickButton() {}
-
             //! \copydoc CValueObject::toQVariant
             virtual QVariant toQVariant() const override
             {
@@ -126,12 +122,9 @@ namespace BlackMisc
             qint32 m_buttonIndex = m_invalidIndex; //!< code similar to Qt::Key
 
             static const qint32 m_invalidIndex = -1;
-
         };
-
-    } // class
-
-} // BlackMisc
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Hardware::CJoystickButton, (o.m_buttonIndex))
 Q_DECLARE_METATYPE(BlackMisc::Hardware::CJoystickButton)
diff --git a/src/blackmisc/hwkeyboardkey.h b/src/blackmisc/hwkeyboardkey.h
index c045e7672..c62dbbef6 100644
--- a/src/blackmisc/hwkeyboardkey.h
+++ b/src/blackmisc/hwkeyboardkey.h
@@ -25,7 +25,6 @@ namespace BlackMisc
         class CKeyboardKey : public CValueObject
         {
         public:
-
             //! Properties by index
             enum ColumnIndex
             {
@@ -62,9 +61,6 @@ namespace BlackMisc
             //! Constructor
             CKeyboardKey(Qt::Key keyCode, Modifier modifier1 = ModifierNone, Modifier modifier2 = ModifierNone);
 
-            //! Destructor
-            ~CKeyboardKey() {}
-
             //! \copydoc CValueObject::toQVariant()
             virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
 
@@ -230,8 +226,6 @@ namespace BlackMisc
 
             /*!
              * CKeyboardKey::toStringRepresentation
-             * \param key
-             * \return
              */
             static QString toStringRepresentation(int key);
 
@@ -260,8 +254,8 @@ namespace BlackMisc
             Modifier m_modifier1;
             Modifier m_modifier2;
         };
-    } // class
-} // BlackMisc
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Hardware::CKeyboardKey, (o.m_qtKey, o.m_modifier1, o.m_modifier2))
 Q_DECLARE_METATYPE(BlackMisc::Hardware::CKeyboardKey)
diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h
index f7227eaf7..04c0055a8 100644
--- a/src/blackmisc/icon.h
+++ b/src/blackmisc/icon.h
@@ -22,10 +22,9 @@ namespace BlackMisc
      */
     class CIcon : public BlackMisc::CValueObject
     {
-
     public:
         //! Default constructor.
-        CIcon() {}
+        CIcon() = default;
 
         //! Constructor.
         CIcon( CIcons::IconIndex index, const QString &descriptiveText) :
diff --git a/src/blackmisc/mathmatrix1x3.h b/src/blackmisc/mathmatrix1x3.h
index c06f3eb6e..99dd4fbbf 100644
--- a/src/blackmisc/mathmatrix1x3.h
+++ b/src/blackmisc/mathmatrix1x3.h
@@ -26,16 +26,13 @@ namespace BlackMisc
         public:
 
             //! Constructor
-            CMatrix1x3() : CMatrixBase() {}
-
-            //! Copy constructor
-            CMatrix1x3(const CMatrix1x3 &other) : CMatrixBase(other) {}
+            CMatrix1x3() = default;
 
             //! Init by fill value
             explicit CMatrix1x3(double fillValue) : CMatrixBase(fillValue) {}
 
             //! Constructor
-            CMatrix1x3(double c1, double c2, double c3) : CMatrixBase()
+            CMatrix1x3(double c1, double c2, double c3)
             {
                 this->m_matrix(0, 0) = c1;
                 this->m_matrix(0, 1) = c2;
@@ -43,8 +40,8 @@ namespace BlackMisc
             }
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::Math::CMatrix1x3)
 
diff --git a/src/blackmisc/mathmatrix3x1.h b/src/blackmisc/mathmatrix3x1.h
index ef7978630..bf6f6d819 100644
--- a/src/blackmisc/mathmatrix3x1.h
+++ b/src/blackmisc/mathmatrix3x1.h
@@ -29,7 +29,7 @@ namespace BlackMisc
 
         public:
             //! Constructor
-            CMatrix3x1() : CMatrixBase() {}
+            CMatrix3x1() = default;
 
             //! Constructor
             CMatrix3x1(double r1, double r2, double r3) : CMatrixBase()
@@ -39,9 +39,6 @@ namespace BlackMisc
                 this->m_matrix(2, 0) = r3;
             }
 
-            //! Copy constructor
-            CMatrix3x1(const CMatrix3x1 &other) : CMatrixBase(other) {}
-
             //! Init by fill value
             explicit CMatrix3x1(double fillValue) : CMatrixBase(fillValue) {}
 
@@ -59,8 +56,9 @@ namespace BlackMisc
                 this->m_matrix(2, 0) = vector.k();
             }
         };
-    } // namespace
-} // namespace
+
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::Math::CMatrix3x1)
 
diff --git a/src/blackmisc/mathmatrix3x3.h b/src/blackmisc/mathmatrix3x3.h
index 3f2dd4fe6..8c601be96 100644
--- a/src/blackmisc/mathmatrix3x3.h
+++ b/src/blackmisc/mathmatrix3x3.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_POSMATRIX3X3_H
 #define BLACKMISC_POSMATRIX3X3_H
+
 #include "blackmisc/mathmatrix1x3.h"
 #include "blackmisc/mathmatrix3x1.h"
 #include <stdexcept>
@@ -25,10 +26,7 @@ namespace BlackMisc
         {
         public:
             //! Constructor
-            CMatrix3x3() : CMatrixBase() {}
-
-            //! Copy constructor
-            CMatrix3x3(const CMatrix3x3 &other) : CMatrixBase(other) {}
+            CMatrix3x3() = default;
 
             //! Init by fill value
             explicit CMatrix3x3(double fillValue) : CMatrixBase(fillValue) {}
@@ -36,7 +34,7 @@ namespace BlackMisc
             //! Stupid, but handy constructor by single row column values
             explicit CMatrix3x3(double r1c1, double r1c2, double r1c3,
                                 double r2c1, double r2c2, double r2c3,
-                                double r3c1, double r3c2, double r3c3) : CMatrixBase()
+                                double r3c1, double r3c2, double r3c3)
             {
                 this->setElement(0, 0, r1c1);
                 this->setElement(0, 1, r1c2);
@@ -114,8 +112,8 @@ namespace BlackMisc
             CMatrix1x3 getRow(int row) const;
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::Math::CMatrix3x3)
 
diff --git a/src/blackmisc/mathmatrixbase.h b/src/blackmisc/mathmatrixbase.h
index c142502ba..1415b473c 100644
--- a/src/blackmisc/mathmatrixbase.h
+++ b/src/blackmisc/mathmatrixbase.h
@@ -6,6 +6,8 @@
 #ifndef BLACKMISC_MATHMATRIXBASE_H
 #define BLACKMISC_MATHMATRIXBASE_H
 
+//! \file
+
 #include "blackmisc/valueobject.h"
 #include "blackmisc/mathvector3dbase.h"
 #include "blackmisc/blackmiscfreefunctions.h"
@@ -21,25 +23,6 @@ namespace BlackMisc
          */
         template<class ImplMatrix, int Rows, int Columns> class CMatrixBase : public BlackMisc::CValueObject
         {
-        private:
-            /*!
-             * \brief Easy access to derived class (CRTP template parameter)
-             * \return
-             */
-            ImplMatrix const *derived() const
-            {
-                return static_cast<ImplMatrix const *>(this);
-            }
-
-            /*!
-             * \brief Easy access to derived class (CRTP template parameter)
-             * \return
-             */
-            ImplMatrix *derived()
-            {
-                return static_cast<ImplMatrix *>(this);
-            }
-
         protected:
             // no bug, Qt expects columns rows
             QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
@@ -64,20 +47,14 @@ namespace BlackMisc
 
         public:
             //! \brief Default constructor
-            CMatrixBase() : m_matrix() {}
+            CMatrixBase() = default;
 
-            /*!
-             * \brief Fill with value
-             * \param fillValue
-             */
-            explicit CMatrixBase(double fillValue) : m_matrix()
+            //! \brief Fill with value
+            explicit CMatrixBase(double fillValue)
             {
                 this->fill(fillValue);
             }
 
-            //! \brief Virtual destructor
-            virtual ~CMatrixBase() {}
-
             //! \brief List of values
             QList<double> toList() const;
 
@@ -252,6 +229,18 @@ namespace BlackMisc
             virtual void convertFromJson(const QJsonObject &json) override;
 
         private:
+            //! \brief Easy access to derived class (CRTP template parameter)
+            ImplMatrix const *derived() const
+            {
+                return static_cast<ImplMatrix const *>(this);
+            }
+
+            //! \brief Easy access to derived class (CRTP template parameter)
+            ImplMatrix *derived()
+            {
+                return static_cast<ImplMatrix *>(this);
+            }
+
             //! \brief Check range of row / column
             void checkRange(int row, int column) const;
         };
diff --git a/src/blackmisc/mathvector3d.h b/src/blackmisc/mathvector3d.h
index 7c78fbc83..5dc35bd6d 100644
--- a/src/blackmisc/mathvector3d.h
+++ b/src/blackmisc/mathvector3d.h
@@ -1,6 +1,17 @@
+/* Copyright (C) 2013
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
 #ifndef BLACKMISC_MATHVECTOR3D_H
 #define BLACKMISC_MATHVECTOR3D_H
 
+//! \file
+
 #include "blackmisc/mathvector3dbase.h"
 
 namespace BlackMisc
@@ -17,31 +28,20 @@ namespace BlackMisc
             /*!
              * \brief Default constructor
              */
-            CVector3D() : CVector3DBase() {}
+            CVector3D() = default;
 
             /*!
              * \brief Constructor by value
-             * \param i
-             * \param j
-             * \param k
              */
             CVector3D(double i, double j, double k) : CVector3DBase(i, j, k) {}
 
             /*!
              * \brief Constructor by value
-             * \param value
              */
             explicit CVector3D(double value) : CVector3DBase(value) {}
 
-            /*!
-             * \brief Copy constructor
-             * \param other
-             */
-            CVector3D(const CVector3D &other) : CVector3DBase(other) {}
-
             /*!
              * \brief i
-             * \return
              */
             double i() const
             {
@@ -50,7 +50,6 @@ namespace BlackMisc
 
             /*!
              * \brief j
-             * \return
              */
             double j() const
             {
@@ -59,7 +58,6 @@ namespace BlackMisc
 
             /*!
              * \brief k
-             * \return
              */
             double k() const
             {
@@ -68,7 +66,6 @@ namespace BlackMisc
 
             /*!
              * \brief Set i
-             * \param i
              */
             void setI(double i)
             {
@@ -77,7 +74,6 @@ namespace BlackMisc
 
             /*!
              * \brief Set j
-             * \param j
              */
             void setJ(double j)
             {
@@ -86,17 +82,15 @@ namespace BlackMisc
 
             /*!
              * \brief Set k
-             * \param k
              */
             void setK(double k)
             {
                 this->m_k = k;
             }
-
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::Math::CVector3D)
 
diff --git a/src/blackmisc/mathvector3dbase.cpp b/src/blackmisc/mathvector3dbase.cpp
index 9482f4613..98b74b0da 100644
--- a/src/blackmisc/mathvector3dbase.cpp
+++ b/src/blackmisc/mathvector3dbase.cpp
@@ -12,7 +12,6 @@
 #include "blackmisc/coordinateecef.h"
 #include "blackmisc/coordinatened.h"
 #include "blackmisc/blackmiscfreefunctions.h"
-#include <tuple>
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/mathvector3dbase.h b/src/blackmisc/mathvector3dbase.h
index 2fbdb01a5..e2b1970f4 100644
--- a/src/blackmisc/mathvector3dbase.h
+++ b/src/blackmisc/mathvector3dbase.h
@@ -16,8 +16,6 @@
 #include "blackmisc/mathematics.h"
 #include "blackmisc/blackmiscfreefunctions.h"
 
-using namespace BlackMisc::Math;
-
 namespace BlackMisc
 {
     namespace Math
@@ -31,9 +29,6 @@ namespace BlackMisc
             // getter and setters are implemented in the derived classes
             // as they have different names (x, i, north)
 
-            //! Virtual destructor
-            virtual ~CVector3DBase() {}
-
             //! Set zeros
             void setZero();
 
@@ -267,8 +262,8 @@ namespace BlackMisc
 
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION_TEMPLATE(BlackMisc::Math::CVector3DBase, (o.m_i, o.m_j, o.m_k))
 
diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h
index c72bbc7fd..db98b30f2 100644
--- a/src/blackmisc/namevariantpair.h
+++ b/src/blackmisc/namevariantpair.h
@@ -24,7 +24,6 @@ namespace BlackMisc
     class CNameVariantPair : public BlackMisc::CValueObject
     {
     public:
-
         //! Properties by index
         enum ColumnIndex
         {
@@ -35,7 +34,7 @@ namespace BlackMisc
         };
 
         //! Default constructor.
-        CNameVariantPair() {}
+        CNameVariantPair() = default;
 
         //! Constructor.
         CNameVariantPair(const QString &name, const CVariant &variant, const CIcon &icon = CIcon());
diff --git a/src/blackmisc/nwaircraftmapping.h b/src/blackmisc/nwaircraftmapping.h
index 11abbf833..1901e580f 100644
--- a/src/blackmisc/nwaircraftmapping.h
+++ b/src/blackmisc/nwaircraftmapping.h
@@ -58,14 +58,11 @@ namespace BlackMisc
             };
 
             //! Default constructor
-            CAircraftMapping() {}
+            CAircraftMapping() = default;
 
             //! Constructor
             CAircraftMapping(const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model);
 
-            //! Virtual destructor
-            virtual ~CAircraftMapping() {}
-
             //! operator ==
             bool operator ==(const CAircraftMapping &other) const;
 
@@ -118,7 +115,7 @@ namespace BlackMisc
             static const QStringList &jsonMembers();
         };
     }
-} // namespace
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Network::CAircraftMapping, (o.m_icao, o.m_model))
 Q_DECLARE_METATYPE(BlackMisc::Network::CAircraftMapping)
diff --git a/src/blackmisc/nwaircraftmodel.h b/src/blackmisc/nwaircraftmodel.h
index 4435a7a0f..03bf554a9 100644
--- a/src/blackmisc/nwaircraftmodel.h
+++ b/src/blackmisc/nwaircraftmodel.h
@@ -24,9 +24,7 @@ namespace BlackMisc
          */
         class CAircraftModel : public BlackMisc::CValueObject
         {
-
         public:
-
             //! Indexes
             enum ColumnIndex
             {
diff --git a/src/blackmisc/nwclient.h b/src/blackmisc/nwclient.h
index eefceef07..25179cd80 100644
--- a/src/blackmisc/nwclient.h
+++ b/src/blackmisc/nwclient.h
@@ -27,7 +27,6 @@ namespace BlackMisc
          */
         class CClient : public BlackMisc::CValueObject
         {
-
         public:
             //! Properties by index
             enum ColumnIndex
@@ -53,7 +52,7 @@ namespace BlackMisc
             };
 
             //! Default constructor.
-            CClient() {}
+            CClient() = default;
 
             //! Construct by callsign
             CClient(const BlackMisc::Aviation::CCallsign &callsign) : m_user(CUser(callsign)) {}
diff --git a/src/blackmisc/nwserver.h b/src/blackmisc/nwserver.h
index 4c844e190..6ee640b47 100644
--- a/src/blackmisc/nwserver.h
+++ b/src/blackmisc/nwserver.h
@@ -24,7 +24,6 @@ namespace BlackMisc
         class CServer : public BlackMisc::CValueObject
         {
         public:
-
             //! Properties by index
             enum ColumnIndex
             {
diff --git a/src/blackmisc/nwuser.h b/src/blackmisc/nwuser.h
index 0afd035cd..27d7d9f91 100644
--- a/src/blackmisc/nwuser.h
+++ b/src/blackmisc/nwuser.h
@@ -28,7 +28,6 @@ namespace BlackMisc
         class CUser : public BlackMisc::CValueObject
         {
         public:
-
             /*!
              * Properties by index
              */
@@ -42,7 +41,7 @@ namespace BlackMisc
             };
 
             //! Default constructor.
-            CUser() {}
+            CUser() = default;
 
             //! Constructor by callsign
             CUser(const BlackMisc::Aviation::CCallsign &callsign) : m_callsign(callsign) {}
@@ -144,7 +143,6 @@ namespace BlackMisc
             /*!
              * This and another user exchange missing data.
              * This user has priority and overrides first.
-             * \param otherUser
              */
             void syncronizeData(CUser &otherUser);
 
@@ -182,9 +180,7 @@ namespace BlackMisc
             BlackMisc::Aviation::CCallsign m_callsign;
             BlackMisc::Aviation::CAirportIcao m_homebase;
         };
-
     } // namespace
-
 } // namespace
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Network::CUser, (o.m_id, o.m_realname, o.m_email, o.m_password, o.m_callsign, o.m_homebase))
diff --git a/src/blackmisc/nwvoicecapabilities.h b/src/blackmisc/nwvoicecapabilities.h
index 580173c94..b5549bbd9 100644
--- a/src/blackmisc/nwvoicecapabilities.h
+++ b/src/blackmisc/nwvoicecapabilities.h
@@ -19,14 +19,12 @@ namespace BlackMisc
 {
     namespace Network
     {
-
         /*!
          * Value object encapsulating information for voice capabilities.
          */
         class CVoiceCapabilities : public BlackMisc::CValueObject
         {
         public:
-
             //! Voice capabilities
             enum VoiceCapabilities
             {
@@ -37,7 +35,7 @@ namespace BlackMisc
             };
 
             //! Default constructor.
-            CVoiceCapabilities() {}
+            CVoiceCapabilities() = default;
 
             //! Constructor by callsign
             CVoiceCapabilities(VoiceCapabilities capabilities) : m_voiceCapabilities(static_cast<int>(capabilities)) {}
@@ -122,9 +120,7 @@ namespace BlackMisc
             //! Capabilites from flight plans remarks such as "/V/"
             void setFromFlightPlanRemarks(const QString &flightPlanRemarks);
         };
-
     } // namespace
-
 } // namespace
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Network::CVoiceCapabilities, (o.m_voiceCapabilities))
diff --git a/src/blackmisc/pqacceleration.h b/src/blackmisc/pqacceleration.h
index 57a45ff1b..4c9f2a6aa 100644
--- a/src/blackmisc/pqacceleration.h
+++ b/src/blackmisc/pqacceleration.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_PQACCELERATION_H
 #define BLACKMISC_PQACCELERATION_H
+
 #include "blackmisc/pqphysicalquantity.h"
 
 namespace BlackMisc
@@ -30,13 +31,10 @@ namespace BlackMisc
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CAcceleration(const QString &unitString) : CPhysicalQuantity(unitString) {}
-
-            //! Virtual destructor
-            virtual ~CAcceleration() {}
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CAcceleration)
 
diff --git a/src/blackmisc/pqangle.h b/src/blackmisc/pqangle.h
index ddd727953..af748a7e6 100644
--- a/src/blackmisc/pqangle.h
+++ b/src/blackmisc/pqangle.h
@@ -35,9 +35,6 @@ namespace BlackMisc
             /*!
              * \brief Init as sexagesimal degrees, minutes, seconds
              * The sign of all parameters must be the same, either all positive or all negative.
-             * \param degrees
-             * \param minutes
-             * \param seconds
              */
             CAngle(int degrees, int minutes, double seconds) :
                 CPhysicalQuantity(
@@ -47,17 +44,12 @@ namespace BlackMisc
             /*!
              * \brief Init as sexagesimal degrees, minutes
              * The sign of both parameters must be the same, either both positive or both negative.
-             * \param degrees
-             * \param minutes
              */
             CAngle(int degrees, double minutes) :
                 CPhysicalQuantity(
                     degrees + minutes / 100.0,
                     CAngleUnit::sexagesimalDegMin()) {}
 
-            //! Virtual destructor
-            virtual ~CAngle() {}
-					
             //! \copydoc CValueObject::toIcon
             virtual BlackMisc::CIcon toIcon() const override;
 
@@ -72,10 +64,9 @@ namespace BlackMisc
 
             //! PI as convenience method
             static const double &PI();
-
         };
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CAngle)
 
diff --git a/src/blackmisc/pqbase.h b/src/blackmisc/pqbase.h
index 2a8a5f272..9952ff4e2 100644
--- a/src/blackmisc/pqbase.h
+++ b/src/blackmisc/pqbase.h
@@ -47,14 +47,10 @@ namespace BlackMisc
                 virtual ~Converter() {}
                 /*!
                  * Convert from this unit to default unit.
-                 * \param factor
-                 * \return
                  */
                 virtual double toDefault(double factor) const = 0;
                 /*!
                  * Convert from default unit to this unit.
-                 * \param factor
-                 * \return
                  */
                 virtual double fromDefault(double factor) const = 0;
             };
@@ -153,56 +149,56 @@ namespace BlackMisc
             //! @{
             struct One
             {
-                static double factor() { return 1; } //!< factor \return
+                static double factor() { return 1; } //!< factor
             };
             //! 2 (two)
             template <class Policy>
             struct Two
             {
-                static double factor() { return Policy::factor() * 2.0; } //!< factor \return
+                static double factor() { return Policy::factor() * 2.0; } //!< factor
             };
             //! 10^-3
             template <class Policy>
             struct Milli
             {
-                static double factor() { return Policy::factor() / 1000.0; } //!< factor \return
+                static double factor() { return Policy::factor() / 1000.0; } //!< factor
             };
             template <class Policy>
             //! 10^-2
             struct Centi
             {
-                static double factor() { return Policy::factor() / 100.0; } //!< factor \return
+                static double factor() { return Policy::factor() / 100.0; } //!< factor
             };
             //! 10^2
             template <class Policy>
             struct Hecto
             {
-                static double factor() { return Policy::factor() * 100.0; } //!< factor \return
+                static double factor() { return Policy::factor() * 100.0; } //!< factor
             };
             //! 10^3
             template <class Policy>
             struct Kilo
             {
-                static double factor() { return Policy::factor() * 1000.0; } //!< factor \return
+                static double factor() { return Policy::factor() * 1000.0; } //!< factor
             };
             //! 10^6
             template <class Policy>
             struct Mega
             {
-                static double factor() { return Policy::factor() * 1e+6; } //!< factor \return
+                static double factor() { return Policy::factor() * 1e+6; } //!< factor
             };
             //! 10^9
             template <class Policy>
             struct Giga
             {
-                static double factor() { return Policy::factor() * 1e+9; } //!< factor \return
+                static double factor() { return Policy::factor() * 1e+9; } //!< factor
             };
             //! in each hundred
             template <int Subfactor>
             struct InEachHundred
             {
-                static double fraction() { return 100.0f; } //!< fraction \return
-                static double subfactor() { return float(Subfactor); } //!< subfactor \return
+                static double fraction() { return 100.0f; } //!< fraction
+                static double subfactor() { return float(Subfactor); } //!< subfactor
             };
             //! @}
 
@@ -382,13 +378,10 @@ namespace BlackMisc
                 static CMeasurementUnit none("none", "", NilConverter(), 0, 0);
                 return none;
             }
-
-            //! Metadata, mainly needed for None
-            static void registerMetadata();
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CMeasurementUnit)
 
diff --git a/src/blackmisc/pqfrequency.h b/src/blackmisc/pqfrequency.h
index cb9ad3b93..73e1c5402 100644
--- a/src/blackmisc/pqfrequency.h
+++ b/src/blackmisc/pqfrequency.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_PQFREQUENCY_H
 #define BLACKMISC_PQFREQUENCY_H
+
 #include "pqphysicalquantity.h"
 
 namespace BlackMisc
@@ -34,13 +35,9 @@ namespace BlackMisc
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CFrequency(const QString &unitString) : CPhysicalQuantity(unitString) {}
-
-            //! Virtual destructor
-            virtual ~CFrequency() {}
         };
-
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CFrequency)
 
diff --git a/src/blackmisc/pqlength.h b/src/blackmisc/pqlength.h
index 94b6298d0..bc7a601fb 100644
--- a/src/blackmisc/pqlength.h
+++ b/src/blackmisc/pqlength.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_PQLENGTH_H
 #define BLACKMISC_PQLENGTH_H
+
 #include "blackmisc/pqphysicalquantity.h"
 
 namespace BlackMisc
@@ -30,13 +31,10 @@ namespace BlackMisc
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CLength(const QString &unitString) : CPhysicalQuantity(unitString) {}
-
-            //! Virtual destructor
-            virtual ~CLength() {}
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CLength)
 
diff --git a/src/blackmisc/pqmass.h b/src/blackmisc/pqmass.h
index 386a33c00..0b5d8ce71 100644
--- a/src/blackmisc/pqmass.h
+++ b/src/blackmisc/pqmass.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_PQMASS_H
 #define BLACKMISC_PQMASS_H
+
 #include "blackmisc/pqphysicalquantity.h"
 
 namespace BlackMisc
@@ -32,13 +33,10 @@ namespace BlackMisc
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CMass(const QString &unitString) : CPhysicalQuantity(unitString) {}
-
-            //! Virtual destructor
-            virtual ~CMass() {}
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CMass)
 
diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pqphysicalquantity.cpp
index 0413a9728..203a2da85 100644
--- a/src/blackmisc/pqphysicalquantity.cpp
+++ b/src/blackmisc/pqphysicalquantity.cpp
@@ -25,16 +25,6 @@ namespace BlackMisc
             // void
         }
 
-        /*
-         * Copy constructor
-         * (The implicitly generated copy constructor would suffice, but for what seems to be a bug in MSVC2010 template instantiation)
-         */
-        template <class MU, class PQ> CPhysicalQuantity<MU, PQ>::CPhysicalQuantity(const CPhysicalQuantity &other) :
-            CValueObject(), m_value(other.m_value), m_unit(other.m_unit)
-        {
-            // void
-        }
-
         /*
          * Equal operator ==
          */
diff --git a/src/blackmisc/pqphysicalquantity.h b/src/blackmisc/pqphysicalquantity.h
index 0b1d07ab0..1b97b4d2a 100644
--- a/src/blackmisc/pqphysicalquantity.h
+++ b/src/blackmisc/pqphysicalquantity.h
@@ -46,9 +46,6 @@ namespace BlackMisc
                 IndexValueRounded6DigitsWithUnit
             };
 
-            //! Virtual destructor
-            virtual ~CPhysicalQuantity() {}
-
             //! Unit
             MU getUnit() const { return this->m_unit; }
 
@@ -244,7 +241,7 @@ namespace BlackMisc
             CPhysicalQuantity(double value, const MU &unit);
 
             //! Copy constructor
-            CPhysicalQuantity(const CPhysicalQuantity &other);
+            CPhysicalQuantity(const CPhysicalQuantity &other) = default;
 
             //! Constructor by parsed string, e.g. 10m
             CPhysicalQuantity(const QString &unitString) : m_value(0.0), m_unit(MU::nullUnit())
@@ -277,7 +274,7 @@ namespace BlackMisc
             //! Easy access to derived class (CRTP template parameter)
             PQ *derived() { return static_cast<PQ *>(this); }
         };
-    } // namespace
-} // namespace
+    }
+}
 
 #endif // guard
diff --git a/src/blackmisc/pqpressure.h b/src/blackmisc/pqpressure.h
index 710fc6dec..285dd59c1 100644
--- a/src/blackmisc/pqpressure.h
+++ b/src/blackmisc/pqpressure.h
@@ -33,13 +33,10 @@ namespace BlackMisc
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CPressure(const QString &unitString) : CPhysicalQuantity(unitString) {}
-
-            //! Virtual destructor
-            virtual ~CPressure() {}
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CPressure)
 
diff --git a/src/blackmisc/pqspeed.h b/src/blackmisc/pqspeed.h
index 574d068d9..003cd4d1d 100644
--- a/src/blackmisc/pqspeed.h
+++ b/src/blackmisc/pqspeed.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_CSPEED_H
 #define BLACKMISC_CSPEED_H
+
 #include "pqphysicalquantity.h"
 
 namespace BlackMisc
@@ -23,7 +24,6 @@ namespace BlackMisc
          */
         class CSpeed : public CPhysicalQuantity<CSpeedUnit, CSpeed>
         {
-
         public:
             //! Default constructor
             CSpeed() : CPhysicalQuantity(0, CSpeedUnit::defaultUnit()) {}
@@ -33,13 +33,10 @@ namespace BlackMisc
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CSpeed(const QString &unitString) : CPhysicalQuantity(unitString) {}
-
-            //! Destructor
-            virtual ~CSpeed() {}
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CSpeed)
 
diff --git a/src/blackmisc/pqstring.h b/src/blackmisc/pqstring.h
index bc0ce75f9..b020b9345 100644
--- a/src/blackmisc/pqstring.h
+++ b/src/blackmisc/pqstring.h
@@ -28,10 +28,6 @@ namespace BlackMisc
          */
         class CPqString : public BlackMisc::CValueObject
         {
-        private:
-            BLACK_ENABLE_TUPLE_CONVERSION(CPqString)
-            QString m_string;
-
         protected:
             //! \copydoc CValueObject::convertToQString
             virtual QString convertToQString(bool i18n = false) const override;
@@ -65,7 +61,7 @@ namespace BlackMisc
             };
 
             //! Default constructor
-            CPqString() {}
+            CPqString() = default;
 
             //! Constructor, for values such as 10km/h
             CPqString(const QString &value) : m_string(value) {}
@@ -107,10 +103,14 @@ namespace BlackMisc
                 }
                 return invalid;
             }
+
+        private:
+            BLACK_ENABLE_TUPLE_CONVERSION(CPqString)
+            QString m_string;
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::PhysicalQuantities::CPqString, (o.m_string))
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CPqString)
diff --git a/src/blackmisc/pqtemperature.h b/src/blackmisc/pqtemperature.h
index 80a0f2614..8a461d0f0 100644
--- a/src/blackmisc/pqtemperature.h
+++ b/src/blackmisc/pqtemperature.h
@@ -11,6 +11,7 @@
 
 #ifndef BLACKMISC_CTEMPERATURE_H
 #define BLACKMISC_CTEMPERATURE_H
+
 #include "pqphysicalquantity.h"
 
 namespace BlackMisc
@@ -32,13 +33,10 @@ namespace BlackMisc
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CTemperature(const QString &unitString) : CPhysicalQuantity(unitString) {}
-
-            //! Destructor
-            virtual ~CTemperature() {}
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CTemperature)
 
diff --git a/src/blackmisc/pqtime.h b/src/blackmisc/pqtime.h
index 64a4d1a80..f8b9978ce 100644
--- a/src/blackmisc/pqtime.h
+++ b/src/blackmisc/pqtime.h
@@ -25,7 +25,6 @@ namespace BlackMisc
         class CTime : public CPhysicalQuantity<CTimeUnit, CTime>
         {
         public:
-
             //! Parts
             enum Parts
             {
@@ -49,9 +48,6 @@ namespace BlackMisc
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CTime(const QString &unitString) : CPhysicalQuantity(0, CTimeUnit::nullUnit()) { this->parseFromString(unitString); }
 
-            //! Destructor
-            virtual ~CTime() {}
-
             //! From string hh:mm, or hh:mm:ss, or time units such as s, min
             virtual void parseFromString(const QString &time) override;
 
@@ -68,11 +64,10 @@ namespace BlackMisc
 
             //! Formatted as hh:mm
             QString formattedHrsMin() const;
-
         };
 
-    } // namespace
-} // namespace
+    }
+}
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CTime)
 
diff --git a/src/blackmisc/pqunits.h b/src/blackmisc/pqunits.h
index ef2dc93fc..d686274c3 100644
--- a/src/blackmisc/pqunits.h
+++ b/src/blackmisc/pqunits.h
@@ -962,4 +962,5 @@ Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CTimeUnit)
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CAccelerationUnit)
 
 #pragma pop_macro("min")
+
 #endif // guard
diff --git a/src/blackmisc/propertyindex.cpp b/src/blackmisc/propertyindex.cpp
index e406c667b..f348fa74b 100644
--- a/src/blackmisc/propertyindex.cpp
+++ b/src/blackmisc/propertyindex.cpp
@@ -16,7 +16,7 @@ namespace BlackMisc
     /*
      * Constructor
      */
-    CPropertyIndex::CPropertyIndex() {}
+    CPropertyIndex::CPropertyIndex() = default;
 
     /*
      * Non nested index
diff --git a/src/blackmisc/setaudio.h b/src/blackmisc/setaudio.h
index 90509c51b..abf17a2e5 100644
--- a/src/blackmisc/setaudio.h
+++ b/src/blackmisc/setaudio.h
@@ -29,9 +29,6 @@ namespace BlackMisc
             //! Default constructor.
             CSettingsAudio();
 
-            //! Destructor.
-            virtual ~CSettingsAudio() {}
-
             //! Path
             static const QString &ValueNotificationFlag()
             {
diff --git a/src/blackmisc/setkeyboardhotkey.h b/src/blackmisc/setkeyboardhotkey.h
index 2ce4794f6..a5744a5ac 100644
--- a/src/blackmisc/setkeyboardhotkey.h
+++ b/src/blackmisc/setkeyboardhotkey.h
@@ -27,7 +27,6 @@ namespace BlackMisc
         class CSettingKeyboardHotkey : public CValueObject
         {
         public:
-
             //! Properties by index
             enum ColumnIndex
             {
@@ -44,7 +43,7 @@ namespace BlackMisc
             };
 
             //! Default constructor
-            CSettingKeyboardHotkey() {}
+            CSettingKeyboardHotkey() = default;
 
             //! Constructor
             CSettingKeyboardHotkey(const CHotkeyFunction &function);
@@ -138,10 +137,9 @@ namespace BlackMisc
             BLACK_ENABLE_TUPLE_CONVERSION(CSettingKeyboardHotkey)
             Hardware::CKeyboardKey m_key; //!< code similar to Qt::Key
             CHotkeyFunction m_hotkeyFunction; //!< hotkey function
-
         };
-    } // class
-} // BlackMisc
+    }
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Settings::CSettingKeyboardHotkey, (o.m_key, o.m_hotkeyFunction))
 Q_DECLARE_METATYPE(BlackMisc::Settings::CSettingKeyboardHotkey)
diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h
index fe57a47f0..ba02d96e2 100644
--- a/src/blackmisc/setnetwork.h
+++ b/src/blackmisc/setnetwork.h
@@ -32,9 +32,6 @@ namespace BlackMisc
             //! Default constructor.
             CSettingsNetwork();
 
-            //! Destructor.
-            virtual ~CSettingsNetwork() {}
-
             //! Update
             static const QString &CmdSetCurrentServer()
             {
@@ -147,5 +144,4 @@ namespace BlackMisc
 Q_DECLARE_METATYPE(BlackMisc::Settings::CSettingsNetwork)
 BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Settings::CSettingsNetwork, (o.m_trafficNetworkServers, o.m_trafficNetworkServerCurrent, o.m_bookingServiceUrl, o.m_dbusServerAddress))
 
-
 #endif // guard
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index f8c7522ad..66f2c9bdd 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -21,20 +21,16 @@ namespace BlackMisc
     /*
      * Constructors
      */
-    CStatusMessage::CStatusMessage()
-        : m_severity(SeverityDebug), m_timestamp(QDateTime::currentDateTimeUtc())
-    {}
-
     CStatusMessage::CStatusMessage(const QString &message)
-        : m_severity(SeverityDebug), m_message(message), m_timestamp(QDateTime::currentDateTimeUtc())
+        : m_message(message)
     {}
 
     CStatusMessage::CStatusMessage(StatusSeverity severity, const QString &message)
-        : m_severity(severity), m_message(message), m_timestamp(QDateTime::currentDateTimeUtc())
+        : m_severity(severity), m_message(message)
     {}
 
     CStatusMessage::CStatusMessage(const CLogCategoryList &categories, StatusSeverity severity, const QString &message)
-        : m_categories(categories), m_severity(severity), m_message(message), m_timestamp(QDateTime::currentDateTimeUtc())
+        : m_categories(categories), m_severity(severity), m_message(message)
     {}
 
     CStatusMessage::CStatusMessage(QtMsgType type, const QMessageLogContext &context, const QString &message)
diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h
index 04023950e..5d0b77b75 100644
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -47,7 +47,7 @@ namespace BlackMisc
         };
 
         //! Constructor
-        CStatusMessage();
+        CStatusMessage() = default;
 
         //! Constructor
         CStatusMessage(const QString &message);
@@ -130,9 +130,9 @@ namespace BlackMisc
     private:
         BLACK_ENABLE_TUPLE_CONVERSION(CStatusMessage)
         CLogCategoryList m_categories;
-        StatusSeverity m_severity;
+        StatusSeverity m_severity = SeverityDebug;
         QString m_message;
-        QDateTime m_timestamp;
+        QDateTime m_timestamp = QDateTime::currentDateTimeUtc();
         bool m_redundant = false;
         mutable QVector<quintptr> m_handledByObjects;
     };
diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h
index 7e8357964..f05f753bf 100644
--- a/src/blackmisc/valueobject.h
+++ b/src/blackmisc/valueobject.h
@@ -31,7 +31,6 @@
 
 namespace BlackMisc
 {
-    // forward declaration
     class CPropertyIndex;
     class CPropertyIndexList;
     class CPropertyIndexVariantMap;
@@ -39,7 +38,7 @@ namespace BlackMisc
 
     namespace PhysicalQuantities
     {
-        template <class MU, class PQ> class CPhysicalQuantity; // forward declaration
+        template <class MU, class PQ> class CPhysicalQuantity;
 
         //! Traits class to test whether a class is a physical quantity class. Useful for enable_if.
         template <class T>
@@ -57,12 +56,10 @@ namespace BlackMisc
     }
 
     /*!
-     * Base class for value objects.
-     * Public non-virtual interface with protected virtual implementation.
+     * Base class for value types.
      */
     class CValueObject
     {
-
         //! Stream << overload to be used in debugging messages
         friend QDebug operator<<(QDebug debug, const CValueObject &uc)
         {
@@ -156,7 +153,6 @@ namespace BlackMisc
          * Compares two instances of related classes
          * and returns an integer less than, equal to, or greater than zero
          * if v1 is less than, equal to, or greater than v2.
-         * \return
          * \pre The runtime types of the two objects must be the same or related by inheritance.
          */
         friend int compare(const CValueObject &v1, const CValueObject &v2);
@@ -220,7 +216,7 @@ namespace BlackMisc
         virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
         //! Property by index as String
-        //! Intentionally not abstract, avoiding all classes need to implement this method
+        //! \details Intentionally not abstract, avoiding all classes need to implement this method
         virtual QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const;
 
         //! Is given variant equal to value of property index?
@@ -230,11 +226,14 @@ namespace BlackMisc
         static const CValueObject *fromQVariant(const QVariant &variant);
 
     protected:
-        //! Default constructor
-        CValueObject() {}
+        //! Default constructor.
+        CValueObject() = default;
 
-        //! Copy constructor
-        CValueObject(const CValueObject &) {}
+        //! Copy constructor.
+        CValueObject(const CValueObject &) = default;
+
+        //! Copy assignment operator.
+        CValueObject &operator =(const CValueObject &) = default;
 
         //! String for streaming operators
         virtual QString stringForStreaming() const;
@@ -247,9 +246,7 @@ namespace BlackMisc
 
         /*!
          * Returns true if this object is an instance of the class with the given meta type ID,
-         *        or one of its subclasses.
-         * \param metaTypeId
-         * \return
+         * or one of its subclasses.
          */
         virtual bool isA(int metaTypeId) const { Q_UNUSED(metaTypeId); return false; }
 
@@ -274,85 +271,97 @@ namespace BlackMisc
 
     };
 
-    //! Standard tuple enabled value object
-    //! CRTP based approach to avoid repetitive code
-    template <class VO> class CValueObjectStdTuple : public BlackMisc::CValueObject
+    /*!
+     * Standard implementation of CValueObject using meta tuple system.
+     *
+     * \tparam Derived  The class which is inheriting from this one (CRTP).
+     */
+    template <class Derived> class CValueObjectStdTuple : public CValueObject
     {
 
     public:
-
-        //! Default constructor.
-        CValueObjectStdTuple() : CValueObject() {}
-
         //! \copydoc CValueObject::getValueHash()
         virtual uint getValueHash() const override
         {
-            return qHash(TupleConverter<VO>::toMetaTuple(*derived()));
+            return qHash(TupleConverter<Derived>::toMetaTuple(*derived()));
         }
 
         //! \copydoc CValueObject::toJson
         virtual QJsonObject toJson() const override
         {
-            return BlackMisc::serializeJson(TupleConverter<VO>::toMetaTuple(*derived()));
+            return BlackMisc::serializeJson(TupleConverter<Derived>::toMetaTuple(*derived()));
         }
 
         //! \copydoc CValueObject::convertFromJson
         virtual void convertFromJson(const QJsonObject &json) override
         {
-            BlackMisc::deserializeJson(json, TupleConverter<VO>::toMetaTuple(*derived()));
+            BlackMisc::deserializeJson(json, TupleConverter<Derived>::toMetaTuple(*derived()));
         }
 
         //! \copydoc CValueObject::toQVariant()
-        virtual QVariant toQVariant() const override { return QVariant::fromValue(*derived()); }
+        virtual QVariant toQVariant() const override
+        {
+            return QVariant::fromValue(*derived());
+        }
 
         //! \copydoc CValueObject::convertFromQVariant
-        virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(derived(), variant); }
+        virtual void convertFromQVariant(const QVariant &variant) override
+        {
+            BlackMisc::setFromQVariant(derived(), variant);
+        }
 
         //! Register metadata
         static void registerMetadata()
         {
-            qRegisterMetaType<VO>();
-            qDBusRegisterMetaType<VO>();
+            qRegisterMetaType<Derived>();
+            qDBusRegisterMetaType<Derived>();
         }
 
     protected:
+        //! Default constructor.
+        CValueObjectStdTuple() = default;
+
+        //! Copy constructor.
+        CValueObjectStdTuple(const CValueObjectStdTuple &) = default;
+
+        //! Copy assignment operator.
+        CValueObjectStdTuple &operator =(const CValueObjectStdTuple &) = default;
 
         //! \copydoc CValueObject::getMetaTypeId
-        virtual int getMetaTypeId() const override { return qMetaTypeId<VO>(); }
+        virtual int getMetaTypeId() const override
+        {
+            return qMetaTypeId<Derived>();
+        }
 
         //! \copydoc CValueObject::isA
         virtual bool isA(int metaTypeId) const override
         {
-            if (metaTypeId == qMetaTypeId<VO>()) { return true; }
+            if (metaTypeId == qMetaTypeId<Derived>()) { return true; }
             return this->CValueObject::isA(metaTypeId);
         }
 
-        //! \copydoc CValueObject::compareImpl(CValueObject &otherBase)
-        virtual int compareImpl(const CValueObject &otherBase) const override
+        //! \copydoc CValueObject::compareImpl
+        virtual int compareImpl(const CValueObject &other) const override
         {
-            const VO &other = static_cast<const VO &>(otherBase);
-            return compare(TupleConverter<VO>::toMetaTuple(*derived()), TupleConverter<VO>::toMetaTuple(other));
+            const auto &otherDerived = static_cast<const Derived &>(other);
+            return compare(TupleConverter<Derived>::toMetaTuple(*derived()), TupleConverter<Derived>::toMetaTuple(otherDerived));
         }
 
         //! \copydoc CValueObject::marshallToDbus()
         virtual void marshallToDbus(QDBusArgument &argument) const override
         {
-            argument << TupleConverter<VO>::toMetaTuple(*derived());
+            argument << TupleConverter<Derived>::toMetaTuple(*derived());
         }
 
         //! \copydoc CValueObject::unmarshallFromDbus()
         virtual void unmarshallFromDbus(const QDBusArgument &argument) override
         {
-            argument >> TupleConverter<VO>::toMetaTuple(*derived());
+            argument >> TupleConverter<Derived>::toMetaTuple(*derived());
         }
 
     private:
-        //! Easy access to derived class (CRTP template parameter)
-        VO const *derived() const { return static_cast<VO const *>(this); }
-
-        //! Easy access to derived class (CRTP template parameter)
-        VO *derived() { return static_cast<VO *>(this); }
-
+        const Derived *derived() const { return static_cast<const Derived *>(this); }
+        Derived *derived() { return static_cast<Derived *>(this); }
     };
 
     /*!
@@ -360,13 +369,6 @@ namespace BlackMisc
      * Needed because we can't rely on the friend operator in some cases due to
      * an unrelated template for streaming Container<T> in QtDBus/qdbusargument.h
      * which matches more types than it can actually handle.
-     *
-     * <a href="https://dev.vatsim-germany.org/boards/15/topics/26?r=891#message-891">Forum</a>
-     * <a href="https://dev.vatsim-germany.org/boards/15/topics/26?r=865#message-865">Forum</a>
-     *
-     * \param argument
-     * \param valueObject
-     * \return
      */
     template <class T> typename std::enable_if<std::is_base_of<CValueObject, T>::value, QDBusArgument>::type const &
     operator>>(const QDBusArgument &argument, T &valueObject)
@@ -379,13 +381,6 @@ namespace BlackMisc
      * Needed because we can't rely on the friend operator in some cases due to
      * an unrelated template for streaming Container<T> in QtDBus/qdbusargument.h
      * which matches more types than it can actually handle.
-     *
-     * <a href="https://dev.vatsim-germany.org/boards/15/topics/26?r=891#message-891">Forum</a>
-     * <a href="https://dev.vatsim-germany.org/boards/15/topics/26?r=865#message-865">Forum</a>
-     *
-     * \param argument
-     * \param valueObject
-     * \return
      */
     template <class T> typename std::enable_if<std::is_base_of<CValueObject, T>::value, QDBusArgument>::type &
     operator<<(QDBusArgument &argument, const T &valueObject)
diff --git a/src/blackmisc/voiceroom.h b/src/blackmisc/voiceroom.h
index d5838d99b..ad02e6e91 100644
--- a/src/blackmisc/voiceroom.h
+++ b/src/blackmisc/voiceroom.h
@@ -26,7 +26,6 @@ namespace BlackMisc
         class CVoiceRoom : public BlackMisc::CValueObject
         {
         public:
-
             //! Properties by index
             enum ColumnIndex
             {
diff --git a/src/blacksim/fscommon/aircraftcfgentries.h b/src/blacksim/fscommon/aircraftcfgentries.h
index 0dbdf5d15..5af1797f0 100644
--- a/src/blacksim/fscommon/aircraftcfgentries.h
+++ b/src/blacksim/fscommon/aircraftcfgentries.h
@@ -19,7 +19,6 @@ namespace BlackSim
 {
     namespace FsCommon
     {
-
         /*!
          * Set of aircraft.cfg entries representing an aircraft (FSX)
          * \remarks an entry in the aircraft.cfg is title, atc type, ... This class already bundles
@@ -28,7 +27,6 @@ namespace BlackSim
         class CAircraftCfgEntries: public BlackMisc::CValueObject
         {
         public:
-
             //! Properties by index
             enum ColumnIndex
             {
@@ -41,7 +39,7 @@ namespace BlackSim
             };
 
             //! Default constructor
-            CAircraftCfgEntries() {}
+            CAircraftCfgEntries() = default;
 
             /*!
              * Entries representing an aircraft
@@ -54,9 +52,6 @@ namespace BlackSim
              */
             CAircraftCfgEntries(const QString &filePath, qint32 index, const QString &title, const QString &atcType, const QString &atcModel, const QString &atcParkingCode);
 
-            //! Virtual destructor
-            virtual ~CAircraftCfgEntries() {}
-
             //! operator ==
             bool operator ==(const CAircraftCfgEntries &other) const;
 
@@ -153,7 +148,7 @@ namespace BlackSim
 
         };
     }
-} // namespace
+}
 
 BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::FsCommon::CAircraftCfgEntries, (o.m_index, o.m_filePath, o.m_title, o.m_atcType, o.m_atcModel, o.m_atcParkingCode))
 Q_DECLARE_METATYPE(BlackSim::FsCommon::CAircraftCfgEntries)
diff --git a/src/blacksim/fscommon/aircraftmapping.h b/src/blacksim/fscommon/aircraftmapping.h
index ad1548e62..c21c5be3e 100644
--- a/src/blacksim/fscommon/aircraftmapping.h
+++ b/src/blacksim/fscommon/aircraftmapping.h
@@ -22,18 +22,12 @@ namespace BlackSim
 {
     namespace FsCommon
     {
-
         //! Aircraft mapping class, represents one particular mapping
         class CAircraftMapping : public BlackMisc::CValueObject
         {
-
         public:
             static const qint32 InvalidId = -1; //!< Invalid mapping id
 
-        protected:
-            //! \copydoc CValueObject::convertToQString
-            virtual QString convertToQString(bool i18n = false) const;
-
             //! \copydoc CValueObject::marshallToDbus
             virtual void marshallToDbus(QDBusArgument &) const override;
 
@@ -46,20 +40,6 @@ namespace BlackSim
             //! \copydoc CValueObject::compareImpl
             int compareImpl(const CValueObject &otherBase) const override;
 
-        private:
-            BLACK_ENABLE_TUPLE_CONVERSION(CAircraftMapping)
-            qint32 m_mappingId;  //!< Kind of primary key for this particular mapping
-            qint32 m_proposalId; //!< If proposal id of the proposal
-            QString m_fsAircraftKey;          //!< Id by which the simulator can create the aircraft
-            QString m_aircraftDesignator;     //!< Aircraft designator such as B737
-            QString m_airlineDesignator;      //!< Airline designator such as DLH
-            QString m_aircraftCombinedType;   //!< Engine, type, number of engines L2J, L1P
-            QString m_wakeTurbulenceCategory; //!< Wake turbulence category H, L, M
-            QString m_aircraftColor; //!< Aircrafts painting designator, could be same as airline or specific
-            QString m_lastChanged;   //!< Simple timestamp as YYYYMMDDhhmmss
-            BlackSim::CSimulatorInfo m_simulatorInfo; //!< Mapping is for simulator
-            bool m_changed; //! Changed flag
-
         public:
             //! Columns
             enum ColumnIndex
@@ -206,9 +186,25 @@ namespace BlackSim
                 return dateTimeString;
             }
 
+        protected:
+            //! \copydoc CValueObject::convertToQString
+            virtual QString convertToQString(bool i18n = false) const;
             //! \copydoc CValueObject::toJson
             virtual QJsonObject toJson() const override;
 
+        private:
+            BLACK_ENABLE_TUPLE_CONVERSION(CAircraftMapping)
+            qint32 m_mappingId;  //!< Kind of primary key for this particular mapping
+            qint32 m_proposalId; //!< If proposal id of the proposal
+            QString m_fsAircraftKey;          //!< Id by which the simulator can create the aircraft
+            QString m_aircraftDesignator;     //!< Aircraft designator such as B737
+            QString m_airlineDesignator;      //!< Airline designator such as DLH
+            QString m_aircraftCombinedType;   //!< Engine, type, number of engines L2J, L1P
+            QString m_wakeTurbulenceCategory; //!< Wake turbulence category H, L, M
+            QString m_aircraftColor; //!< Aircrafts painting designator, could be same as airline or specific
+            QString m_lastChanged;   //!< Simple timestamp as YYYYMMDDhhmmss
+            BlackSim::CSimulatorInfo m_simulatorInfo; //!< Mapping is for simulator
+            bool m_changed; //! Changed flag
             //! \copydoc CValueObject::convertFromJson
             virtual void convertFromJson(const QJsonObject &json) override;
 
diff --git a/src/blacksim/setsimulator.h b/src/blacksim/setsimulator.h
index 7d4cddd31..ca4ce6fd9 100644
--- a/src/blacksim/setsimulator.h
+++ b/src/blacksim/setsimulator.h
@@ -29,9 +29,6 @@ namespace BlackSim
             //! Default constructor.
             CSettingsSimulator();
 
-            //! Destructor.
-            virtual ~CSettingsSimulator() {}
-
             //! Path
             static const QString &ValueSelectedDriver()
             {