Skip to content
Snippets Groups Projects
Commit 095d0e71 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

j/r models: rnm readFromProject() --> readFrom()

parent 9baafc57
No related branches found
No related tags found
1 merge request!1355GUI: remove ApplicationModels class
...@@ -71,12 +71,12 @@ void ApplicationModels::readFrom(QXmlStreamReader* r, const QString& projectDir, ...@@ -71,12 +71,12 @@ void ApplicationModels::readFrom(QXmlStreamReader* r, const QString& projectDir,
// real model // real model
if (tag == Tag::RealModel) { if (tag == Tag::RealModel) {
m_realDataModel->readFromProject(r, projectDir, messageService); m_realDataModel->readFrom(r, projectDir, messageService);
XML::gotoEndElementOfTag(r, tag); XML::gotoEndElementOfTag(r, tag);
// job model // job model
} else if (tag == Tag::JobModel) { } else if (tag == Tag::JobModel) {
m_jobModel->readFromProject(r, projectDir, messageService); m_jobModel->readFrom(r, projectDir, messageService);
XML::gotoEndElementOfTag(r, tag); XML::gotoEndElementOfTag(r, tag);
} }
m_fileNames = collectDataNames(); m_fileNames = collectDataNames();
......
...@@ -152,7 +152,7 @@ void JobModel::writeTo(QXmlStreamWriter* w, const QString& projectDir) ...@@ -152,7 +152,7 @@ void JobModel::writeTo(QXmlStreamWriter* w, const QString& projectDir)
w->writeEndElement(); w->writeEndElement();
} }
void JobModel::readFromProject(QXmlStreamReader* r, const QString& projectDir, void JobModel::readFrom(QXmlStreamReader* r, const QString& projectDir,
MessageService* messageService) MessageService* messageService)
{ {
clear(); clear();
......
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
QVector<DataItem*> dataItems() const; QVector<DataItem*> dataItems() const;
void writeTo(QXmlStreamWriter* w, const QString& projectDir); void writeTo(QXmlStreamWriter* w, const QString& projectDir);
void readFromProject(QXmlStreamReader* r, const QString& projectDir, void readFrom(QXmlStreamReader* r, const QString& projectDir,
MessageService* messageService = nullptr); MessageService* messageService = nullptr);
void runJob(JobItem* jobItem); void runJob(JobItem* jobItem);
......
...@@ -77,7 +77,7 @@ void RealModel::writeTo(QXmlStreamWriter* w, const QString& projectDir) ...@@ -77,7 +77,7 @@ void RealModel::writeTo(QXmlStreamWriter* w, const QString& projectDir)
w->writeEndElement(); w->writeEndElement();
} }
void RealModel::readFromProject(QXmlStreamReader* r, const QString& projectDir, void RealModel::readFrom(QXmlStreamReader* r, const QString& projectDir,
MessageService* messageService) MessageService* messageService)
{ {
clear(); clear();
......
...@@ -33,7 +33,7 @@ public: ...@@ -33,7 +33,7 @@ public:
QVector<DataItem*> dataItems() const; QVector<DataItem*> dataItems() const;
void clear(); void clear();
void writeTo(QXmlStreamWriter* w, const QString& projectDir); void writeTo(QXmlStreamWriter* w, const QString& projectDir);
void readFromProject(QXmlStreamReader* r, const QString& projectDir, void readFrom(QXmlStreamReader* r, const QString& projectDir,
MessageService* messageService = nullptr); MessageService* messageService = nullptr);
RealItem* createRealItem(); RealItem* createRealItem();
......
...@@ -370,12 +370,12 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device, ...@@ -370,12 +370,12 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
// real model // real model
} else if (tag == Tag::RealModel) { } else if (tag == Tag::RealModel) {
m_realDataModel.readFromProject(&r, projectDir, &messageService); m_realDataModel.readFrom(&r, projectDir, &messageService);
XML::gotoEndElementOfTag(&r, tag); XML::gotoEndElementOfTag(&r, tag);
// job model // job model
} else if (tag == Tag::JobModel) { } else if (tag == Tag::JobModel) {
m_jobModel.readFromProject(&r, projectDir, &messageService); m_jobModel.readFrom(&r, projectDir, &messageService);
XML::gotoEndElementOfTag(&r, tag); XML::gotoEndElementOfTag(&r, tag);
// active view // active view
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment