XML::writeChosen with template paremeters B, C

GUI/Model/Mask/MasksSet.cpp

@@ -40,7 +40,7 @@ RegionOfInterestItem* MasksSet::regionOfInterestItem() const
 void MasksSet::writeTo(QXmlStreamWriter* w) const
 {
     for (const MaskItem* t : *this)
-        XML::writeChosen<MaskCatalog>(t, w, Tag::Mask);
+        XML::writeChosen<MaskItem, MaskCatalog>(t, w, Tag::Mask);
 }
 
 void MasksSet::readFrom(QXmlStreamReader* r)

GUI/Model/Sample/CompoundItem.cpp

@@ -63,7 +63,7 @@ void CompoundItem::writeTo(QXmlStreamWriter* w) const
 {
     XML::writeBaseElement<ItemWithParticles>(w, XML::Tag::BaseData, this);
     for (auto* t : m_particles)
-        XML::writeChosen<ParticleCatalog>(t, w, Tag::Particle);
+        XML::writeChosen<ItemWithParticles, ParticleCatalog>(t, w, Tag::Particle);
     XML::writeTaggedValue(w, Tag::ExpandCompoundGroupbox, expandCompound);
 }
 

GUI/Model/Sample/ParticleLayoutItem.cpp

@@ -101,7 +101,7 @@ void ParticleLayoutItem::writeTo(QXmlStreamWriter* w) const
     m_own_density.writeTo2(w, Tag::OwnDensity);
     XML::writeTaggedElement(w, Tag::InterferenceFunction, m_interference);
     for (auto* t : m_particles)
-        XML::writeChosen<ParticleCatalog>(t, w, Tag::Particle);
+        XML::writeChosen<ItemWithParticles, ParticleCatalog>(t, w, Tag::Particle);
     XML::writeTaggedValue(w, Tag::ExpandLayoutGroupbox, expandParticleLayout);
     XML::writeTaggedValue(w, Tag::ExpandInterferenceGroupbox, expandInterference);
 }

GUI/Model/Sim/InstrumentsSet.cpp

@@ -30,7 +30,7 @@ InstrumentsSet::~InstrumentsSet() = default;
 void InstrumentsSet::writeTo(QXmlStreamWriter* w) const
 {
     for (const InstrumentItem* t : *this)
-        XML::writeChosen<InstrumentCatalog>(t, w, Tag::Instrument);
+        XML::writeChosen<InstrumentItem, InstrumentCatalog>(t, w, Tag::Instrument);
     XML::writeTaggedValue(w, Tag::CurrentIndex, (int)currentIndex());
 }
 

GUI/Model/Util/UtilXML.h

@@ -125,21 +125,21 @@ typename C::BaseItem* readChosen(QXmlStreamReader* r, const QString& tag, Args..
     return t;
 }
 
-template <typename C> void writeItemTo(const typename C::BaseItem* t, QXmlStreamWriter* w)
+template <typename B, typename C> void writeItemTo(const B* t, QXmlStreamWriter* w)
 {
     const uint typeIndex = static_cast<uint>(C::type(t));
-    XML::writeAttribute(w, XML::Attrib::type, typeIndex);
+    writeAttribute(w, Attrib::type, typeIndex);
     // The next line allows to see the name of item type in XML. May be skipped while reading.
-    XML::writeAttribute(w, XML::Attrib::kind, C::uiInfo(C::type(t)).menuEntry);
+    writeAttribute(w, Attrib::kind, C::uiInfo(C::type(t)).menuEntry);
     if (t)
         t->writeTo(w);
 }
 
-template <typename C>
-void writeChosen(const typename C::BaseItem* t, QXmlStreamWriter* w, const QString& tag)
+template <typename B, typename C>
+void writeChosen(const B* t, QXmlStreamWriter* w, const QString& tag)
 {
     w->writeStartElement(tag);
-    XML::writeItemTo<C>(t, w);
+    writeItemTo<B, C>(t, w);
     w->writeEndElement();
 }