formfactor, particle -> PolyPtr

GUI/Model/Sample/MesocrystalItem.h

@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
 #define BORNAGAIN_GUI_MODEL_SAMPLE_MESOCRYSTALITEM_H
 
-#include "GUI/Model/Descriptor/PolyItem.h"
+#include "GUI/Model/Descriptor/PolyPtr.h"
 #include "GUI/Model/Descriptor/VectorProperty.h"
 #include "GUI/Model/Sample/FormfactorCatalog.h"
 #include "GUI/Model/Sample/FormfactorItems.h"
@@ -44,7 +44,7 @@ public:
     std::unique_ptr<IFormfactor> getOuterShape() const;
     template <typename T> T* setOuterShapeType();
 
-    PolyItem<FormfactorCatalog>& outerShapeSelection() { return m_outer_shape; }
+    PolyPtr<FormfactorItem, FormfactorCatalog>& outerShapeSelection() { return m_outer_shape; }
     void setOuterShape(FormfactorItem* p) { m_outer_shape.setCertainItem(p); }
 
     ItemWithParticles* basisItem() const { return m_basis_particle.certainItem(); }
@@ -70,8 +70,8 @@ private:
     VectorProperty m_vectorA;
     VectorProperty m_vectorB;
     VectorProperty m_vectorC;
-    PolyItem<FormfactorCatalog> m_outer_shape;
-    PolyItem<ParticleCatalog> m_basis_particle;
+    PolyPtr<FormfactorItem, FormfactorCatalog> m_outer_shape;
+    PolyPtr<ItemWithParticles, ParticleCatalog> m_basis_particle;
     const MaterialsSet* m_materials;
 };