Refactoring code for dot related source files

1 files changed, 10 insertions, 33 deletions

diff --git a/src/dot.h b/src/dot.h
index 124a32b..12ee540 100644
--- a/src/dot.h
+++ b/src/dot.h
@@ -18,66 +18,43 @@
 
 #include <qlist.h>
 #include <qdict.h>
-#include <qwaitcondition.h>
-#include <qmutex.h>
-#include <qqueue.h>
-#include <qthread.h>
+#include <qcstring.h>
+
 #include "sortdict.h"
-#include "qgstring.h"
-#include "qdir.h"
-#include "qcstring.h"
-#include "dotgraph.h"
-#include "dotfilepatcher.h"
-#include "dotrunner.h"
+
+#include "dotgraph.h" // only for GraphOutputFormat
 
 class FTextStream;
 class DotRunner;
 class DotRunnerQueue;
 class DotWorkerThread;
+class DotFilePatcher;
 
-/** Singleton that manages dot relation actions */
+/** Singleton that manages parallel dot invocations and patching files for embedding image maps */
 class DotManager
 {
   public:
     static DotManager *instance();
-    DotRunner* createRunner(const QCString& absDotName, const QCString& md5Hash);
-    int  addMap(const QCString &file,const QCString &mapFile,
-                const QCString &relPath,bool urlOnly,
-                const QCString &context,const QCString &label);
-    int addFigure(const QCString &file,const QCString &baseName,
-                  const QCString &figureName,bool heightCheck);
-    int addSVGConversion(const QCString &file,const QCString &relPath,
-               bool urlOnly,const QCString &context,bool zoomable,int graphId);
-    int addSVGObject(const QCString &file,const QCString &baseName,
-                     const QCString &figureNAme,const QCString &relPath);
-    bool run();
+    DotRunner*      createRunner(const QCString& absDotName, const QCString& md5Hash);
+    DotFilePatcher *createFilePatcher(const QCString &fileName);
+    bool run() const;
 
   private:
     DotManager();
     virtual ~DotManager();
 
     QDict<DotRunner>       m_runners;
-    SDict<DotFilePatcher> m_dotMaps;
+    SDict<DotFilePatcher>  m_filePatchers;
     static DotManager     *m_theInstance;
     DotRunnerQueue        *m_queue;
     QList<DotWorkerThread> m_workers;
 };
 
-void initDot();
-
-/** Generated a graphs legend page */
-void generateGraphLegend(const char *path);
-
 void writeDotGraphFromFile(const char *inFile,const char *outDir,
                            const char *outFile,GraphOutputFormat format);
 void writeDotImageMapFromFile(FTextStream &t,
                               const QCString& inFile, const QCString& outDir,
                               const QCString& relPath,const QCString& baseName,
                               const QCString& context,int graphId=-1);
-bool writeSVGFigureLink(FTextStream &out,const QCString &relPath,
-                        const QCString &baseName,const QCString &absImgName);
-bool convertMapFile(FTextStream &t,const char *mapName,
-                    const QCString relPath, bool urlOnly=FALSE,
-                    const QCString &context=QCString());
 
 #endif