refactor: Fix readability-use-anyofallof

.clang-tidy

@@ -43,6 +43,7 @@ Checks: >
   modernize-use-uncaught-exceptions,
   modernize-use-using,
   readability-use-std-min-max,
+  readability-use-anyofallof,
 
 CheckOptions:
   - key: readability-identifier-naming.ClassCase

src/core/application/applicationsettings.h

@@ -30,15 +30,10 @@ namespace swift::core::application
         //! \copydoc swift::misc::TSettingTrait::isValid
         static bool isValid(const misc::input::CActionHotkeyList &value, QString &)
         {
-            for (const auto &actionHotkey : value)
+            return std::all_of(value.cbegin(), value.cend(), [](const auto &actionHotkey) {
-            {
+                return !actionHotkey.getApplicableMachine().getMachineName().isEmpty() &&
-                if (actionHotkey.getApplicableMachine().getMachineName().isEmpty() ||
+                       !actionHotkey.getAction().isEmpty() && !actionHotkey.getCombination().isEmpty();
-                    actionHotkey.getAction().isEmpty() || actionHotkey.getCombination().isEmpty())
+            });
-                {
-                    return false;
-                }
-            }
-            return true;
         }
     };
 
@@ -66,14 +61,9 @@ namespace swift::core::application
         //! \copydoc swift::misc::TSettingTrait::isValid
         static bool isValid(const QStringList &pluginIdentifiers, QString &)
         {
-            for (const QString &pluginIdentifier : pluginIdentifiers)
+            return std::all_of(pluginIdentifiers.cbegin(), pluginIdentifiers.cend(), [](const auto &pluginIdentifier) {
-            {
+                return misc::simulation::CSimulatorPluginInfo::allIdentifiers().contains(pluginIdentifier);
-                if (!misc::simulation::CSimulatorPluginInfo::allIdentifiers().contains(pluginIdentifier))
+            });
-                {
-                    return false;
-                }
-            }
-            return true;
         }
     };
 

src/core/context/contextaudioimpl.cpp

@@ -53,11 +53,8 @@ namespace swift::core::context
 
     bool CContextAudio::hasRegisteredAudioCallsign(const CCallsign &callsign) const
     {
-        for (const CCallsign &cs : m_registeredCallsigns.values())
+        return std::any_of(m_registeredCallsigns.begin(), m_registeredCallsigns.end(),
-        {
+                           [&](const CCallsign &cs) { return callsign == cs; });
-            if (callsign == cs) { return true; }
-        }
-        return false;
     }
 
     CAudioDeviceInfoList CContextAudio::getRegisteredDevices() const { return m_registeredDevices; }

src/core/db/databasereaderconfig.cpp

@@ -125,56 +125,43 @@ namespace swift::core::db
 
     bool CDatabaseReaderConfigList::possiblyReadsFromSwiftDb() const
     {
-        for (const CDatabaseReaderConfig &config : *this)
+        return std::any_of(cbegin(), cend(),
-        {
+                           [](const CDatabaseReaderConfig &config) { return config.possiblyReadsFromSwiftDb(); });
-            if (config.possiblyReadsFromSwiftDb()) { return true; }
-        }
-        return false;
     }
 
     bool CDatabaseReaderConfigList::possiblyWritesToSwiftDb() const
     {
-        for (const CDatabaseReaderConfig &config : *this)
+        return std::any_of(cbegin(), cend(),
-        {
+                           [](const CDatabaseReaderConfig &config) { return config.possiblyWritesToSwiftDb(); });
-            if (config.possiblyWritesToSwiftDb()) { return true; }
-        }
-        return false;
     }
 
     bool CDatabaseReaderConfigList::needsSharedInfoObjects(CEntityFlags::Entity entities) const
     {
-        for (const CDatabaseReaderConfig &config : *this)
+        return std::any_of(cbegin(), cend(), [&](const CDatabaseReaderConfig &config) {
-        {
+            return config.supportsEntities(entities) && config.needsSharedInfoFile();
-            if (!config.supportsEntities(entities)) { continue; }
+        });
-            if (config.needsSharedInfoFile()) { return true; }
-        }
-        return false;
     }
 
     bool CDatabaseReaderConfigList::needsSharedInfoFile(CEntityFlags::Entity entities) const
     {
-        for (const CDatabaseReaderConfig &config : *this)
+        return std::any_of(cbegin(), cend(), [&](const CDatabaseReaderConfig &config) {
-        {
+            return config.supportsEntities(entities) && config.needsSharedInfoFile();
-            if (!config.supportsEntities(entities)) { continue; }
+        });
-            if (config.needsSharedInfoFile()) { return true; }
-        }
-        return false;
     }
 
     bool CDatabaseReaderConfigList::needsSharedInfoObjectsIfCachesEmpty(CEntityFlags::Entity entities,
                                                                         CEntityFlags::Entity cachedEntities) const
     {
-        for (const CDatabaseReaderConfig &config : *this)
+        return std::any_of(this->begin(), this->end(),
-        {
+                           [&entities, &cachedEntities](const CDatabaseReaderConfig &config) {
-            if (!config.supportsEntities(entities)) { continue; }
+                               if (!config.supportsEntities(entities)) return false;
-            if (!config.needsSharedInfoFile()) { continue; }
+                               if (!config.needsSharedInfoFile()) return false;
-            if (!config.getRetrievalMode().testFlag(CDbFlags::Cached)) { return true; } // does not support caching
+                               if (!config.getRetrievalMode().testFlag(CDbFlags::Cached)) return true;
 
                                const CEntityFlags::Entity configEntities = config.getEntities();
                                const CEntityFlags::Entity configEntitiesNotCached = configEntities & ~cachedEntities;
-            if (configEntitiesNotCached != CEntityFlags::NoEntity) { return true; } // we have entities not yet cached
+                               return configEntitiesNotCached != CEntityFlags::NoEntity;
-        }
+                           });
-        return false;
     }
 
     CEntityFlags::Entity CDatabaseReaderConfigList::getEntitesCachedOrReadFromDB() const

src/core/pluginmanager.cpp

@@ -52,12 +52,8 @@ namespace swift::core
         if (!data.contains("identifier") || !data["identifier"].isString()) { return false; }
 
         auto iids = acceptedIids();
-        for (const QString &iid : iids)
+        return std::any_of(iids.cbegin(), iids.cend(),
-        {
+                           [&](const QString &iid) { return metadata["IID"].toString() == iid; });
-            if (metadata["IID"].toString() == iid) { return true; }
-        }
-
-        return false;
     }
 
     QString IPluginManager::pluginIdentifier(const QJsonObject &metadata) const

src/gui/models/columns.cpp

@@ -201,11 +201,8 @@ namespace swift::gui::models
 
     bool CColumns::hasAnyWidthPercentage() const
     {
-        for (const CColumn &c : m_columns)
+        return std::any_of(m_columns.cbegin(), m_columns.cend(),
-        {
+                           [](const CColumn &c) { return c.hasWidthPercentage(); });
-            if (c.hasWidthPercentage()) { return true; }
-        }
-        return false;
     }
 
     void CColumns::setWidthPercentages(const QList<int> &percentages)

src/misc/audio/audiodeviceinfolist.cpp

@@ -121,11 +121,9 @@ namespace swift::misc::audio
     bool CAudioDeviceInfoList::hasSameDevices(const CAudioDeviceInfoList &compareDevices) const
     {
         if (compareDevices.size() != this->size()) { return false; }
-        for (const CAudioDeviceInfo &d : *this)
+        return std::all_of(cbegin(), cend(), [&](const CAudioDeviceInfo &d) {
-        {
+            return compareDevices.findRegisteredDeviceOrDefault(d).isValid();
-            if (!compareDevices.findRegisteredDeviceOrDefault(d).isValid()) { return false; }
+        });
-        }
-        return true;
     }
 
     CAudioDeviceInfoList CAudioDeviceInfoList::allInputDevices()

src/misc/aviation/aircraftsituationlist.cpp

@@ -74,11 +74,9 @@ namespace swift::misc::aviation
 
     bool CAircraftSituationList::areAllOnGroundDetailsSame(COnGroundInfo::OnGroundDetails details) const
     {
-        for (const CAircraftSituation &situation : *this)
+        return std::all_of(cbegin(), cend(), [&](const CAircraftSituation &situation) {
-        {
+            return situation.getOnGroundInfo().getGroundDetails() == details;
-            if (situation.getOnGroundInfo().getGroundDetails() != details) { return false; }
+        });
-        }
-        return true;
     }
 
     bool CAircraftSituationList::isConstOnGround() const
@@ -242,11 +240,9 @@ namespace swift::misc::aviation
 
     bool CAircraftSituationList::containsPushBack() const
     {
-        for (const CAircraftSituation &situation : *this)
+        return std::any_of(cbegin(), cend(), [](const CAircraftSituation &situation) {
-        {
+            return situation.getGroundSpeed().isNegativeWithEpsilonConsidered();
-            if (situation.getGroundSpeed().isNegativeWithEpsilonConsidered()) { return true; }
+        });
-        }
-        return false;
     }
 
     int CAircraftSituationList::countOnGround(COnGroundInfo::IsOnGround og) const

src/misc/aviation/callsign.cpp

@@ -402,11 +402,7 @@ namespace swift::misc::aviation
     {
         if (!callsign.contains("_")) { return false; }
         const QStringView uc = callsign.toUpper();
-
+        return std::any_of(CCallsign::atcAlikeCallsignSuffixes().cbegin(), CCallsign::atcAlikeCallsignSuffixes().cend(),
-        for (const QString &r : CCallsign::atcAlikeCallsignSuffixes())
+                           [&](const QString &r) { return uc.endsWith(r); });
-        {
-            if (uc.endsWith(r)) { return true; }
-        }
-        return false;
     }
 } // namespace swift::misc::aviation

src/misc/db/artifact.cpp

@@ -46,12 +46,10 @@ namespace swift::misc::db
     bool CArtifact::isWithDistribution(const CDistribution &distribution, bool acceptMoreStableDistributions) const
     {
         if (distribution.isEmpty() || !this->hasDistributions()) { return false; }
-        for (const CDistribution &dist : this->getDistributions())
+        return std::any_of(
-        {
+            this->getDistributions().cbegin(), this->getDistributions().cend(), [&](const CDistribution &dist) {
-            if (dist == distribution) { return true; }
+                return dist == distribution || (acceptMoreStableDistributions && dist.isStabilityBetter(distribution));
-            if (acceptMoreStableDistributions && dist.isStabilityBetter(distribution)) { return true; }
+            });
-        }
-        return false;
     }
 
     CRemoteFile CArtifact::asRemoteFile() const

src/misc/db/datastoreobjectlist.h

@@ -241,22 +241,17 @@ namespace swift::misc::db
         //! Any object without key?
         bool containsAnyObjectWithoutKey() const
         {
-            for (const OBJ &obj : ITimestampObjectList<OBJ, CONTAINER>::container())
+            return std::any_of(ITimestampObjectList<OBJ, CONTAINER>::container().cbegin(),
-            {
+                               ITimestampObjectList<OBJ, CONTAINER>::container().cend(),
-                if (!obj.hasValidDbKey()) { return true; }
+                               [](const OBJ &obj) { return !obj.hasValidDbKey(); });
-            }
-            return false;
         }
 
         //! Contains object with key?
         bool containsDbKey(KEYTYPE key) const
         {
-            for (const OBJ &obj : ITimestampObjectList<OBJ, CONTAINER>::container())
+            return std::any_of(ITimestampObjectList<OBJ, CONTAINER>::container().cbegin(),
-            {
+                               ITimestampObjectList<OBJ, CONTAINER>::container().cend(),
-                if (!obj.hasValidDbKey()) { continue; }
+                               [&](const OBJ &obj) { return obj.hasValidDbKey() && obj.getDbKey() == key; });
-                if (obj.getDbKey() == key) { return true; }
-            }
-            return false;
         }
 
         //! From multiple JSON formats

src/misc/directoryutils.cpp

@@ -58,12 +58,10 @@ namespace swift::misc
 
         if (!recursively) { return false; }
         const QStringList relSubDirs = CDirectoryUtils::getRelativeSubDirectories(dir);
-        for (const QString &relSubDir : relSubDirs)
+        return std::any_of(relSubDirs.cbegin(), relSubDirs.cend(), [&](const QString &relSubDir) {
-        {
             const QString absSubDir = CFileUtils::appendFilePaths(directory.absolutePath(), relSubDir);
-            if (CDirectoryUtils::containsFileInDir(absSubDir, filter, recursively)) { return true; }
+            return CDirectoryUtils::containsFileInDir(absSubDir, filter, recursively);
-        }
+        });
-        return false;
     }
 
     bool CDirectoryUtils::existsUnemptyDirectory(const QString &testDir)

src/misc/fileutils.cpp

@@ -217,11 +217,8 @@ namespace swift::misc
         int d2 = 0;
         dirs1Cleaned.sort(cs);
         dirs2Cleaned.sort(cs);
-        for (const QString &d1 : dirs1)
+        return std::all_of(dirs1.cbegin(), dirs1.cend(),
-        {
+                           [&](const QString &d1) { return stringCompare(d1, dirs2.at(d2), cs); });
-            if (!stringCompare(d1, dirs2.at(d2), cs)) { return false; }
-        }
-        return true;
     }
 
     Qt::CaseSensitivity CFileUtils::osFileNameCaseSensitivity()
@@ -258,11 +255,8 @@ namespace swift::misc
                                          Qt::CaseSensitivity cs)
     {
         if (excludeDirectories.isEmpty()) { return false; }
-        for (const QString &ex : excludeDirectories)
+        return std::any_of(excludeDirectories.cbegin(), excludeDirectories.cend(),
-        {
+                           [&](const QString &ex) { return matchesExcludeDirectory(directoryPath, ex, cs); });
-            if (matchesExcludeDirectory(directoryPath, ex, cs)) { return true; }
-        }
-        return false;
     }
 
     QStringList CFileUtils::removeSubDirectories(const QStringList &directories, Qt::CaseSensitivity cs)

src/misc/network/rolelist.cpp

@@ -20,11 +20,7 @@ namespace swift::misc::network
 
     bool CRoleList::hasAnyRole(const QStringList &roles) const
     {
-        for (const QString &r : roles)
+        return std::any_of(roles.cbegin(), roles.cend(), [&](const QString &r) { return this->hasRole(r); });
-        {
-            if (this->hasRole(r)) { return true; }
-        }
-        return false;
     }
 
     CRoleList::CRoleList(const CSequence<CRole> &other) : CSequence<CRole>(other) {}

src/misc/network/serverlist.cpp

@@ -11,11 +11,7 @@ namespace swift::misc::network
 
     bool CServerList::containsName(const QString &name) const
     {
-        for (const CServer &s : *this)
+        return std::any_of(cbegin(), cend(), [&](const CServer &s) { return s.matchesName(name); });
-        {
-            if (s.matchesName(name)) { return true; }
-        }
-        return false;
     }
 
     bool CServerList::removeByName(const QString &name)
@@ -39,11 +35,7 @@ namespace swift::misc::network
 
     bool CServerList::containsAddressPort(const CServer &server)
     {
-        for (const CServer &s : *this)
+        return std::any_of(cbegin(), cend(), [&](const CServer &s) { return s.matchesAddressPort(server); });
-        {
-            if (s.matchesAddressPort(server)) { return true; }
-        }
-        return false;
     }
 
     void CServerList::addIfAddressNotExists(const CServer &server)

src/misc/orderablelist.h

@@ -40,11 +40,8 @@ namespace swift::misc
         //! All order values set or missing some?
         bool needsOrder() const
         {
-            for (const OBJ &obj : container())
+            return std::any_of(this->container().begin(), this->container().end(),
-            {
+                               [](const OBJ &obj) { return !obj.hasValidOrder(); });
-                if (!obj.hasValidOrder()) { return true; }
-            }
-            return false;
         }
 
         //! All order values IOrderable::order

src/misc/pq/measurementunit.h

@@ -443,11 +443,9 @@ namespace swift::misc::physical_quantities
         static bool isValidUnitSymbol(const QString &symbol, Qt::CaseSensitivity caseSensitivity)
         {
             if (symbol.isEmpty()) return false;
-            for (const auto &unit : U::allUnits())
+            return std::any_of(U::allUnits().cbegin(), U::allUnits().cend(), [&](const auto &unit) {
-            {
+                return stringCompare(unit.getSymbol(), symbol, caseSensitivity);
-                if (stringCompare(unit.getSymbol(), symbol, caseSensitivity)) { return true; }
+            });
-            }
-            return false;
         }
 
         /*!
@@ -477,11 +475,8 @@ namespace swift::misc::physical_quantities
                                            Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive)
         {
             if (candidate.isEmpty()) return false;
-            for (const auto &unit : U::allUnits())
+            return std::any_of(U::allUnits().cbegin(), U::allUnits().cend(),
-            {
+                               [&](const auto &unit) { return candidate.endsWith(unit.getSymbol(), caseSensitivity); });
-                if (candidate.endsWith(unit.getSymbol(), caseSensitivity)) { return true; }
-            }
-            return false;
         }
 
         //! Dimensionless unit

src/misc/simulation/aircraftmodellist.cpp

@@ -40,22 +40,18 @@ namespace swift::misc::simulation
 
     bool CAircraftModelList::containsModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const
     {
-        for (const CAircraftModel &model : (*this))
+        return std::any_of(cbegin(), cend(), [&](const CAircraftModel &model) {
-        {
+            return model.matchesModelString(modelString, sensitivity);
-            if (model.matchesModelString(modelString, sensitivity)) { return true; }
+        });
-        }
-        return false;
     }
 
     bool CAircraftModelList::containsModelStringOrDbKey(const CAircraftModel &model,
                                                         Qt::CaseSensitivity sensitivity) const
     {
-        for (const CAircraftModel &m : (*this))
+        return std::any_of(cbegin(), cend(), [&](const CAircraftModel &m) {
-        {
+            return (m.hasValidDbKey() && m.getDbKey() == model.getDbKey()) ||
-            if (m.hasValidDbKey() && m.getDbKey() == model.getDbKey()) { return true; }
+                   m.matchesModelString(model.getModelString(), sensitivity);
-            if (m.matchesModelString(model.getModelString(), sensitivity)) { return true; }
+        });
-        }
-        return false;
     }
 
     bool CAircraftModelList::containsCallsign(const CCallsign &callsign) const

src/misc/simulation/distributorlist.cpp

@@ -72,11 +72,8 @@ namespace swift::misc::simulation
 
     bool CDistributorList::matchesAnyKeyOrAlias(const QString &keyOrAlias) const
     {
-        for (const CDistributor &distributor : (*this))
+        return std::any_of(cbegin(), cend(),
-        {
+                           [&](const CDistributor &distributor) { return distributor.matchesKeyOrAlias(keyOrAlias); });
-            if (distributor.matchesKeyOrAlias(keyOrAlias)) { return true; }
-        }
-        return false;
     }
 
     QStringList CDistributorList::getDbKeysAndAliases(bool sort) const

src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp

@@ -66,11 +66,9 @@ namespace swift::misc::simulation::fscommon
     bool CAircraftCfgEntriesList::containsTitle(const QString &title) const
     {
         if (title.isEmpty()) { return false; }
-        for (const CAircraftCfgEntries &entries : (*this))
+        return std::any_of(cbegin(), cend(), [&](const CAircraftCfgEntries &entries) {
-        {
+            return stringCompare(entries.getTitle(), title, Qt::CaseInsensitive);
-            if (stringCompare(entries.getTitle(), title, Qt::CaseInsensitive)) { return true; }
+        });
-        }
-        return false;
     }
 
     CAircraftModelList CAircraftCfgEntriesList::toAircraftModelList(bool ignoreDuplicatesAndEmptyModelStrings,

src/misc/simulation/interpolation/interpolationsetupprovider.cpp

@@ -178,11 +178,9 @@ namespace swift::misc::simulation
     {
         const SetupsPerCallsign setupsCopy = this->getSetupsPerCallsign();
         if (setupsCopy.isEmpty()) { return false; }
-        for (const CInterpolationAndRenderingSetupPerCallsign &setup : setupsCopy)
+        return std::any_of(
-        {
+            setupsCopy.cbegin(), setupsCopy.cend(),
-            if (setup.logInterpolation()) { return true; }
+            [](const CInterpolationAndRenderingSetupPerCallsign &setup) { return setup.logInterpolation(); });
-        }
-        return false;
     }
 
     IInterpolationSetupProvider::SetupsPerCallsign IInterpolationSetupProvider::getSetupsPerCallsign() const

src/misc/timestampobjectlist.h

@@ -458,21 +458,15 @@ namespace swift::misc
         //! Any negative or zero offset time?
         bool containsZeroOrNegativeOffsetTime() const
         {
-            for (const ITimestampWithOffsetBased &obj : this->container())
+            return std::any_of(this->container().begin(), this->container().end(),
-            {
+                               [](const ITimestampWithOffsetBased &obj) { return obj.getTimeOffsetMs() <= 0; });
-                if (obj.getTimeOffsetMs() <= 0) { return true; }
-            }
-            return false;
         }
 
         //! Any negative offset time?
         bool containsNegativeOffsetTime() const
         {
-            for (const ITimestampWithOffsetBased &obj : this->container())
+            return std::any_of(this->container().begin(), this->container().end(),
-            {
+                               [](const ITimestampWithOffsetBased &obj) { return obj.getTimeOffsetMs() < 0; });
-                if (obj.getTimeOffsetMs() < 0) { return true; }
-            }
-            return false;
         }
 
         //! Adds a time to all offset values