GUI: RealModel is refactored

RealModel dependence from SessionModel was significantly reduced.

Real items were disconnected from RealModel's "root_item", they are stored in the vector now, not tree.

Read/write system of RealModel was simplified and made more explicit.

XML tags were localized: they are defined now in the same file with read/write methods.

RealModel and JobModel have much in common, so they should inherit some base class that will replace SessionModel. This is not done yet.

GUI/Model/Data/RealItem.cpp

@@ -30,7 +30,6 @@
 #include "GUI/Util/Error.h"
 
 namespace {
-
 namespace Tags {
 
 const QString InstrumentId("InstrumentId");
@@ -40,15 +39,14 @@ const QString NativeData("NativeData");
 const QString BinaryData("BinaryData");
 const QString NativeDataUnits("NativeDataUnits");
 
-namespace Attributes {
+} // namespace Tags
+
+namespace Atts {
 
 const QString version("version");
 const QString value("value");
 
-} // namespace Attributes
-
-} // namespace Tags
-
+} // namespace Atts
 } // namespace
 
 
@@ -352,24 +350,24 @@ void RealItem::writeTo(QXmlStreamWriter* writer) const
     QByteArray a = serializeBinaryData();
     if (!a.isEmpty()) {
         writer->writeStartElement(Tags::BinaryData);
-        writer->writeAttribute(Tags::Attributes::version, "1");
+        writer->writeAttribute(Atts::version, "1");
         writer->writeCharacters(a.toBase64());
         writer->writeEndElement(); // BinaryData
     }
 
     // instrument id
     writer->writeStartElement(Tags::InstrumentId);
-    GUI::Session::XML::writeAttribute(writer, Tags::Attributes::value, m_instrumentId);
+    GUI::Session::XML::writeAttribute(writer, Atts::value, m_instrumentId);
     writer->writeEndElement();
 
     // name
     writer->writeStartElement(Tags::Name);
-    GUI::Session::XML::writeAttribute(writer, Tags::Attributes::value, m_name);
+    GUI::Session::XML::writeAttribute(writer, Atts::value, m_name);
     writer->writeEndElement();
 
     // native data units
     writer->writeStartElement(Tags::NativeDataUnits);
-    GUI::Session::XML::writeAttribute(writer, Tags::Attributes::value, m_nativeDataUnits);
+    GUI::Session::XML::writeAttribute(writer, Atts::value, m_nativeDataUnits);
     writer->writeEndElement();
 
     // data
@@ -401,7 +399,7 @@ void RealItem::readFrom(QXmlStreamReader* reader)
 
         // binary data
         if (reader->name() == Tags::BinaryData) {
-            if (reader->attributes().value(Tags::Attributes::version).toInt() == 1) {
+            if (reader->attributes().value(Atts::version).toInt() == 1) {
                 QString valueAsBase64 =
                     reader->readElementText(QXmlStreamReader::SkipChildElements);
                 const auto data = QByteArray::fromBase64(
@@ -412,12 +410,12 @@ void RealItem::readFrom(QXmlStreamReader* reader)
 
             // instrument id
         } else if (reader->name() == Tags::InstrumentId) {
-            GUI::Session::XML::readAttribute(reader, Tags::Attributes::value, &m_instrumentId);
+            GUI::Session::XML::readAttribute(reader, Atts::value, &m_instrumentId);
             GUI::Session::XML::gotoEndElementOfTag(reader, Tags::InstrumentId);
 
             // name
         } else if (reader->name() == Tags::Name) {
-            GUI::Session::XML::readAttribute(reader, Tags::Attributes::value, &m_name);
+            GUI::Session::XML::readAttribute(reader, Atts::value, &m_name);
             GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Name);
 
             // data
@@ -430,7 +428,7 @@ void RealItem::readFrom(QXmlStreamReader* reader)
 
             // native data
         } else if (reader->name() == Tags::NativeDataUnits) {
-            GUI::Session::XML::readAttribute(reader, Tags::Attributes::value, &m_nativeDataUnits);
+            GUI::Session::XML::readAttribute(reader, Atts::value, &m_nativeDataUnits);
             GUI::Session::XML::gotoEndElementOfTag(reader, Tags::NativeDataUnits);
 
         } else {