diff --git a/GUI/Model/Model/ApplicationModels.cpp b/GUI/Model/Model/ApplicationModels.cpp index 7870fd0aa3a98159c80022148cecaa2a9fba64cb..1147e525e48f5c4796dc3a77912d0622325e07dc 100644 --- a/GUI/Model/Model/ApplicationModels.cpp +++ b/GUI/Model/Model/ApplicationModels.cpp @@ -71,12 +71,12 @@ void ApplicationModels::readFrom(QXmlStreamReader* r, const QString& projectDir, // real model if (tag == Tag::RealModel) { - m_realDataModel->readFromProject(r, projectDir, messageService); + m_realDataModel->readFrom(r, projectDir, messageService); XML::gotoEndElementOfTag(r, tag); // job model } else if (tag == Tag::JobModel) { - m_jobModel->readFromProject(r, projectDir, messageService); + m_jobModel->readFrom(r, projectDir, messageService); XML::gotoEndElementOfTag(r, tag); } m_fileNames = collectDataNames(); diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp index 8e2904f8fe5a57fc481dc444b09634a15175b228..4f52c6de5b2f86365034ef627f8cc065248ce9eb 100644 --- a/GUI/Model/Model/JobModel.cpp +++ b/GUI/Model/Model/JobModel.cpp @@ -152,7 +152,7 @@ void JobModel::writeTo(QXmlStreamWriter* w, const QString& projectDir) w->writeEndElement(); } -void JobModel::readFromProject(QXmlStreamReader* r, const QString& projectDir, +void JobModel::readFrom(QXmlStreamReader* r, const QString& projectDir, MessageService* messageService) { clear(); diff --git a/GUI/Model/Model/JobModel.h b/GUI/Model/Model/JobModel.h index ff1b6b2c54ed1a5dd468f1e30c882c72bf03be97..9abdeb10ab3f75fff7a047a97cbf118f8e3e0049 100644 --- a/GUI/Model/Model/JobModel.h +++ b/GUI/Model/Model/JobModel.h @@ -47,7 +47,7 @@ public: QVector<DataItem*> dataItems() const; void writeTo(QXmlStreamWriter* w, const QString& projectDir); - void readFromProject(QXmlStreamReader* r, const QString& projectDir, + void readFrom(QXmlStreamReader* r, const QString& projectDir, MessageService* messageService = nullptr); void runJob(JobItem* jobItem); diff --git a/GUI/Model/Model/RealModel.cpp b/GUI/Model/Model/RealModel.cpp index f05f869c053b9bb53c0a91af65db749635712753..bb4e1f046c40817f7184abe582e5125cc08e3d43 100644 --- a/GUI/Model/Model/RealModel.cpp +++ b/GUI/Model/Model/RealModel.cpp @@ -77,7 +77,7 @@ void RealModel::writeTo(QXmlStreamWriter* w, const QString& projectDir) w->writeEndElement(); } -void RealModel::readFromProject(QXmlStreamReader* r, const QString& projectDir, +void RealModel::readFrom(QXmlStreamReader* r, const QString& projectDir, MessageService* messageService) { clear(); diff --git a/GUI/Model/Model/RealModel.h b/GUI/Model/Model/RealModel.h index 10b1d84677375b4a8aa7fbed090bac9995183199..23f30a10a4c74b24fd88792c66493ddf9dfffbaa 100644 --- a/GUI/Model/Model/RealModel.h +++ b/GUI/Model/Model/RealModel.h @@ -33,7 +33,7 @@ public: QVector<DataItem*> dataItems() const; void clear(); void writeTo(QXmlStreamWriter* w, const QString& projectDir); - void readFromProject(QXmlStreamReader* r, const QString& projectDir, + void readFrom(QXmlStreamReader* r, const QString& projectDir, MessageService* messageService = nullptr); RealItem* createRealItem(); diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp index 6ece749ab67f7930e4a6667ebcb08a3e1aaca84b..46bc1ae814e2184b060b417e411973d9e46d0f0f 100644 --- a/GUI/Model/Project/ProjectDocument.cpp +++ b/GUI/Model/Project/ProjectDocument.cpp @@ -370,12 +370,12 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device, // real model } else if (tag == Tag::RealModel) { - m_realDataModel.readFromProject(&r, projectDir, &messageService); + m_realDataModel.readFrom(&r, projectDir, &messageService); XML::gotoEndElementOfTag(&r, tag); // job model } else if (tag == Tag::JobModel) { - m_jobModel.readFromProject(&r, projectDir, &messageService); + m_jobModel.readFrom(&r, projectDir, &messageService); XML::gotoEndElementOfTag(&r, tag); // active view