Ref T182, formatting

src/blackmisc/simulation/aircraftmodellist.h

@@ -48,10 +48,10 @@ namespace BlackMisc
 
         //! Value object encapsulating a list of aircraft models
         class BLACKMISC_EXPORT CAircraftModelList :
-            public BlackMisc::CSequence<CAircraftModel>,
+            public CSequence<CAircraftModel>,
-            public BlackMisc::Db::IDatastoreObjectList<CAircraftModel, CAircraftModelList, int>,
+            public Db::IDatastoreObjectList<CAircraftModel, CAircraftModelList, int>,
-            public BlackMisc::IOrderableList<CAircraftModel, CAircraftModelList>,
+            public IOrderableList<CAircraftModel, CAircraftModelList>,
-            public BlackMisc::Mixin::MetaType<CAircraftModelList>
+            public Mixin::MetaType<CAircraftModelList>
         {
         public:
             BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftModelList)
@@ -66,10 +66,10 @@ namespace BlackMisc
             bool containsModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
 
             //! Contains model with model string or id?
-            bool containsModelStringOrDbKey(const BlackMisc::Simulation::CAircraftModel &model, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
+            bool containsModelStringOrDbKey(const Simulation::CAircraftModel &model, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
 
             //! Contains model for callsign?
-            bool containsCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
+            bool containsCallsign(const Aviation::CCallsign &callsign) const;
 
             //! Contains given combined type?
             bool containsCombinedType(const QString &combinedType) const;
@@ -106,7 +106,7 @@ namespace BlackMisc
             CAircraftModel findFirstByModelStringOrDefault(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
 
             //! Find first by callsign
-            CAircraftModel findFirstByCallsignOrDefault(const BlackMisc::Aviation::CCallsign &callsign) const;
+            CAircraftModel findFirstByCallsignOrDefault(const Aviation::CCallsign &callsign) const;
 
             //! Find models starting with
             CAircraftModelList findModelsStartingWith(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
@@ -118,13 +118,13 @@ namespace BlackMisc
             CAircraftModelList findByNotInModelStrings(const QStringList &modelStrings, Qt::CaseSensitivity sensitivity) const;
 
             //! Find by model string
-            CAircraftModelList findByIcaoDesignators(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode) const;
+            CAircraftModelList findByIcaoDesignators(const Aviation::CAircraftIcaoCode &aircraftIcaoCode, const Aviation::CAirlineIcaoCode &airlineIcaoCode) const;
 
             //! Find by model string
             CAircraftModelList findByAircraftDesignatorAndLiveryCombinedCode(const QString &aircraftDesignator, const QString &combinedCode) const;
 
             //! Find by livery code
-            CAircraftModelList findByLiveryCode(const BlackMisc::Aviation::CLivery &livery) const;
+            CAircraftModelList findByLiveryCode(const Aviation::CLivery &livery) const;
 
             //! With file name
             CAircraftModelList findWithFileName() const;
@@ -178,7 +178,7 @@ namespace BlackMisc
             QString findModelIconPathByModelString(const QString &modelString) const;
 
             //! Model icon path
-            QString findModelIconPathByCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
+            QString findModelIconPathByCallsign(const Aviation::CCallsign &callsign) const;
 
             //! All models of the FS (FSX, P3D, FS9) family
             CAircraftModelList getAllFsFamilyModels() const;
@@ -187,19 +187,19 @@ namespace BlackMisc
             CAircraftModelList getAllIncludedModels() const;
 
             //! Take a designator and find its family
-            QString designatorToFamily(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode) const;
+            QString designatorToFamily(const Aviation::CAircraftIcaoCode &aircraftIcaoCode) const;
 
             //! Find for given simulator
-            CAircraftModelList matchesSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
+            CAircraftModelList matchesSimulator(const Simulation::CSimulatorInfo &simulator) const;
 
             //! Set simulator for all elements
-            int setSimulatorInfo(const BlackMisc::Simulation::CSimulatorInfo &info);
+            int setSimulatorInfo(const Simulation::CSimulatorInfo &info);
 
             //! Which simulators are supported in that model list
             CSimulatorInfo simulatorsSupported() const;
 
             //! Set mode for all elements
-            int setModelMode(BlackMisc::Simulation::CAircraftModel::ModelMode mode);
+            int setModelMode(Simulation::CAircraftModel::ModelMode mode);
 
             //! Keep only those models with given model strings
             //! \return number of elements removed
@@ -280,10 +280,10 @@ namespace BlackMisc
             QString getCombinedTypesAsString(const QString &separator = ", ") const;
 
             //! Update aircraft ICAO
-            void updateAircraftIcao(const BlackMisc::Aviation::CAircraftIcaoCode &icao);
+            void updateAircraftIcao(const Aviation::CAircraftIcaoCode &icao);
 
             //! Update livery
-            void updateLivery(const BlackMisc::Aviation::CLivery &livery);
+            void updateLivery(const Aviation::CLivery &livery);
 
             //! From given CDistributorList update the model`s distributor order
             int updateDistributorOrder(const CDistributorList &distributors);
@@ -295,7 +295,7 @@ namespace BlackMisc
             ScoredModels scoreFull(const CAircraftModel &remoteModel, bool preferColorLiveries, bool ignoreZeroScores = true, CStatusMessageList *log = nullptr) const;
 
             //! Completer strings
-            QStringList toCompleterStrings(bool sorted = true, const BlackMisc::Simulation::CSimulatorInfo &simulator = { BlackMisc::Simulation::CSimulatorInfo::All }) const;
+            QStringList toCompleterStrings(bool sorted = true, const Simulation::CSimulatorInfo &simulator = { Simulation::CSimulatorInfo::All }) const;
 
             //! Validate for publishing
             CStatusMessageList validateForPublishing() const;
@@ -304,7 +304,7 @@ namespace BlackMisc
             CStatusMessageList validateForPublishing(CAircraftModelList &validModels, CAircraftModelList &invalidModels) const;
 
             //! Validate distributors
-            CStatusMessageList validateDistributors(const BlackMisc::Simulation::CDistributorList &distributors, CAircraftModelList &validModels, CAircraftModelList &invalidModels) const;
+            CStatusMessageList validateDistributors(const Simulation::CDistributorList &distributors, CAircraftModelList &validModels, CAircraftModelList &invalidModels) const;
 
             //! To compact JSON format
             QJsonObject toMemoizedJson() const;

src/blackmisc/simulation/simulatorinfo.cpp

@@ -129,18 +129,18 @@ namespace BlackMisc
 
         bool CSimulatorInfo::matchesAll(const CSimulatorInfo &otherInfo) const
         {
-            return (this->m_simulator & otherInfo.m_simulator) == otherInfo.m_simulator;
+            return (m_simulator & otherInfo.m_simulator) == otherInfo.m_simulator;
         }
 
         bool CSimulatorInfo::matchesAny(const CSimulatorInfo &otherInfo) const
         {
-            return (this->m_simulator & otherInfo.m_simulator) > 0;
+            return (m_simulator & otherInfo.m_simulator) > 0;
         }
 
         int CSimulatorInfo::comparePropertyByIndex(const CPropertyIndex &index, const CSimulatorInfo &compareValue) const
         {
             Q_UNUSED(index);
-            return Compare::compare(this->m_simulator, compareValue.m_simulator);
+            return Compare::compare(m_simulator, compareValue.m_simulator);
         }
 
         QString CSimulatorInfo::convertToQString(bool i18n) const
@@ -164,10 +164,10 @@ namespace BlackMisc
         QSet<CSimulatorInfo> CSimulatorInfo::asSingleSimulatorSet() const
         {
             QSet<CSimulatorInfo> set;
-            if (this->m_simulator & FSX) { set.insert(CSimulatorInfo(FSX)); }
+            if (m_simulator & FSX) { set.insert(CSimulatorInfo(FSX)); }
-            if (this->m_simulator & FS9) { set.insert(CSimulatorInfo(FS9)); }
+            if (m_simulator & FS9) { set.insert(CSimulatorInfo(FS9)); }
-            if (this->m_simulator & P3D) { set.insert(CSimulatorInfo(P3D)); }
+            if (m_simulator & P3D) { set.insert(CSimulatorInfo(P3D)); }
-            if (this->m_simulator & XPLANE) { set.insert(CSimulatorInfo(XPLANE)); }
+            if (m_simulator & XPLANE) { set.insert(CSimulatorInfo(XPLANE)); }
             return set;
         }
 
@@ -308,21 +308,21 @@ namespace BlackMisc
 
         CCountPerSimulator::CCountPerSimulator()
         {
-            this->m_counts.reserve(CSimulatorInfo::NumberOfSimulators + 1);
+            m_counts.reserve(CSimulatorInfo::NumberOfSimulators + 1);
             for (int i = 0; i < CSimulatorInfo::NumberOfSimulators + 1; i++)
             {
-                this->m_counts.push_back(0);
+                m_counts.push_back(0);
             }
         }
 
         int CCountPerSimulator::getCount(const CSimulatorInfo &simulator) const
         {
-            return this->m_counts[internalIndex(simulator)];
+            return m_counts[internalIndex(simulator)];
         }
 
         int CCountPerSimulator::getCountForUnknownSimulators() const
         {
-            return this->m_counts[CSimulatorInfo::NumberOfSimulators];
+            return m_counts[CSimulatorInfo::NumberOfSimulators];
         }
 
         int CCountPerSimulator::getMaximum() const
@@ -338,9 +338,9 @@ namespace BlackMisc
         int CCountPerSimulator::simulatorsRepresented() const
         {
             int c = 0;
-            for (int i = 0; i < this->m_counts.size() - 1; i++)
+            for (int i = 0; i < m_counts.size() - 1; i++)
             {
-                if (this->m_counts[i] > 0) { c++; }
+                if (m_counts[i] > 0) { c++; }
             }
             return c;
         }
@@ -348,9 +348,9 @@ namespace BlackMisc
         QMultiMap<int, CSimulatorInfo> CCountPerSimulator::countPerSimulator() const
         {
             QMultiMap<int, CSimulatorInfo> counts;
-            for (int i = 0; i < this->m_counts.size(); i++)
+            for (int i = 0; i < m_counts.size(); i++)
             {
-                counts.insertMulti(this->m_counts[i], simulator(i));
+                counts.insertMulti(m_counts[i], simulator(i));
             }
             return counts;
         }
@@ -365,7 +365,7 @@ namespace BlackMisc
 
         void CCountPerSimulator::setCount(int count, const CSimulatorInfo &simulator)
         {
-            this->m_counts[internalIndex(simulator)] = count;
+            m_counts[internalIndex(simulator)] = count;
         }
 
         void CCountPerSimulator::increaseSimulatorCounts(const CSimulatorInfo &simulator)
@@ -391,8 +391,7 @@ namespace BlackMisc
             case CSimulatorInfo::P3D: return 1;
             case CSimulatorInfo::FS9: return 2;
             case CSimulatorInfo::XPLANE: return 3;
-            default:
+            default: return CSimulatorInfo::NumberOfSimulators; // unknown
-                return CSimulatorInfo::NumberOfSimulators; // unknown
             }
         }
 
@@ -404,8 +403,7 @@ namespace BlackMisc
             case 1: return CSimulatorInfo(CSimulatorInfo::P3D);
             case 2: return CSimulatorInfo(CSimulatorInfo::FS9);
             case 3: return CSimulatorInfo(CSimulatorInfo::XPLANE);
-            default:
+            default: return CSimulatorInfo(CSimulatorInfo::None);
-                return CSimulatorInfo(CSimulatorInfo::None);
             }
         }
     } // ns

src/blackmisc/simulation/simulatorinfo.h

@@ -40,7 +40,7 @@ namespace BlackMisc
         //!    but need to handle XP data from the swift data store
         //! If someone manages to remove this hardocded simulator information and makes it entirely flexible
         //! based upon the plugin metadata feel free.
-        class BLACKMISC_EXPORT CSimulatorInfo : public BlackMisc::CValueObject<CSimulatorInfo>
+        class BLACKMISC_EXPORT CSimulatorInfo : public CValueObject<CSimulatorInfo>
         {
         public:
             //! Simulator
@@ -144,7 +144,7 @@ namespace BlackMisc
             //! Compare for index
             int comparePropertyByIndex(const CPropertyIndex &index, const CSimulatorInfo &compareValue) const;
 
-            //! \copydoc BlackMisc::Mixin::String::toQString
+            //! \copydoc Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Add simulator