Mercurial > hg > svcore
comparison data/model/AggregateWaveModel.cpp @ 1677:f97d64b8674f single-point
Make XmlExportables store their export IDs and always obtain a new one, avoiding reuse when an object is allocated at the same heap location as a previous one. This makes the ID system stable enough to be used in the export tests.
author | Chris Cannam |
---|---|
date | Thu, 28 Mar 2019 11:55:02 +0000 |
parents | 7b4d56b01440 |
children | e73baeead27f |
comparison
equal
deleted
inserted
replaced
1676:3b51df7695a4 | 1677:f97d64b8674f |
---|---|
231 QString indent, | 231 QString indent, |
232 QString extraAttributes) const | 232 QString extraAttributes) const |
233 { | 233 { |
234 QStringList componentStrings; | 234 QStringList componentStrings; |
235 for (const auto &c: m_components) { | 235 for (const auto &c: m_components) { |
236 componentStrings.push_back(QString("%1").arg(getObjectExportId(c.model))); | 236 componentStrings.push_back(QString("%1").arg(c.model->getExportId())); |
237 } | 237 } |
238 Model::toXml(out, indent, | 238 Model::toXml(out, indent, |
239 QString("type=\"aggregatewave\" components=\"%1\" %2") | 239 QString("type=\"aggregatewave\" components=\"%1\" %2") |
240 .arg(componentStrings.join(",")) | 240 .arg(componentStrings.join(",")) |
241 .arg(extraAttributes)); | 241 .arg(extraAttributes)); |