DataItem: use readFrom and writeTo

GUI/Model/Data/DataItem.cpp

@@ -259,7 +259,7 @@ void DataItem::setAxesRangeToData()
     setUpperY(yMax());
 }
 
-void DataItem::writeBaseData(QXmlStreamWriter* writer) const
+void DataItem::writeTo(QXmlStreamWriter* writer) const
 {
     XML::writeAttribute(writer, XML::Attrib::version, uint(1));
 
@@ -284,7 +284,7 @@ void DataItem::writeBaseData(QXmlStreamWriter* writer) const
     writer->writeEndElement();
 }
 
-void DataItem::readBaseData(QXmlStreamReader* reader)
+void DataItem::readFrom(QXmlStreamReader* reader)
 {
     uint version = XML::readUIntAttribute(reader, XML::Attrib::version);
     Q_UNUSED(version)

GUI/Model/Data/DataItem.h

@@ -124,10 +124,6 @@ public:
     virtual void writeTo(QXmlStreamWriter* writer) const = 0;
     virtual void readFrom(QXmlStreamReader* reader) = 0;
 
-protected:
-    void writeBaseData(QXmlStreamWriter* writer) const;
-    void readBaseData(QXmlStreamReader* reader);
-
 signals:
     void datafieldChanged();
     void rawDataVectorChanged(const std::vector<double>& data);

GUI/Model/Data/IntensityDataItem.cpp

@@ -320,7 +320,7 @@ void IntensityDataItem::writeTo(QXmlStreamWriter* writer) const
 
     // parameters from base class
     writer->writeStartElement(Tag::BaseData);
-    DataItem::writeBaseData(writer);
+    DataItem::writeTo(writer);
     writer->writeEndElement();
 
     // interpolation
@@ -349,7 +349,7 @@ void IntensityDataItem::readFrom(QXmlStreamReader* reader)
 
         // parameters from base class
         if (name == Tag::BaseData) {
-            DataItem::readBaseData(reader);
+            DataItem::readFrom(reader);
             XML::gotoEndElementOfTag(reader, name);
 
             // interpolation

GUI/Model/Data/SpecularDataItem.cpp

@@ -213,7 +213,7 @@ void SpecularDataItem::writeTo(QXmlStreamWriter* writer) const
 
     // parameters from base class
     writer->writeStartElement(Tag::BaseData);
-    DataItem::writeBaseData(writer);
+    DataItem::writeTo(writer);
     writer->writeEndElement();
 
     // line type
@@ -252,7 +252,7 @@ void SpecularDataItem::readFrom(QXmlStreamReader* reader)
 
         // parameters from base class
         if (name == Tag::BaseData) {
-            DataItem::readBaseData(reader);
+            DataItem::readFrom(reader);
             XML::gotoEndElementOfTag(reader, name);
 
             // line type