diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp index d4cbd520cb43f55521a7fb0a244a7710038e0944..2354b891291e7c18981bb55e20a87ae55f245acc 100644 --- a/GUI/Model/Job/JobItem.cpp +++ b/GUI/Model/Job/JobItem.cpp @@ -428,7 +428,7 @@ void JobItem::cropRealData() intensityItem->updateDataRange(); } -void JobItem::writeContentTo(QXmlStreamWriter* writer) const +void JobItem::writeTo(QXmlStreamWriter* writer) const { // NOTE: The ordering of the XML elements are important in initialization @@ -532,7 +532,7 @@ inline T* readItemToEnd(QXmlStreamReader* reader, SessionItem* parent_item, cons return item; } -void JobItem::readContentFrom(QXmlStreamReader* reader) +void JobItem::readFrom(QXmlStreamReader* reader) { while (reader->readNextStartElement()) { diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h index aed731e54879c5f3d2fbaf9ae995fab53907cc2e..af2113652b9bf7475f9d4bc17099f260fa623415 100644 --- a/GUI/Model/Job/JobItem.h +++ b/GUI/Model/Job/JobItem.h @@ -131,8 +131,8 @@ public: // write/read - void writeContentTo(QXmlStreamWriter* writer) const; - void readContentFrom(QXmlStreamReader* reader); + void writeTo(QXmlStreamWriter* writer) const; + void readFrom(QXmlStreamReader* reader); signals: void jobNameChanged(const QString& name); diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp index b95d17ef2be5525f16b1225f9bd5c64a9b060644..e13e6e2f270f904a36274b697d7c023cfabf345c 100644 --- a/GUI/Model/Model/JobModel.cpp +++ b/GUI/Model/Model/JobModel.cpp @@ -154,7 +154,7 @@ void JobModel::writeTo(QXmlStreamWriter* writer) writer->writeAttribute(Tags::Attributes::JobNameAttribute, job->jobName()); // write content - job->writeContentTo(writer); + job->writeTo(writer); writer->writeEndElement(); // JobItemTag } @@ -176,7 +176,7 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService JobItem* jobItem = createJobItem(); // read content - jobItem->readContentFrom(reader); + jobItem->readFrom(reader); GUI::Session::XML::gotoEndElementOfTag(reader, Tags::JobItemTag); } }