Adapt collectors to the information that will be available from VDX and VSDX parsers too

1 files changed, 5 insertions, 6 deletions

diff --git a/src/lib/VSDShapeList.h b/src/lib/VSDShapeList.h
index 06c8b15..8c7b365 100644
--- a/src/lib/VSDShapeList.h
+++ b/src/lib/VSDShapeList.h
@@ -37,26 +37,25 @@
 namespace libvisio
 {
 
-class VSDShapeListElement;
-
 class VSDShapeList
 {
 public:
   VSDShapeList();
-  VSDShapeList(const VSDShapeList &shapeList);
   ~VSDShapeList();
-  VSDShapeList &operator=(const VSDShapeList &shapeList);
   void addShapeId(unsigned id, unsigned level, unsigned shapeId);
   void setElementsOrder(const std::vector<unsigned> &elementsOrder);
-  void handle(VSDCollector *collector) const;
   void clear();
   bool empty() const
   {
     return (m_elements.empty());
   }
+  const std::vector<unsigned> &getShapesOrder();
 private:
-  std::map<unsigned, VSDShapeListElement *> m_elements;
+  VSDShapeList(const VSDShapeList &);
+  VSDShapeList &operator=(const VSDShapeList &);
+  std::map<unsigned, unsigned> m_elements;
   std::vector<unsigned> m_elementsOrder;
+  std::vector<unsigned> m_shapesOrder;
 };
 
 } // namespace libvisio