Skip to content
Snippets Groups Projects
Commit eb2ced4e authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

CompoundItem: rm return value; don't start from nullptr

parent fdc0bf79
No related branches found
No related tags found
1 merge request!2369prefer QVector over QList; rename some catalogs; cleanup
...@@ -86,7 +86,9 @@ void CompoundItem::readFrom(QXmlStreamReader* r) ...@@ -86,7 +86,9 @@ void CompoundItem::readFrom(QXmlStreamReader* r)
// particle // particle
} else if (tag == Tag::Particle) { } else if (tag == Tag::Particle) {
addItemWithParticleSelection(nullptr).readFrom(r, m_materials); PolyItem<ParticlesCatalog> p;
p.readFrom(r, m_materials);
m_particles.emplace_item_back(p.releaseItem());
XML::gotoEndElementOfTag(r, tag); XML::gotoEndElementOfTag(r, tag);
// compound groupbox: is expanded? // compound groupbox: is expanded?
...@@ -132,10 +134,9 @@ QVector<ItemWithParticles*> CompoundItem::itemsWithParticles() const ...@@ -132,10 +134,9 @@ QVector<ItemWithParticles*> CompoundItem::itemsWithParticles() const
return m_particles.toModifiableQVector(); return m_particles.toModifiableQVector();
} }
PolyItem<ParticlesCatalog>& CompoundItem::addItemWithParticleSelection(ItemWithParticles* particle) void CompoundItem::addItemWithParticleSelection(ItemWithParticles* particle)
{ {
m_particles.emplace_item_back(particle); m_particles.emplace_item_back(particle);
return m_particles.back();
} }
void CompoundItem::removeItemWithParticle(ItemWithParticles* particle) void CompoundItem::removeItemWithParticle(ItemWithParticles* particle)
......
...@@ -33,7 +33,8 @@ public: ...@@ -33,7 +33,8 @@ public:
std::unique_ptr<Compound> createCompound() const; std::unique_ptr<Compound> createCompound() const;
QVector<ItemWithParticles*> itemsWithParticles() const; QVector<ItemWithParticles*> itemsWithParticles() const;
PolyItem<ParticlesCatalog>& addItemWithParticleSelection(ItemWithParticles* particle);
void addItemWithParticleSelection(ItemWithParticles* particle);
void removeItemWithParticle(ItemWithParticles* particle); void removeItemWithParticle(ItemWithParticles* particle);
QVector<ItemWithParticles*> containedItemsWithParticles() const override; QVector<ItemWithParticles*> containedItemsWithParticles() const override;
......
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