- QtDocGenerator is now a GeneratorRunner plugin.

- A lot of methods moved from boostpythongenerator to the generator class.

1 files changed, 12 insertions, 12 deletions

diff --git a/generators/qtdoc/qtdocgenerator.h b/generators/qtdoc/qtdocgenerator.h
index cef7fa7a3..1d898197e 100644
--- a/generators/qtdoc/qtdocgenerator.h
+++ b/generators/qtdoc/qtdocgenerator.h
@@ -23,11 +23,16 @@
 #ifndef DOCGENERATOR_H
 #define DOCGENERATOR_H
 
-#include "boostpythongenerator.h"
 #include <QtCore/QStack>
+#include <QtCore/QHash>
+#include <QtCore/QTextStream>
+#include <apiextractor/abstractmetalang.h>
+#include "generator.h"
 
+class AbstractMetaFunction;
+class AbstractMetaClass;
 class QXmlStreamReader;
-class DocGenerator;
+class QtDocGenerator;
 
 class QtXmlToSphinx
 {
@@ -77,7 +82,7 @@ public:
             bool m_normalized;
     };
 
-    QtXmlToSphinx(DocGenerator* generator, const QString& doc, const QString& context = QString());
+    QtXmlToSphinx(QtDocGenerator* generator, const QString& doc, const QString& context = QString());
 
     QString result() const
     {
@@ -127,7 +132,7 @@ private:
     Table m_currentTable;
     bool m_tableHasHeader;
     QString m_context;
-    DocGenerator* m_generator;
+    QtDocGenerator* m_generator;
     bool m_insideBold;
     bool m_insideItalic;
     QString m_lastTagName;
@@ -149,24 +154,19 @@ QTextStream& operator<<(QTextStream& s, const QtXmlToSphinx::Table &table);
 /**
 *   The DocGenerator generates documentation from library being binded.
 */
-class DocGenerator : public BoostPythonGenerator
+class QtDocGenerator : public Generator
 {
 public:
-    virtual GeneratorType type() const
-    {
-        return DocumentationType;
-    }
-
     QString libSourceDir() const
     {
         return m_libSourceDir;
     }
 
-    virtual bool prepareGeneration(const QMap<QString, QString>& args);
+    bool doSetup(const QMap<QString, QString>& args);
 
     const char* name() const
     {
-        return "DocGenerator";
+        return "QtDocGenerator";
     }
 
     QMap<QString, QString> options() const;