From d9587317d74e43f9f8236f71ad2ba69f3b2476f1 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Wed, 18 Nov 2020 17:22:48 +0100 Subject: [PATCH] local namespace -> top of source file --- GUI/coregui/Models/GUIDomainSampleVisitor.cpp | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp index 944f1e474db..8c392244599 100644 --- a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp +++ b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp @@ -47,8 +47,22 @@ using SessionItemUtils::SetVectorItem; namespace { -SessionItem* AddFormFactorItem(SessionItem* p_parent, const QString& model_type); +SessionItem* AddFormFactorItem(SessionItem* p_parent, const QString& model_type) +{ + auto parent_type = p_parent->modelType(); + QString property_name; + if (parent_type == "Particle") { + property_name = ParticleItem::P_FORM_FACTOR; + } else if (parent_type == "MesoCrystal") { + property_name = MesoCrystalItem::P_OUTER_SHAPE; + } + if (property_name.isEmpty()) { + throw GUIHelpers::Error("AddFormFactorItem: parent is neither ParticleItem or " + "MesoCrystalItem"); + } + return p_parent->setGroupProperty(property_name, model_type); } +} // namespace GUIDomainSampleVisitor::GUIDomainSampleVisitor() : m_sampleModel(nullptr), m_materialModel(nullptr) { @@ -647,22 +661,3 @@ SessionItem* GUIDomainSampleVisitor::InsertIParticle(const IParticle* p_particle return p_particle_item; } - -namespace -{ -SessionItem* AddFormFactorItem(SessionItem* p_parent, const QString& model_type) -{ - auto parent_type = p_parent->modelType(); - QString property_name; - if (parent_type == "Particle") { - property_name = ParticleItem::P_FORM_FACTOR; - } else if (parent_type == "MesoCrystal") { - property_name = MesoCrystalItem::P_OUTER_SHAPE; - } - if (property_name.isEmpty()) { - throw GUIHelpers::Error("AddFormFactorItem: parent is neither ParticleItem or " - "MesoCrystalItem"); - } - return p_parent->setGroupProperty(property_name, model_type); -} -} // namespace -- GitLab