free SampleValidator from SessionItem/-Model

GUI/Model/Sample/SampleValidator.cpp

@@ -20,15 +20,8 @@
 #include "GUI/Model/Sample/ParticleCoreShellItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 
-void SampleValidator::iterateItems(const SessionItem* parentItem)
-{
-    for (const SessionItem* child : parentItem->children()) {
-        validateItem(child);
-        iterateItems(child);
-    }
-}
 
-void SampleValidator::validateItem(const SessionItem* item)
+void SampleValidator::validateItem(const ItemWithParticles* item)
 {
     if (const auto* p = dynamic_cast<const ParticleCoreShellItem*>(item)) {
         if (!p->core())
@@ -85,9 +78,8 @@ bool SampleValidator::isValidMultiLayer(const MultiLayerItem* multilayer)
         for (const auto* layout : layer->layouts()) {
             if (layout->particles().isEmpty())
                 addMessage("Particle layout doesn't contain any particles.");
-            for (const auto* particle : layout->particles()) {
+            for (const auto* particle : layout->containedItemsWithParticles()) {
                 validateItem(particle);
-                iterateItems(particle);
             }
         }
     }

GUI/Model/Sample/SampleValidator.h

@@ -15,14 +15,11 @@
 #ifndef BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEVALIDATOR_H
 #define BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEVALIDATOR_H
 
-#include <QModelIndex>
+#include <QString>
 
-class SessionItem;
 class MultiLayerItem;
-class ParticleCompositionItem;
-class ParticleCoreShellItem;
-class ParticleLayoutItem;
 class LayerItem;
+class ItemWithParticles;
 
 //! Validates SampleModel for MultiLayerItem suitable for simulation
 class SampleValidator {
@@ -32,8 +29,7 @@ public:
     QString getValidationMessage() const { return m_messages; }
 
 private:
-    void iterateItems(const SessionItem* parentItem);
-    void validateItem(const SessionItem* item);
+    void validateItem(const ItemWithParticles* item);
 
     void validateInterferences(const LayerItem* item);