# HG changeset patch
# User Chris Cannam
# Date 1553774131 0
# Node ID b22a4df37095e55b3b99377a7209a0cf816251e8
# Parent  09d008b5c8f429773d0d0ee6fd50a7853385ac4f
Update to using export IDs stored in XmlExportables

diff -r 09d008b5c8f4 -r b22a4df37095 layer/Layer.cpp
--- a/layer/Layer.cpp	Fri Mar 22 17:49:15 2019 +0000
+++ b/layer/Layer.cpp	Thu Mar 28 11:55:31 2019 +0000
@@ -647,9 +647,9 @@
     stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5")
         .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName
                             (LayerFactory::getInstance()->getLayerType(this))))
-        .arg(getObjectExportId(this))
+        .arg(getExportId())
         .arg(encodeEntities(objectName()))
-        .arg(getObjectExportId(getModel()))
+        .arg(getModel() ? getModel()->getExportId() : -1)
         .arg(extraAttributes);
 
     if (m_measureRects.empty()) {
@@ -681,9 +681,9 @@
     stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5/>\n")
         .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName
                             (LayerFactory::getInstance()->getLayerType(this))))
-        .arg(getObjectExportId(this))
+        .arg(getExportId())
         .arg(encodeEntities(objectName()))
-        .arg(getObjectExportId(getModel()))
+        .arg(getModel() ? getModel()->getExportId() : -1)
         .arg(extraAttributes);
 }
 
diff -r 09d008b5c8f4 -r b22a4df37095 view/View.cpp
--- a/view/View.cpp	Fri Mar 22 17:49:15 2019 +0000
+++ b/view/View.cpp	Thu Mar 28 11:55:31 2019 +0000
@@ -234,7 +234,7 @@
     for (LayerList::const_iterator i = m_layerStack.begin();
          i != m_layerStack.end(); ++i) { 
         if ((*i)->needsTextLabelHeight()) {
-            sortedLayers[getObjectExportId(*i)] = *i;
+            sortedLayers[(*i)->getExportId()] = *i;
         }
     }