diff options
17 files changed, 48 insertions, 48 deletions
diff --git a/src/lib/corelib/generators/ixmlnodevisitor.h b/src/lib/corelib/generators/ixmlnodevisitor.h index 6d62c86ed..d3d118975 100644 --- a/src/lib/corelib/generators/ixmlnodevisitor.h +++ b/src/lib/corelib/generators/ixmlnodevisitor.h @@ -49,17 +49,17 @@ class QBS_EXPORT INodeVisitor public: virtual ~INodeVisitor() {} - virtual void visitStart(const Workspace *workspace) { Q_UNUSED(workspace) } - virtual void visitEnd(const Workspace *workspace) { Q_UNUSED(workspace) } + virtual void visitWorkspaceStart(const Workspace *workspace) { Q_UNUSED(workspace) } + virtual void visitWorkspaceEnd(const Workspace *workspace) { Q_UNUSED(workspace) } - virtual void visitStart(const Project *project) { Q_UNUSED(project) } - virtual void visitEnd(const Project *project) { Q_UNUSED(project) } + virtual void visitProjectStart(const Project *project) { Q_UNUSED(project) } + virtual void visitProjectEnd(const Project *project) { Q_UNUSED(project) } - virtual void visitStart(const Property *property) = 0; - virtual void visitEnd(const Property *property) = 0; + virtual void visitPropertyStart(const Property *property) = 0; + virtual void visitPropertyEnd(const Property *property) = 0; - virtual void visitStart(const PropertyGroup *propertyGroup) = 0; - virtual void visitEnd(const PropertyGroup *propertyGroup) = 0; + virtual void visitPropertyGroupStart(const PropertyGroup *propertyGroup) = 0; + virtual void visitPropertyGroupEnd(const PropertyGroup *propertyGroup) = 0; }; } // namespace xml diff --git a/src/lib/corelib/generators/xmlproject.cpp b/src/lib/corelib/generators/xmlproject.cpp index becd31dda..e2ac951aa 100644 --- a/src/lib/corelib/generators/xmlproject.cpp +++ b/src/lib/corelib/generators/xmlproject.cpp @@ -37,12 +37,12 @@ namespace xml { void Project::accept(INodeVisitor *visitor) const { - visitor->visitStart(this); + visitor->visitProjectStart(this); for (const auto &child : children()) child->accept(visitor); - visitor->visitEnd(this); + visitor->visitProjectEnd(this); } } // namespace xml diff --git a/src/lib/corelib/generators/xmlprojectwriter.cpp b/src/lib/corelib/generators/xmlprojectwriter.cpp index 5b96564bd..5554e5935 100644 --- a/src/lib/corelib/generators/xmlprojectwriter.cpp +++ b/src/lib/corelib/generators/xmlprojectwriter.cpp @@ -58,25 +58,25 @@ bool ProjectWriter::write(const Project *project) return m_device->good(); } -void ProjectWriter::visitStart(const Property *property) +void ProjectWriter::visitPropertyStart(const Property *property) { const auto value = property->value().toString(); const auto name = QString::fromUtf8(property->name()); m_writer->writeTextElement(name, value); } -void ProjectWriter::visitEnd(const Property *property) +void ProjectWriter::visitPropertyEnd(const Property *property) { Q_UNUSED(property) } -void ProjectWriter::visitStart(const PropertyGroup *propertyGroup) +void ProjectWriter::visitPropertyGroupStart(const PropertyGroup *propertyGroup) { const auto name = QString::fromUtf8(propertyGroup->name()); m_writer->writeStartElement(name); } -void ProjectWriter::visitEnd(const PropertyGroup *propertyGroup) +void ProjectWriter::visitPropertyGroupEnd(const PropertyGroup *propertyGroup) { Q_UNUSED(propertyGroup) m_writer->writeEndElement(); diff --git a/src/lib/corelib/generators/xmlprojectwriter.h b/src/lib/corelib/generators/xmlprojectwriter.h index da4100a92..8198de61c 100644 --- a/src/lib/corelib/generators/xmlprojectwriter.h +++ b/src/lib/corelib/generators/xmlprojectwriter.h @@ -52,11 +52,11 @@ protected: QXmlStreamWriter *writer() const; private: - void visitStart(const Property *property) final; - void visitEnd(const Property *property) final; + void visitPropertyStart(const Property *property) final; + void visitPropertyEnd(const Property *property) final; - void visitStart(const PropertyGroup *propertyGroup) final; - void visitEnd(const PropertyGroup *propertyGroup) final; + void visitPropertyGroupStart(const PropertyGroup *propertyGroup) final; + void visitPropertyGroupEnd(const PropertyGroup *propertyGroup) final; std::ostream *m_device = nullptr; QByteArray m_buffer; diff --git a/src/lib/corelib/generators/xmlproperty.cpp b/src/lib/corelib/generators/xmlproperty.cpp index ae41eab4a..2fe5a0147 100644 --- a/src/lib/corelib/generators/xmlproperty.cpp +++ b/src/lib/corelib/generators/xmlproperty.cpp @@ -43,12 +43,12 @@ Property::Property(QByteArray name, QVariant value) void Property::accept(INodeVisitor *visitor) const { - visitor->visitStart(this); + visitor->visitPropertyStart(this); for (const auto &child : children()) child->accept(visitor); - visitor->visitEnd(this); + visitor->visitPropertyEnd(this); } } // namespace xml diff --git a/src/lib/corelib/generators/xmlpropertygroup.cpp b/src/lib/corelib/generators/xmlpropertygroup.cpp index 2111b9b1e..398d68e77 100644 --- a/src/lib/corelib/generators/xmlpropertygroup.cpp +++ b/src/lib/corelib/generators/xmlpropertygroup.cpp @@ -54,12 +54,12 @@ void PropertyGroup::appendMultiLineProperty( void PropertyGroup::accept(INodeVisitor *visitor) const { - visitor->visitStart(this); + visitor->visitPropertyGroupStart(this); for (const auto &child : children()) child->accept(visitor); - visitor->visitEnd(this); + visitor->visitPropertyGroupEnd(this); } } // namespace xml diff --git a/src/lib/corelib/generators/xmlworkspace.cpp b/src/lib/corelib/generators/xmlworkspace.cpp index 8913ceffd..7ce3f5164 100644 --- a/src/lib/corelib/generators/xmlworkspace.cpp +++ b/src/lib/corelib/generators/xmlworkspace.cpp @@ -53,12 +53,12 @@ Workspace::Workspace(const QString &workspacePath) void Workspace::accept(INodeVisitor *visitor) const { - visitor->visitStart(this); + visitor->visitWorkspaceStart(this); for (const auto &child : children()) child->accept(visitor); - visitor->visitEnd(this); + visitor->visitWorkspaceEnd(this); } } // namespace xml diff --git a/src/lib/corelib/generators/xmlworkspacewriter.cpp b/src/lib/corelib/generators/xmlworkspacewriter.cpp index 2358d4047..c88cb06d0 100644 --- a/src/lib/corelib/generators/xmlworkspacewriter.cpp +++ b/src/lib/corelib/generators/xmlworkspacewriter.cpp @@ -58,25 +58,25 @@ bool WorkspaceWriter::write(const Workspace *workspace) return m_device->good(); } -void WorkspaceWriter::visitStart(const Property *property) +void WorkspaceWriter::visitPropertyStart(const Property *property) { const auto value = property->value().toString(); const auto name = QString::fromUtf8(property->name()); m_writer->writeTextElement(name, value); } -void WorkspaceWriter::visitEnd(const Property *property) +void WorkspaceWriter::visitPropertyEnd(const Property *property) { Q_UNUSED(property) } -void WorkspaceWriter::visitStart(const PropertyGroup *propertyGroup) +void WorkspaceWriter::visitPropertyGroupStart(const PropertyGroup *propertyGroup) { const auto name = QString::fromUtf8(propertyGroup->name()); m_writer->writeStartElement(name); } -void WorkspaceWriter::visitEnd(const PropertyGroup *propertyGroup) +void WorkspaceWriter::visitPropertyGroupEnd(const PropertyGroup *propertyGroup) { Q_UNUSED(propertyGroup) m_writer->writeEndElement(); diff --git a/src/lib/corelib/generators/xmlworkspacewriter.h b/src/lib/corelib/generators/xmlworkspacewriter.h index 73e7d0686..343face5d 100644 --- a/src/lib/corelib/generators/xmlworkspacewriter.h +++ b/src/lib/corelib/generators/xmlworkspacewriter.h @@ -52,11 +52,11 @@ protected: QXmlStreamWriter *writer() const; private: - void visitStart(const Property *property) final; - void visitEnd(const Property *property) final; + void visitPropertyStart(const Property *property) final; + void visitPropertyEnd(const Property *property) final; - void visitStart(const PropertyGroup *propertyGroup) final; - void visitEnd(const PropertyGroup *propertyGroup) final; + void visitPropertyGroupStart(const PropertyGroup *propertyGroup) final; + void visitPropertyGroupEnd(const PropertyGroup *propertyGroup) final; std::ostream *m_device = nullptr; QByteArray m_buffer; diff --git a/src/plugins/generator/iarew/iarewprojectwriter.cpp b/src/plugins/generator/iarew/iarewprojectwriter.cpp index a1c912a8c..fcb2103fe 100644 --- a/src/plugins/generator/iarew/iarewprojectwriter.cpp +++ b/src/plugins/generator/iarew/iarewprojectwriter.cpp @@ -37,13 +37,13 @@ IarewProjectWriter::IarewProjectWriter(std::ostream *device) { } -void IarewProjectWriter::visitStart(const gen::xml::Project *project) +void IarewProjectWriter::visitProjectStart(const gen::xml::Project *project) { Q_UNUSED(project) writer()->writeStartElement(QStringLiteral("project")); } -void IarewProjectWriter::visitEnd(const gen::xml::Project *project) +void IarewProjectWriter::visitProjectEnd(const gen::xml::Project *project) { Q_UNUSED(project) writer()->writeEndElement(); diff --git a/src/plugins/generator/iarew/iarewprojectwriter.h b/src/plugins/generator/iarew/iarewprojectwriter.h index ae425b29e..9356dbec4 100644 --- a/src/plugins/generator/iarew/iarewprojectwriter.h +++ b/src/plugins/generator/iarew/iarewprojectwriter.h @@ -42,8 +42,8 @@ public: explicit IarewProjectWriter(std::ostream *device); private: - void visitStart(const gen::xml::Project *project) final; - void visitEnd(const gen::xml::Project *project) final; + void visitProjectStart(const gen::xml::Project *project) final; + void visitProjectEnd(const gen::xml::Project *project) final; }; } // namespace qbs diff --git a/src/plugins/generator/iarew/iarewworkspacewriter.cpp b/src/plugins/generator/iarew/iarewworkspacewriter.cpp index 8b56b7c54..b06080e3a 100644 --- a/src/plugins/generator/iarew/iarewworkspacewriter.cpp +++ b/src/plugins/generator/iarew/iarewworkspacewriter.cpp @@ -37,13 +37,13 @@ IarewWorkspaceWriter::IarewWorkspaceWriter(std::ostream *device) { } -void IarewWorkspaceWriter::visitStart(const gen::xml::Workspace *workspace) +void IarewWorkspaceWriter::visitWorkspaceStart(const gen::xml::Workspace *workspace) { Q_UNUSED(workspace) writer()->writeStartElement(QStringLiteral("workspace")); } -void IarewWorkspaceWriter::visitEnd(const gen::xml::Workspace *workspace) +void IarewWorkspaceWriter::visitWorkspaceEnd(const gen::xml::Workspace *workspace) { Q_UNUSED(workspace) writer()->writeEndElement(); diff --git a/src/plugins/generator/iarew/iarewworkspacewriter.h b/src/plugins/generator/iarew/iarewworkspacewriter.h index 3966744fb..e60b102d3 100644 --- a/src/plugins/generator/iarew/iarewworkspacewriter.h +++ b/src/plugins/generator/iarew/iarewworkspacewriter.h @@ -42,8 +42,8 @@ public: explicit IarewWorkspaceWriter(std::ostream *device); private: - void visitStart(const gen::xml::Workspace *workspace) final; - void visitEnd(const gen::xml::Workspace *workspace) final; + void visitWorkspaceStart(const gen::xml::Workspace *workspace) final; + void visitWorkspaceEnd(const gen::xml::Workspace *workspace) final; }; } // namespace qbs diff --git a/src/plugins/generator/keiluv/keiluvprojectwriter.cpp b/src/plugins/generator/keiluv/keiluvprojectwriter.cpp index f2ae8befb..77616335c 100644 --- a/src/plugins/generator/keiluv/keiluvprojectwriter.cpp +++ b/src/plugins/generator/keiluv/keiluvprojectwriter.cpp @@ -37,7 +37,7 @@ KeiluvProjectWriter::KeiluvProjectWriter(std::ostream *device) { } -void KeiluvProjectWriter::visitStart(const gen::xml::Project *project) +void KeiluvProjectWriter::visitProjectStart(const gen::xml::Project *project) { Q_UNUSED(project) writer()->writeStartElement(QStringLiteral("Project")); @@ -49,7 +49,7 @@ void KeiluvProjectWriter::visitStart(const gen::xml::Project *project) QStringLiteral("project_proj.xsd")); } -void KeiluvProjectWriter::visitEnd(const gen::xml::Project *project) +void KeiluvProjectWriter::visitProjectEnd(const gen::xml::Project *project) { Q_UNUSED(project) writer()->writeEndElement(); diff --git a/src/plugins/generator/keiluv/keiluvprojectwriter.h b/src/plugins/generator/keiluv/keiluvprojectwriter.h index ad6fd1124..6f890c8e8 100644 --- a/src/plugins/generator/keiluv/keiluvprojectwriter.h +++ b/src/plugins/generator/keiluv/keiluvprojectwriter.h @@ -42,8 +42,8 @@ public: explicit KeiluvProjectWriter(std::ostream *device); private: - void visitStart(const gen::xml::Project *project) final; - void visitEnd(const gen::xml::Project *project) final; + void visitProjectStart(const gen::xml::Project *project) final; + void visitProjectEnd(const gen::xml::Project *project) final; }; } // namespace qbs diff --git a/src/plugins/generator/keiluv/keiluvworkspacewriter.cpp b/src/plugins/generator/keiluv/keiluvworkspacewriter.cpp index 9070a2542..c886b0e6e 100644 --- a/src/plugins/generator/keiluv/keiluvworkspacewriter.cpp +++ b/src/plugins/generator/keiluv/keiluvworkspacewriter.cpp @@ -37,7 +37,7 @@ KeiluvWorkspaceWriter::KeiluvWorkspaceWriter(std::ostream *device) { } -void KeiluvWorkspaceWriter::visitStart(const gen::xml::Workspace *workspace) +void KeiluvWorkspaceWriter::visitWorkspaceStart(const gen::xml::Workspace *workspace) { Q_UNUSED(workspace) writer()->writeStartElement(QStringLiteral("ProjectWorkspace")); @@ -49,7 +49,7 @@ void KeiluvWorkspaceWriter::visitStart(const gen::xml::Workspace *workspace) QStringLiteral("project_mpw.xsd")); } -void KeiluvWorkspaceWriter::visitEnd(const gen::xml::Workspace *workspace) +void KeiluvWorkspaceWriter::visitWorkspaceEnd(const gen::xml::Workspace *workspace) { Q_UNUSED(workspace) writer()->writeEndElement(); diff --git a/src/plugins/generator/keiluv/keiluvworkspacewriter.h b/src/plugins/generator/keiluv/keiluvworkspacewriter.h index 56bcd1ebc..2419ad761 100644 --- a/src/plugins/generator/keiluv/keiluvworkspacewriter.h +++ b/src/plugins/generator/keiluv/keiluvworkspacewriter.h @@ -42,8 +42,8 @@ public: explicit KeiluvWorkspaceWriter(std::ostream *device); private: - void visitStart(const gen::xml::Workspace *workspace) final; - void visitEnd(const gen::xml::Workspace *workspace) final; + void visitWorkspaceStart(const gen::xml::Workspace *workspace) final; + void visitWorkspaceEnd(const gen::xml::Workspace *workspace) final; }; } // namespace qbs |