diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp index bffd5caef4dcbae6b80eeb58e5b313bd30c94450..18daeb7ef86b673214f5e79b452e588e9ccedf09 100644 --- a/GUI/Model/Data/DataItem.cpp +++ b/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) diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h index efe24cce3eaa16822b0e78d3ce8eb9bd440d24ee..e9ee652da59fa9024a10e269972a9c47e2dfd060 100644 --- a/GUI/Model/Data/DataItem.h +++ b/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); diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp index a2a629536966b7ce34b6adf35044a1b2862fe8bd..a5d66f8559bc6b72c0c518d36b1cf747ae5b851a 100644 --- a/GUI/Model/Data/IntensityDataItem.cpp +++ b/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 diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp index 338af33b6c1bcee8cb3b0a520469fe95d95ab7ad..d654ca3b17c53ac426fd37e7c703d7de6be64962 100644 --- a/GUI/Model/Data/SpecularDataItem.cpp +++ b/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