JobModel: upd r/w

GUI/Model/Model/JobModel.cpp

@@ -134,39 +134,44 @@ QVector<DataItem*> JobModel::dataItems() const
     return result;
 }
 
-void JobModel::writeTo(QXmlStreamWriter* writer)
+void JobModel::writeTo(QXmlStreamWriter* w)
 {
-    ASSERT(writer);
+    XML::writeAttribute(w, XML::Attrib::version, uint(1));
 
     // jobs
     for (const auto* job : m_jobItems) {
-        writer->writeStartElement(Tag::Job);
-        writer->writeAttribute(XML::Attrib::name, job->jobName());
-        job->writeTo(writer);
-        writer->writeEndElement();
+        w->writeStartElement(Tag::Job);
+        XML::writeAttribute(w, XML::Attrib::name, job->jobName());
+        job->writeTo(w);
+        w->writeEndElement();
     }
 }
 
-void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService /*= 0*/)
+void JobModel::readFrom(QXmlStreamReader* r, MessageService* messageService /*= 0*/)
 {
     Q_UNUSED(messageService);
-    ASSERT(reader);
     clear();
-    while (reader->readNextStartElement()) {
 
-        // jobs
-        if (reader->name() == Tag::Job) {
-            createJobItem()->readFrom(reader);
-            XML::gotoEndElementOfTag(reader, Tag::Job);
+    const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
+    Q_UNUSED(version)
+
+    while (r->readNextStartElement()) {
+        QString tag = r->name().toString();
+
+        // job
+        if (tag == Tag::Job) {
+            createJobItem()->readFrom(r);
+            XML::gotoEndElementOfTag(r, tag);
 
         } else
-            reader->skipCurrentElement();
+            r->skipCurrentElement();
     }
-    if (reader->hasError())
-        throw Error(reader->errorString());
+    if (r->hasError())
+        throw Error(r->errorString());
 
     // Set & check instrument links. JobItem and realItem have to reference the same instrument
     // (which is the one contained in this job item, not contained in the instrument model)
+    // TODO mv to JobItem::readFrom
     for (auto* jobItem : jobItems()) {
         if (RealItem* refItem = jobItem->realItem())
             refItem->linkToInstrument(jobItem->instrumentItem());

GUI/Model/Model/JobModel.h

@@ -47,8 +47,8 @@ public:
     void clear() override;
     QVector<DataItem*> dataItems() const;
 
-    void writeTo(QXmlStreamWriter* writer) override;
-    void readFrom(QXmlStreamReader* reader, MessageService* messageService = nullptr) override;
+    void writeTo(QXmlStreamWriter* w) override;
+    void readFrom(QXmlStreamReader* r, MessageService* messageService = nullptr) override;
 
     void runJob(JobItem* jobItem);
     void cancelJob(JobItem* jobItem);