From c43fba9abdd3b395597546c00b7030012c8e5837 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 29 Aug 2018 02:38:48 +0200
Subject: [PATCH] Ref T308, style

---
 src/blackmisc/aviation/aircrafticaocodelist.cpp | 2 +-
 src/blackmisc/aviation/aircrafticaocodelist.h   | 5 ++---
 src/blackmisc/aviation/liverylist.h             | 4 ++--
 src/blackmisc/simulation/aircraftmodellist.cpp  | 2 +-
 src/blackmisc/simulation/distributor.h          | 6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/blackmisc/aviation/aircrafticaocodelist.cpp b/src/blackmisc/aviation/aircrafticaocodelist.cpp
index d56219336..47c4def06 100644
--- a/src/blackmisc/aviation/aircrafticaocodelist.cpp
+++ b/src/blackmisc/aviation/aircrafticaocodelist.cpp
@@ -42,7 +42,7 @@ namespace BlackMisc
             int current = 0;
             CAircraftIcaoCode found;
             const QString d(designator.trimmed().toUpper());
-            for (const CAircraftIcaoCode &code : * this)
+            for (const CAircraftIcaoCode &code : *this)
             {
                 if (!code.matchesDesignator(d, cutoff, &current)) { continue; }
                 if (current == 100.0) { return code; }
diff --git a/src/blackmisc/aviation/aircrafticaocodelist.h b/src/blackmisc/aviation/aircrafticaocodelist.h
index 5a9643efb..ce649cba3 100644
--- a/src/blackmisc/aviation/aircrafticaocodelist.h
+++ b/src/blackmisc/aviation/aircrafticaocodelist.h
@@ -21,7 +21,6 @@
 
 #include <QJsonArray>
 #include <QMetaType>
-#include <QString>
 #include <QStringList>
 #include <tuple>
 
@@ -32,8 +31,8 @@ namespace BlackMisc
         //! Value object encapsulating a list of ICAO codes.
         class BLACKMISC_EXPORT CAircraftIcaoCodeList :
             public CSequence<CAircraftIcaoCode>,
-            public BlackMisc::Db::IDatastoreObjectList<CAircraftIcaoCode, CAircraftIcaoCodeList, int>,
-            public BlackMisc::Mixin::MetaType<CAircraftIcaoCodeList>
+            public Db::IDatastoreObjectList<CAircraftIcaoCode, CAircraftIcaoCodeList, int>,
+            public Mixin::MetaType<CAircraftIcaoCodeList>
         {
         public:
             BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftIcaoCodeList)
diff --git a/src/blackmisc/aviation/liverylist.h b/src/blackmisc/aviation/liverylist.h
index 2742532a1..88e31e5a7 100644
--- a/src/blackmisc/aviation/liverylist.h
+++ b/src/blackmisc/aviation/liverylist.h
@@ -31,8 +31,8 @@ namespace BlackMisc
         //! Value object for a list of airports.
         class BLACKMISC_EXPORT CLiveryList :
             public CSequence<CLivery>,
-            public BlackMisc::Db::IDatastoreObjectList<CLivery, CLiveryList, int>,
-            public BlackMisc::Mixin::MetaType<CLiveryList>
+            public Db::IDatastoreObjectList<CLivery, CLiveryList, int>,
+            public Mixin::MetaType<CLiveryList>
         {
         public:
             BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CLiveryList)
diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp
index 231e1e953..09c0c6e6e 100644
--- a/src/blackmisc/simulation/aircraftmodellist.cpp
+++ b/src/blackmisc/simulation/aircraftmodellist.cpp
@@ -10,7 +10,7 @@
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/matchingutils.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/aviation/livery.h"
+#include "blackmisc/aviation/liverylist.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/compare.h"
 #include "blackmisc/iterator.h"
diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h
index 100b9803c..37ea8abbe 100644
--- a/src/blackmisc/simulation/distributor.h
+++ b/src/blackmisc/simulation/distributor.h
@@ -32,9 +32,9 @@ namespace BlackMisc
     {
         //! Value object encapsulating information of software distributor.
         class BLACKMISC_EXPORT CDistributor :
-            public BlackMisc::CValueObject<CDistributor>,
-            public BlackMisc::Db::IDatastoreObjectWithStringKey,
-            public BlackMisc::IOrderable
+            public CValueObject<CDistributor>,
+            public Db::IDatastoreObjectWithStringKey,
+            public IOrderable
         {
         public:
             //! Property indexes