From 163f4b038fea6b5df138fd0525e30aa109c538ef Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <svechnikovmv@gmail.com> Date: Fri, 17 Feb 2023 12:32:27 +0100 Subject: [PATCH] j/r models: rnm writeToProject() --> writeTo() --- GUI/Model/Model/ApplicationModels.cpp | 4 ++-- GUI/Model/Model/JobModel.cpp | 2 +- GUI/Model/Model/JobModel.h | 2 +- GUI/Model/Model/RealModel.cpp | 2 +- GUI/Model/Model/RealModel.h | 2 +- GUI/Model/Project/ProjectDocument.cpp | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/GUI/Model/Model/ApplicationModels.cpp b/GUI/Model/Model/ApplicationModels.cpp index ea086079c59..7870fd0aa3a 100644 --- a/GUI/Model/Model/ApplicationModels.cpp +++ b/GUI/Model/Model/ApplicationModels.cpp @@ -52,12 +52,12 @@ void ApplicationModels::writeTo(QXmlStreamWriter* w, const QString& projectDir) { // real model w->writeStartElement(Tag::RealModel); - m_realDataModel->writeToProject(w, projectDir); + m_realDataModel->writeTo(w, projectDir); w->writeEndElement(); // job model w->writeStartElement(Tag::JobModel); - m_jobModel->writeToProject(w, projectDir); + m_jobModel->writeTo(w, projectDir); w->writeEndElement(); cleanOldFiles(projectDir); diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp index 2616422add4..8e2904f8fe5 100644 --- a/GUI/Model/Model/JobModel.cpp +++ b/GUI/Model/Model/JobModel.cpp @@ -134,7 +134,7 @@ QVector<DataItem*> JobModel::dataItems() const return result; } -void JobModel::writeToProject(QXmlStreamWriter* w, const QString& projectDir) +void JobModel::writeTo(QXmlStreamWriter* w, const QString& projectDir) { XML::writeAttribute(w, XML::Attrib::version, uint(1)); diff --git a/GUI/Model/Model/JobModel.h b/GUI/Model/Model/JobModel.h index 2876b8eb58e..ff1b6b2c54e 100644 --- a/GUI/Model/Model/JobModel.h +++ b/GUI/Model/Model/JobModel.h @@ -46,7 +46,7 @@ public: void clear(); QVector<DataItem*> dataItems() const; - void writeToProject(QXmlStreamWriter* w, const QString& projectDir); + void writeTo(QXmlStreamWriter* w, const QString& projectDir); void readFromProject(QXmlStreamReader* r, const QString& projectDir, MessageService* messageService = nullptr); diff --git a/GUI/Model/Model/RealModel.cpp b/GUI/Model/Model/RealModel.cpp index 9e005bd1ef5..f05f869c053 100644 --- a/GUI/Model/Model/RealModel.cpp +++ b/GUI/Model/Model/RealModel.cpp @@ -54,7 +54,7 @@ void RealModel::clear() removeRealItem(realItem); } -void RealModel::writeToProject(QXmlStreamWriter* w, const QString& projectDir) +void RealModel::writeTo(QXmlStreamWriter* w, const QString& projectDir) { XML::writeAttribute(w, XML::Attrib::version, uint(1)); diff --git a/GUI/Model/Model/RealModel.h b/GUI/Model/Model/RealModel.h index 6ace34638db..10b1d846773 100644 --- a/GUI/Model/Model/RealModel.h +++ b/GUI/Model/Model/RealModel.h @@ -32,7 +32,7 @@ public: QVector<DataItem*> dataItems() const; void clear(); - void writeToProject(QXmlStreamWriter* w, const QString& projectDir); + void writeTo(QXmlStreamWriter* w, const QString& projectDir); void readFromProject(QXmlStreamReader* r, const QString& projectDir, MessageService* messageService = nullptr); diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp index d0ccac285fd..69662408b77 100644 --- a/GUI/Model/Project/ProjectDocument.cpp +++ b/GUI/Model/Project/ProjectDocument.cpp @@ -307,12 +307,12 @@ void ProjectDocument::writeProject(QIODevice* device, const QString& projectDir) // real model w.writeStartElement(Tag::RealModel); - m_realDataModel.writeToProject(&w, projectDir); + m_realDataModel.writeTo(&w, projectDir); w.writeEndElement(); // job model w.writeStartElement(Tag::JobModel); - m_jobModel.writeToProject(&w, projectDir); + m_jobModel.writeTo(&w, projectDir); w.writeEndElement(); // active view -- GitLab