diff --git a/GUI/Model/Descriptor/PolyVector.h b/GUI/Model/Descriptor/PolyVector.h index be544df19fa1adf001239c5de22e70c0217c54b3..0bcc6c0a9200226196466c08bbbd30df34595a77 100644 --- a/GUI/Model/Descriptor/PolyVector.h +++ b/GUI/Model/Descriptor/PolyVector.h @@ -72,7 +72,7 @@ public: return result; } - void emplace_polyitem_back(BaseType* item) { insert_item_at(m_v.size(), item); } + void emplace_item_back(BaseType* item) { insert_item_at(m_v.size(), item); } void clear() { m_v.clear(); } size_t size() const { return m_v.size(); } bool empty() const { return m_v.empty(); } diff --git a/GUI/Model/Device/InstrumentsSet.cpp b/GUI/Model/Device/InstrumentsSet.cpp index ae1aee8bad321ac451f5dde9e7495dcc079db247..5d7dfd36350164eafe680a5b3ff8dcb69a6fcf88 100644 --- a/GUI/Model/Device/InstrumentsSet.cpp +++ b/GUI/Model/Device/InstrumentsSet.cpp @@ -65,7 +65,7 @@ void InstrumentsSet::readFrom(QXmlStreamReader* r) // instrument if (tag == Tag::Instrument) { - m_instruments.emplace_polyitem_back(nullptr); + m_instruments.emplace_item_back(nullptr); m_instruments.back().readFrom(r); XML::gotoEndElementOfTag(r, tag); @@ -81,7 +81,7 @@ void InstrumentsSet::readFrom(QXmlStreamReader* r) void InstrumentsSet::emplace_back(InstrumentItem* item) { - m_instruments.emplace_polyitem_back(item); + m_instruments.emplace_item_back(item); } InstrumentItem* InstrumentsSet::insertItemCopy(const InstrumentItem& source) diff --git a/GUI/Model/Mask/MasksSet.cpp b/GUI/Model/Mask/MasksSet.cpp index e2ad01a13732138e2b69a80f6ff653565fa78ed8..9f7d24879706a7ea61d0348f28fa94a0df3abc38 100644 --- a/GUI/Model/Mask/MasksSet.cpp +++ b/GUI/Model/Mask/MasksSet.cpp @@ -47,7 +47,7 @@ void MasksSet::insertMask(int row, MaskItem* maskItem) void MasksSet::addMaskItem(MaskItem* maskItem) { // takes owning of maskItem! - m_mask_items.emplace_polyitem_back(maskItem); + m_mask_items.emplace_item_back(maskItem); } void MasksSet::moveMask(int from_row, int to_row) diff --git a/GUI/Model/Sample/CompoundItem.cpp b/GUI/Model/Sample/CompoundItem.cpp index 8ffcf1b0d82a590da1585f2dc7575d8fbd2425e4..1b7c0cd5ce823a549fd2c908a30dbb63ed79ec48 100644 --- a/GUI/Model/Sample/CompoundItem.cpp +++ b/GUI/Model/Sample/CompoundItem.cpp @@ -135,7 +135,7 @@ QVector<ItemWithParticles*> CompoundItem::itemsWithParticles() const PolyItem<ItemWithParticlesCatalog>& CompoundItem::addItemWithParticleSelection(ItemWithParticles* particle) { - m_particles.emplace_polyitem_back(particle); + m_particles.emplace_item_back(particle); return m_particles.back(); } diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp index 85740810d514f0c3210455bcd130418ddf505cd0..0eab229bf795391ee9ea945ca434fd4c0b54eddd 100644 --- a/GUI/Model/Sample/ParticleLayoutItem.cpp +++ b/GUI/Model/Sample/ParticleLayoutItem.cpp @@ -76,7 +76,7 @@ QVector<ItemWithParticles*> ParticleLayoutItem::itemsWithParticles() const PolyItem<ItemWithParticlesCatalog>& ParticleLayoutItem::addItemWithParticleSelection(ItemWithParticles* particle) { - m_particles.emplace_polyitem_back(particle); + m_particles.emplace_item_back(particle); return m_particles.back(); }