+ XML::readBaseElement, use once

GUI/Model/Data/Data1DItem.cpp

@@ -180,10 +180,9 @@ void Data1DItem::readFrom(QXmlStreamReader* r)
 
     while (r->readNextStartElement()) {
         QString tag = r->name().toString();
-        if (tag == Tag::BaseData) {
-            DataItem::readFrom(r);
-            XML::gotoEndElementOfTag(r, tag);
-        } else if (tag == Tag::LineType)
+        if (tag == Tag::BaseData)
+            XML::readBaseElement<DataItem>(r, this);
+        else if (tag == Tag::LineType)
             m_line_type = XML::readTaggedString(r, tag);
         else if (tag == Tag::Color)
             m_color = XML::readTaggedColor(r, tag);
@@ -193,7 +192,6 @@ void Data1DItem::readFrom(QXmlStreamReader* r)
             m_scatter_type = XML::readTaggedString(r, tag);
         else if (tag == Tag::ScatterSize)
             m_scatter_size = XML::readTaggedDouble(r, tag);
-
         else
             r->skipCurrentElement();
     }

GUI/Model/Util/UtilXML.h

@@ -104,6 +104,12 @@ template <typename T> void readTaggedElement(QXmlStreamReader* r, const QString&
     gotoEndElementOfTag(r, tag);
 }
 
+template <typename T> void readBaseElement(QXmlStreamReader* r, T* element)
+{
+    element->T::readFrom(r);
+    gotoEndElementOfTag(r, Tag::BaseData);
+}
+
 // TODO: will the following remain unused?
 R3 readR3(QXmlStreamReader* reader, const QString& attributeBaseName);
 complex_t readC(QXmlStreamReader* reader, const QString& attributeBaseName);