Merge branch 'master' into feature/bug_305773

1 files changed, 10 insertions, 7 deletions

diff --git a/src/dotincldepgraph.h b/src/dotincldepgraph.h
index 5807ce8..a0e58bf 100644
--- a/src/dotincldepgraph.h
+++ b/src/dotincldepgraph.h
@@ -19,22 +19,25 @@
 #include "qcstring.h"
 #include "filedef.h"
 
+#include "dotnode.h"
 #include "dotgraph.h"
 
+class TextStream;
+
 /** Representation of an include dependency graph */
 class DotInclDepGraph : public DotGraph
 {
   public:
     DotInclDepGraph(const FileDef *fd,bool inverse);
     ~DotInclDepGraph();
-    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 writeImageMap=TRUE,int graphId=-1);
     bool isTrivial() const;
     bool isTooBig() const;
     int numNodes() const;
-    void writeXML(FTextStream &t);
-    void writeDocbook(FTextStream &t);
+    void writeXML(TextStream &t);
+    void writeDocbook(TextStream &t);
 
   protected:
     virtual QCString getBaseName() const;
@@ -44,11 +47,11 @@ class DotInclDepGraph : public DotGraph
   private:
     QCString diskName() const;
     void buildGraph(DotNode *n,const FileDef *fd,int distance);
-    void determineVisibleNodes(QList<DotNode> &queue,int &maxNodes);
-    void determineTruncatedNodes(QList<DotNode> &queue);
+    void determineVisibleNodes(DotNodeDeque &queue,int &maxNodes);
+    void determineTruncatedNodes(DotNodeDeque &queue);
 
     DotNode        *m_startNode;
-    QDict<DotNode> *m_usedNodes;
+    DotNodeMap      m_usedNodes;
     QCString        m_inclDepFileName;
     QCString        m_inclByDepFileName;
     bool            m_inverse;