GUI: serialization refactoring part 7

The the rest of classes have got readFrom and writeTo methods.

Serialization of instruments is done.

The rest of work is to remove all usages and mentions of serialization.

GUI/Model/Device/InstrumentCollection.cpp

@@ -26,15 +26,10 @@ const QString Instrument("Instrument");
 } // namespace Tag
 } // namespace
 
-InstrumentCollection::~InstrumentCollection()
-{
-//    qDeleteAll(m_instruments);
-}
+InstrumentCollection::~InstrumentCollection() {}
 
 void InstrumentCollection::clear()
 {
-//    qDeleteAll(m_instruments);
-//    m_instruments.clear();
     m_instrumentSelections.clear();
 }
 
@@ -70,9 +65,9 @@ void InstrumentCollection::readFrom(QXmlStreamReader *r)
     while (r->readNextStartElement()) {
         QString tag = r->name().toString();
 
-        // particle
+        // instrument
         if (tag == Tag::Instrument) {
-            createEmptyInstrumentSelection().readFrom(r);
+            addEmptyInstrumentSelection().readFrom(r);
             XML::gotoEndElementOfTag(r, tag);
 
         } else
@@ -82,22 +77,19 @@ void InstrumentCollection::readFrom(QXmlStreamReader *r)
 
 void InstrumentCollection::emplace_back(InstrumentItem *item)
 {
-//    m_instruments.push_back(item);
-    createEmptyInstrumentSelection().setCurrentItem(item);
+    addEmptyInstrumentSelection().setCurrentItem(item);
 }
 
 InstrumentItem* InstrumentCollection::insertCopy(const InstrumentItem& source)
 {
     auto* copy = source.createCopy();
     copy->setId(QUuid::createUuid().toString());
-//    m_instruments << copy;
     emplace_back(copy);
     return copy;
 }
 
 QVector<InstrumentItem*> InstrumentCollection::collectedItems() const
 {
-//    return m_instruments;
     QVector<InstrumentItem*> output;
     for (const auto& sel : m_instrumentSelections)
         output.append(sel.currentItem());
@@ -112,7 +104,7 @@ QStringList InstrumentCollection::instrumentNames() const
     return existingNames;
 }
 
-SelectionProperty<InstrumentItemCatalog> &InstrumentCollection::createEmptyInstrumentSelection()
+SelectionProperty<InstrumentItemCatalog> &InstrumentCollection::addEmptyInstrumentSelection()
 {
     SelectionProperty<InstrumentItemCatalog> newInstrumentSelection;
     m_instrumentSelections.push_back(std::move(newInstrumentSelection));
@@ -161,10 +153,7 @@ bool InstrumentCollection::instrumentExists(const QString& instrumentId) const
 
 void InstrumentCollection::removeInstrument(InstrumentItem* instrument)
 {
-//    m_instruments.removeAll(instrument);
-//    delete instrument;
     for (size_t i = 0; i < m_instrumentSelections.size(); i++)
         if (m_instrumentSelections[i].currentItem() == instrument)
             m_instrumentSelections.erase(m_instrumentSelections.begin() + i);
-
 }