Style, as_const

src/blackgui/components/aircraftmodelvalidationcomponent.cpp

@@ -63,8 +63,8 @@ namespace BlackGui
         void CAircraftModelValidationComponent::validatedModelSet(const CSimulatorInfo &simulator, const CAircraftModelList &valid, const CAircraftModelList &invalid, bool stopped, const CStatusMessageList &msgs)
         {
             // BlackMisc::Simulation::CBackgroundValidation
-            Q_UNUSED(simulator);
+            Q_UNUSED(simulator)
-            Q_UNUSED(valid);
+            Q_UNUSED(valid)
 
             constexpr int MsgTimeout = 15000;
             m_lastResults = QDateTime::currentMSecsSinceEpoch();
@@ -124,7 +124,7 @@ namespace BlackGui
             if (setup.doVerificationAtStartup() == checked) { return; }
             setup.setVerificationAtStartup(checked);
             const CStatusMessage msg = m_matchingSettings.setAndSave(setup);
-            Q_UNUSED(msg);
+            Q_UNUSED(msg)
         }
 
         void CAircraftModelValidationComponent::onOnlyErrorWarningChanged(bool checked)
@@ -133,7 +133,7 @@ namespace BlackGui
             if (setup.onlyShowVerificationWarningsAndErrors() == checked) { return; }
             setup.setOnlyShowVerificationWarningsAndErrors(checked);
             const CStatusMessage msg = m_matchingSettings.setAndSave(setup);
-            Q_UNUSED(msg);
+            Q_UNUSED(msg)
         }
 
         void CAircraftModelValidationComponent::triggerValidation()
@@ -225,7 +225,7 @@ namespace BlackGui
         void CAircraftModelValidationComponent::saveInvalidModels(const CAircraftModelList &models) const
         {
             const CStatusMessage m = models.saveInvalidModels();
-            Q_UNUSED(m);
+            Q_UNUSED(m)
         }
     } // ns
 } // ns

src/blackmisc/simulation/aircraftmodellist.cpp

@@ -1044,7 +1044,7 @@ namespace BlackMisc
         QStringList CAircraftModelList::getModelStringList(bool sort) const
         {
             QStringList ms;
-            for (const CAircraftModel &model : (*this))
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (!model.hasModelString()) { continue; }
                 ms.append(model.getModelString());
@@ -1056,7 +1056,7 @@ namespace BlackMisc
         QSet<QString> CAircraftModelList::getModelStringSet() const
         {
             QSet<QString> ms;
-            for (const CAircraftModel &model : (*this))
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (!model.hasModelString()) { continue; }
                 ms.insert(model.getModelString());
@@ -1067,7 +1067,7 @@ namespace BlackMisc
         CCountPerSimulator CAircraftModelList::countPerSimulator() const
         {
             CCountPerSimulator count;
-            for (const CAircraftModel &model : (*this))
+            for (const CAircraftModel &model : as_const(*this))
             {
                 count.increaseSimulatorCounts(model.getSimulator());
             }
@@ -1100,7 +1100,7 @@ namespace BlackMisc
         int CAircraftModelList::countModelsWithColorLivery() const
         {
             int count = 0;
-            for (const CAircraftModel &model : (*this))
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.getLivery().isColorLivery()) { count++; }
             }
@@ -1110,7 +1110,7 @@ namespace BlackMisc
         int CAircraftModelList::countModelsWithAirlineLivery() const
         {
             int count = 0;
-            for (const CAircraftModel &model : (*this))
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.getLivery().isAirlineLivery()) { count++; }
             }
@@ -1120,7 +1120,7 @@ namespace BlackMisc
         int CAircraftModelList::countVtolAircraft() const
         {
             int count = 0;
-            for (const CAircraftModel &model : (*this))
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.isVtol()) { count++; }
             }
@@ -1130,7 +1130,7 @@ namespace BlackMisc
         int CAircraftModelList::countByMode(CAircraftModel::ModelMode mode) const
         {
             int count = 0;
-            for (const CAircraftModel &model : (*this))
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.matchesMode(mode)) { count++; }
             }
@@ -1140,7 +1140,7 @@ namespace BlackMisc
         int CAircraftModelList::countMilitaryAircraft() const
         {
             int count = 0;
-            for (const CAircraftModel &model : (*this))
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.isMilitary()) { count++; }
             }
@@ -1201,7 +1201,7 @@ namespace BlackMisc
         {
             if (this->isEmpty()) { return CDistributorList(); }
             CDistributorList distributors;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 const CDistributor d(model.getDistributor());
                 if (onlyDbDistributors && !d.hasValidDbKey()) { continue; }
@@ -1216,7 +1216,7 @@ namespace BlackMisc
             if (this->isEmpty()) { return CAircraftIcaoCodeList(); }
             QSet<int> keys;
             CAircraftIcaoCodeList icaos;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 const CAircraftIcaoCode icao = model.getAircraftIcaoCode();
                 if (!icao.hasValidDbKey()) { continue; }
@@ -1232,7 +1232,7 @@ namespace BlackMisc
         QSet<QString> CAircraftModelList::getAircraftDesignators() const
         {
             QSet<QString> designators;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (!model.hasAircraftDesignator()) { continue; }
                 designators.insert(model.getAircraftIcaoCodeDesignator());
@@ -1244,7 +1244,7 @@ namespace BlackMisc
         {
             QSet<QString> designators;
             if (!airlineCode.hasValidDesignator()) { return designators; }
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.getAirlineIcaoCode() != airlineCode) { continue; }
                 designators.insert(model.getAircraftIcaoCodeDesignator());
@@ -1256,7 +1256,7 @@ namespace BlackMisc
         {
             CAircraftIcaoCodeList icaos;
             if (!airlineCode.hasValidDesignator()) { return icaos; }
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.getAirlineIcaoCode() != airlineCode) { continue; }
                 icaos.push_back(model.getAircraftIcaoCode());
@@ -1269,7 +1269,7 @@ namespace BlackMisc
             if (this->isEmpty()) { return CAirlineIcaoCodeList(); }
             QSet<int> keys;
             CAirlineIcaoCodeList icaos;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 const CAirlineIcaoCode icao = model.getAirlineIcaoCode();
                 if (!icao.hasValidDbKey()) { continue; }
@@ -1285,7 +1285,7 @@ namespace BlackMisc
         QSet<QString> CAircraftModelList::getAirlineDesignators() const
         {
             QSet<QString> designators;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (!model.hasAirlineDesignator()) { continue; }
                 designators.insert(model.getAirlineIcaoCodeDesignator());
@@ -1296,7 +1296,7 @@ namespace BlackMisc
         QSet<QString> CAircraftModelList::getAirlineVDesignators() const
         {
             QSet<QString> designators;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (!model.hasAirlineDesignator()) { continue; }
                 designators.insert(model.getAirlineIcaoCodeVDesignator());
@@ -1308,7 +1308,7 @@ namespace BlackMisc
         {
             if (groupId < 0) { return {}; }
             CAirlineIcaoCodeList icaos;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.getAirlineIcaoCode().getGroupId() == groupId)
                 {
@@ -1331,7 +1331,7 @@ namespace BlackMisc
         QSet<QString> CAircraftModelList::getCombinedTypes() const
         {
             QSet<QString> combinedCodes;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 const QString ct = model.getAircraftIcaoCode().getCombinedType();
                 if (ct.isEmpty()) { continue; }
@@ -1344,7 +1344,7 @@ namespace BlackMisc
         {
             const bool cs = CFileUtils::isFileNameCaseSensitive();
             QSet<QString> files;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (!model.hasFileName()) { continue; }
                 files.insert(cs ? model.getFileName() : model.getFileNameLowerCase());
@@ -1361,7 +1361,7 @@ namespace BlackMisc
         QSet<QString> CAircraftModelList::getAicraftAndAirlineDesignators(bool withDbId) const
         {
             QSet<QString> str;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 const QString s = (model.hasAircraftDesignator() ?
                                    (withDbId ? model.getAircraftIcaoCode().getDesignatorDbKey() : model.getAircraftIcaoCodeDesignator()) :
@@ -1426,7 +1426,7 @@ namespace BlackMisc
             CLogUtilities::addLogDetailsToList(log, remoteModel.getCallsign(), this->coverageSummaryForModel(remoteModel));
 
             int c = 1;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 CStatusMessageList subMsgs;
                 const int score = model.calculateScore(remoteModel, preferColorLiveries, log ? &subMsgs : nullptr);
@@ -1445,7 +1445,7 @@ namespace BlackMisc
         QStringList CAircraftModelList::toCompleterStrings(bool sorted, const CSimulatorInfo &simulator) const
         {
             QStringList c;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 if (model.getSimulator().matchesAny(simulator))
                 {
@@ -1467,7 +1467,7 @@ namespace BlackMisc
         {
             if (this->isEmpty()) { return CStatusMessageList(); }
             CStatusMessageList msgs;
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 const CStatusMessageList msgsModel(model.validate(false));
                 const CStatusMessage msgModel(msgsModel.toSingleMessage());
@@ -1514,7 +1514,7 @@ namespace BlackMisc
                 return msgs;
             }
 
-            for (const CAircraftModel &model : *this)
+            for (const CAircraftModel &model : as_const(*this))
             {
                 const bool valid = (model.hasDbDistributor() || model.matchesAnyDbDistributor(distributorsFromDb));
                 CAircraftModelList::addAsValidOrInvalidModel(model, valid, validModels, invalidModels);

src/blackmisc/simulation/backgroundvalidation.cpp

@@ -75,7 +75,7 @@ namespace BlackMisc
                 m_simDirectory = simDirectory;
                 m_checkedSimulatorMsgs.remove(simulator);
             }
-            QTimer::singleShot(0, this, [ = ]
+            QTimer::singleShot(5, this, [ = ]
             {
                 if (!myself) { return; }
                 myself->doWork();