1 files changed, 16 insertions, 16 deletions

diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h
index b464014308..2ea2715e80 100644
--- a/src/tools/qdoc/generator.h
+++ b/src/tools/qdoc/generator.h
@@ -77,7 +77,7 @@ public:
 
     virtual bool canHandleFormat(const QString &format) { return format == this->format(); }
     virtual QString format() = 0;
-    virtual void generateTree();
+    virtual void generateDocs();
     virtual void initializeGenerator(const Config &config);
     virtual void terminateGenerator();
 
@@ -90,12 +90,15 @@ public:
     static const QString& outputDir() { return outDir_; }
     static const QString& outputSubdir() { return outSubdir_; }
     static void terminate();
+    static const QStringList& outputFileNames() { return outFileNames_; }
     static void writeOutFileNames();
     static void augmentImageDirs(QSet<QString>& moreImageDirs);
-    static void debugSegfault(const QString& message);
-    static void setDebugSegfaultFlag(bool b);
+    static void debug(const QString& message);
+    static void startDebugging(const QString& message);
+    static void stopDebugging(const QString& message);
     static bool debugging() { return debugging_; }
     static bool noLinkErrors() { return noLinkErrors_; }
+    static bool autolinkErrors() { return autolinkErrors_; }
     static void setQDocPass(Passes pass) { qdocPass_ = pass; }
     static bool runPrepareOnly() { return (qdocPass_ == Prepare); }
     static bool runGenerateOnly() { return (qdocPass_ == Generate); }
@@ -109,27 +112,24 @@ protected:
     virtual QString fileBase(const Node* node) const;
     virtual QString fileExtension() const = 0;
     virtual void generateAlsoList(const Node *node, CodeMarker *marker);
-    virtual int generateAtom(const Atom *atom,
-                             const Node *relative,
-                             CodeMarker *marker);
+    virtual int generateAtom(const Atom *atom, const Node *relative, CodeMarker *marker);
     virtual void generateBody(const Node *node, CodeMarker *marker);
     virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker);
+    virtual void generateQmlTypePage(QmlClassNode* , CodeMarker* ) { }
+    virtual void generateQmlBasicTypePage(QmlBasicTypeNode* , CodeMarker* ) { }
     virtual void generateDocNode(DocNode* dn, CodeMarker* marker);
-    virtual void generateInheritedBy(const ClassNode *classe,
-                                     CodeMarker *marker);
-    virtual void generateInherits(const ClassNode *classe,
-                                  CodeMarker *marker);
+    virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker);
+    virtual void generateInheritedBy(const ClassNode *classe, CodeMarker *marker);
+    virtual void generateInherits(const ClassNode *classe, CodeMarker *marker);
     virtual void generateInnerNode(InnerNode* node);
     virtual void generateMaintainerList(const InnerNode* node, CodeMarker* marker);
     virtual void generateQmlInheritedBy(const QmlClassNode* qcn, CodeMarker* marker);
-    virtual void generateQmlInherits(const QmlClassNode* qcn, CodeMarker* marker);
+    virtual void generateQmlInherits(QmlClassNode* qcn, CodeMarker* marker);
     virtual bool generateQmlText(const Text& text,
                                  const Node *relative,
                                  CodeMarker *marker,
                                  const QString& qmlName);
-    virtual bool generateText(const Text& text,
-                              const Node *relative,
-                              CodeMarker *marker);
+    virtual bool generateText(const Text& text, const Node *relative, CodeMarker *marker);
     virtual QString imageFileName(const Node *relative, const QString& fileBase);
     virtual int skipAtoms(const Atom *atom, Atom::Type type) const;
     virtual QString typeString(const Node *node);
@@ -158,7 +158,6 @@ protected:
     void generateSince(const Node *node, CodeMarker *marker);
     void generateStatus(const Node *node, CodeMarker *marker);
     void generateThreadSafeness(const Node *node, CodeMarker *marker);
-    QString getCollisionLink(const Atom* atom);
     QString getMetadataElement(const InnerNode* inner, const QString& t);
     QStringList getMetadataElements(const InnerNode* inner, const QString& t);
     QString indent(int level, const QString& markedCode);
@@ -176,7 +175,6 @@ protected:
     void unknownAtom(const Atom *atom);
     void appendSortedQmlNames(Text& text, const Node* base, const NodeList& subs);
 
-    QList<NameCollisionNode*> collisionNodes;
     QMap<QString, QStringList> editionGroupMap;
     QMap<QString, QStringList> editionModuleMap;
     QString naturalLanguage;
@@ -211,6 +209,7 @@ private:
     static QString project;
     static QString outDir_;
     static QString outSubdir_;
+    static QStringList outFileNames_;
     static QSet<QString> outputFormats;
     static QHash<QString, QString> outputPrefixes;
     static QStringList scriptDirs;
@@ -219,6 +218,7 @@ private:
     static QStringList styleFiles;
     static bool debugging_;
     static bool noLinkErrors_;
+    static bool autolinkErrors_;
     static bool redirectDocumentationToDevNull_;
     static Passes qdocPass_;
     static bool useOutputSubdirs_;