1 files changed, 12 insertions, 7 deletions
diff --git a/src/dotgfxhierarchytable.h b/src/dotgfxhierarchytable.h
index 5a5bcad..0d884bd 100644
--- a/src/dotgfxhierarchytable.h
+++ b/src/dotgfxhierarchytable.h
@@ -16,6 +16,11 @@
 #ifndef DOTGFXHIERARCHYTABLE_H
 #define DOTGFXHIERARCHYTABLE_H
 
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 #include "classdef.h"
 #include "ftextstream.h"
 
@@ -27,11 +32,10 @@ class DotGfxHierarchyTable : public DotGraph
 {
   public:
     DotGfxHierarchyTable(const char *prefix="",ClassDef::CompoundType ct=ClassDef::Class);
-    ~DotGfxHierarchyTable();
     void createGraph(DotNode *rootNode,FTextStream &t,const char *path,
                      const char *fileName,int id);
     void writeGraph(FTextStream &t,const char *path, const char *fileName);
-    const DotNodeList *subGraphs() const { return m_rootSubgraphs; }
+    const std::vector<DotNode*> subGraphs() const { return m_rootSubgraphs; }
 
   protected:
     virtual QCString getBaseName() const;
@@ -39,15 +43,16 @@ class DotGfxHierarchyTable : public DotGraph
     virtual void computeTheGraph();
 
   private:
-    void addHierarchy(DotNode *n,const ClassDef *cd,bool hide);
-    void addClassList(const ClassSDict *cl);
+    void addHierarchy(DotNode *n,const ClassDef *cd,ClassDefSet &visited);
+    void addClassList(const ClassSDict *cl,ClassDefSet &visited);
 
+    using DotNodeMap = std::unordered_multimap< std::string, std::unique_ptr<DotNode> >;
     int                    m_graphId;
     QCString               m_prefix;
     ClassDef::CompoundType m_classType;
-    QList<DotNode>        *m_rootNodes;
-    QDict<DotNode>        *m_usedNodes;
-    DotNodeList           *m_rootSubgraphs;
+    std::vector<DotNode*>  m_rootNodes;
+    DotNodeMap             m_usedNodes;
+    std::vector<DotNode*>  m_rootSubgraphs;
     DotNode *              m_rootSubgraphNode;
 };