Ref T298, exclude models

src/blackmisc/db/datastoreobjectlist.h

@@ -48,7 +48,7 @@ namespace BlackMisc
             //! Max.key value (making sense with integer key)
             KEYTYPE getMaxKey(bool *ok = nullptr) const;
 
-            //! Remove objects with key
+            //! Remove objects with keys
             int removeObjectsWithKeys(const QSet<KEYTYPE> &keys);
 
             //! Remove objects without key

src/blackmisc/simulation/aircraftmodellist.cpp

@@ -523,39 +523,33 @@ namespace BlackMisc
         int CAircraftModelList::removeAllWithoutModelString()
         {
             if (this->isEmpty()) { return 0; }
-            int c = 0;
+            const int s = this->size();
-            for (auto it = this->begin(); it != this->end();)
+            CAircraftModelList withModelStr;
+            for (const CAircraftModel &model : *this)
             {
-                if (it->hasModelString())
+                if (!model.hasModelString()) { continue; }
-                {
+                withModelStr.push_back(model);
-                    ++it;
             }
-                else
+            const int diff =  s - withModelStr.size();
-                {
+            if (diff < 1) { return 0; }
-                    c++;
+            *this = withModelStr;
-                    it = this->erase(it);
+            return diff;
-                }
-            }
-            return c;
         }
 
         int CAircraftModelList::removeIfExcluded()
         {
             if (this->isEmpty()) { return 0; }
-            int c = 0;
+            const int s = this->size();
-            for (auto it = this->begin(); it != this->end();)
+            CAircraftModelList onlyIncluded;
+            for (const CAircraftModel &model : *this)
             {
-                if (it->getModelMode() != CAircraftModel::Exclude)
+                if (model.getModelMode() == CAircraftModel::Exclude) { continue; }
-                {
+                onlyIncluded.push_back(model);
-                    ++it;
             }
-                else
+            const int diff =  s - onlyIncluded.size();
-                {
+            if (diff < 1) { return 0; }
-                    c++;
+            *this = onlyIncluded;
-                    it = this->erase(it);
+            return diff;
-                }
-            }
-            return c;
         }
 
         int CAircraftModelList::replaceOrAddModelsWithString(const CAircraftModelList &addOrReplaceList, Qt::CaseSensitivity sensitivity)