Merge branch 'master' into feature/bug_305773

1 files changed, 12 insertions, 10 deletions

diff --git a/src/dotclassgraph.h b/src/dotclassgraph.h
index 1874f54..6ccba08 100644
--- a/src/dotclassgraph.h
+++ b/src/dotclassgraph.h
@@ -17,9 +17,11 @@
 #define DOTCLASSGRAPH_H
 
 #include "classdef.h"
-
+#include "dotnode.h"
 #include "dotgraph.h"
 
+class TextStream;
+
 /** Representation of a class inheritance or dependency graph */
 class DotClassGraph : public DotGraph
 {
@@ -29,13 +31,13 @@ public:
   bool isTrivial() const;
   bool isTooBig() const;
   int numNodes() const;
-  QCString writeGraph(FTextStream &t,GraphOutputFormat gf,EmbeddedOutputFormat ef,
-    const char *path, const char *fileName, const char *relPath,
+  QCString writeGraph(TextStream &t,GraphOutputFormat gf,EmbeddedOutputFormat ef,
+    const QCString &path, const QCString &fileName, const QCString &relPath,
     bool TBRank=TRUE,bool imageMap=TRUE,int graphId=-1);
 
-  void writeXML(FTextStream &t);
-  void writeDocbook(FTextStream &t);
-  void writeDEF(FTextStream &t);
+  void writeXML(TextStream &t);
+  void writeDocbook(TextStream &t);
+  void writeDEF(TextStream &t);
 
 protected:
   virtual QCString getBaseName() const;
@@ -46,13 +48,13 @@ protected:
 private:
   void buildGraph(const ClassDef *cd,DotNode *n,bool base,int distance);
   bool determineVisibleNodes(DotNode *rootNode,int maxNodes,bool includeParents);
-  void determineTruncatedNodes(QList<DotNode> &queue,bool includeParents);
-  void addClass(const ClassDef *cd,DotNode *n,int prot,const char *label,
-    const char *usedName,const char *templSpec,
+  void determineTruncatedNodes(DotNodeDeque &queue,bool includeParents);
+  void addClass(const ClassDef *cd,DotNode *n,int prot,const QCString &label,
+    const QCString &usedName,const QCString &templSpec,
     bool base,int distance);
 
   DotNode        *   m_startNode;
-  QDict<DotNode> *   m_usedNodes;
+  DotNodeMap         m_usedNodes;
   GraphType          m_graphType;
   QCString           m_collabFileName;
   QCString           m_inheritFileName;