From 070577dae835472a0095b2c7b709ca136b682fbd Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 28 Jan 2019 19:36:21 +0100
Subject: [PATCH] Ref T515, utility functions for modellist, renamed to find
 "findFsFamilyModels"

---
 src/blackcore/db/databaseutils.cpp             |  2 +-
 src/blackmisc/simulation/aircraftmodellist.cpp | 16 ++++++++++++----
 src/blackmisc/simulation/aircraftmodellist.h   |  5 ++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/blackcore/db/databaseutils.cpp b/src/blackcore/db/databaseutils.cpp
index 039930c54..e43d3f20c 100644
--- a/src/blackcore/db/databaseutils.cpp
+++ b/src/blackcore/db/databaseutils.cpp
@@ -295,7 +295,7 @@ namespace BlackCore
         CAircraftModelList CDatabaseUtils::updateSimulatorForFsFamily(const CAircraftModelList &ownModels, CStatusMessageList *updateInfo, int maxToStash, IProgressIndicator *progressIndicator, bool processEvents)
         {
             if (!sApp || !sApp->getWebDataServices() || sApp->isShuttingDown()) { return CAircraftModelList(); }
-            const CAircraftModelList dbFsFamilyModels(sApp->getWebDataServices()->getModels().getAllFsFamilyModels());
+            const CAircraftModelList dbFsFamilyModels(sApp->getWebDataServices()->getModels().findFsFamilyModels());
             CAircraftModelList stashModels;
             if (dbFsFamilyModels.isEmpty() || ownModels.isEmpty()) { return stashModels; }
             const QSet<QString> dbKeys = dbFsFamilyModels.getModelStringSet();
diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp
index 831359749..737c4602a 100644
--- a/src/blackmisc/simulation/aircraftmodellist.cpp
+++ b/src/blackmisc/simulation/aircraftmodellist.cpp
@@ -358,7 +358,7 @@ namespace BlackMisc
             });
         }
 
-        CAircraftModelList CAircraftModelList::getAllFsFamilyModels() const
+        CAircraftModelList CAircraftModelList::findFsFamilyModels() const
         {
             return this->findBy([](const CAircraftModel & model)
             {
@@ -366,6 +366,14 @@ namespace BlackMisc
             });
         }
 
+        CAircraftModelList CAircraftModelList::findNonFsFamilyModels() const
+        {
+            return this->findBy([](const CAircraftModel & model)
+            {
+                return !model.getSimulator().isMicrosoftOrPrepare3DSimulator();
+            });
+        }
+
         CAircraftModelList CAircraftModelList::getAllIncludedModels() const
         {
             return this->findBy([](const CAircraftModel & model)
@@ -734,7 +742,7 @@ namespace BlackMisc
         int CAircraftModelList::removeIfNotFsFamily()
         {
             if (this->isEmpty()) { return 0; }
-            CAircraftModelList fsOnly = this->getAllFsFamilyModels();
+            CAircraftModelList fsOnly = this->findFsFamilyModels();
             if (fsOnly.size() == this->size()) { return 0; }
             const int delta = this->size() - fsOnly.size();
             *this = fsOnly;
@@ -1325,8 +1333,8 @@ namespace BlackMisc
             }
 
             // Summary
-            const CStatusMessage m1(this, CStatusMessage::SeverityInfo, QStringLiteral("File validation valid models: %1").arg(validModels.size()));
-            const CStatusMessage m2(this, CStatusMessage::SeverityWarning, QStringLiteral("File validation invalid models: %1").arg(invalidModels.size()));
+            const CStatusMessage m1(this, CStatusMessage::SeverityInfo, QStringLiteral("File validation, valid models: %1").arg(validModels.size()));
+            const CStatusMessage m2(this, CStatusMessage::SeverityWarning, QStringLiteral("File validation, invalid models: %1").arg(invalidModels.size()));
             msgs.push_back(m1);
             msgs.push_back(m2);
 
diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h
index 55d366b60..0c6c34791 100644
--- a/src/blackmisc/simulation/aircraftmodellist.h
+++ b/src/blackmisc/simulation/aircraftmodellist.h
@@ -223,7 +223,10 @@ namespace BlackMisc
             CAircraftModelList findDuplicateModelStrings() const;
 
             //! All models of the FS (FSX, P3D, FS9) family
-            CAircraftModelList getAllFsFamilyModels() const;
+            CAircraftModelList findFsFamilyModels() const;
+
+            //! All models NOT of the FS (FSX, P3D, FS9) family
+            CAircraftModelList findNonFsFamilyModels() const;
 
             //! All included models
             CAircraftModelList getAllIncludedModels() const;