1 files changed, 17 insertions, 13 deletions

diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h
index 40360da02e..4d93822db1 100644
--- a/src/tools/qdoc/htmlgenerator.h
+++ b/src/tools/qdoc/htmlgenerator.h
@@ -77,10 +77,10 @@ public:
     HtmlGenerator();
     ~HtmlGenerator();
 
-    virtual void initializeGenerator(const Config& config);
-    virtual void terminateGenerator();
-    virtual QString format();
-    virtual void generateDocs();
+    virtual void initializeGenerator(const Config& config) Q_DECL_OVERRIDE;
+    virtual void terminateGenerator() Q_DECL_OVERRIDE;
+    virtual QString format() Q_DECL_OVERRIDE;
+    virtual void generateDocs() Q_DECL_OVERRIDE;
     void generateManifestFiles();
 
     QString protectEnc(const QString &string);
@@ -89,20 +89,24 @@ public:
     static QString sinceTitle(int i) { return sinceTitles[i]; }
 
 protected:
+    virtual void generateQAPage() Q_DECL_OVERRIDE;
+    QString generateLinksToLinksPage(const QString& module, CodeMarker* marker);
+    QString generateLinksToBrokenLinksPage(CodeMarker* marker, int& count);
     virtual int generateAtom(const Atom *atom,
                              const Node *relative,
-                             CodeMarker *marker);
-    virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker);
-    virtual void generateQmlTypePage(QmlClassNode* qcn, CodeMarker* marker);
-    virtual void generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker* marker);
-    virtual void generateDocNode(DocNode* dn, CodeMarker* marker);
-    virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker);
-    virtual QString fileExtension() const;
+                             CodeMarker *marker) Q_DECL_OVERRIDE;
+    virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker) Q_DECL_OVERRIDE;
+    virtual void generateQmlTypePage(QmlClassNode* qcn, CodeMarker* marker) Q_DECL_OVERRIDE;
+    virtual void generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker* marker) Q_DECL_OVERRIDE;
+    virtual void generateDocNode(DocNode* dn, CodeMarker* marker) Q_DECL_OVERRIDE;
+    virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker) Q_DECL_OVERRIDE;
+    virtual QString fileExtension() const Q_DECL_OVERRIDE;
     virtual QString refForNode(const Node *node);
     virtual QString linkForNode(const Node *node, const Node *relative);
 
     void generateManifestFile(QString manifest, QString element);
     void readManifestMetaContent(const Config &config);
+    void generateKeywordAnchors(const Node* node);
 
 private:
     enum SubTitleSize { SmallSubTitle, LargeSubTitle };
@@ -179,7 +183,7 @@ private:
     void generateDetailedQmlMember(Node *node,
                                    const InnerNode *relative,
                                    CodeMarker *marker);
-    void generateQmlInherits(QmlClassNode* qcn, CodeMarker* marker);
+    void generateQmlInherits(QmlClassNode* qcn, CodeMarker* marker) Q_DECL_OVERRIDE;
     void generateQmlInstantiates(QmlClassNode* qcn, CodeMarker* marker);
     void generateInstantiatedBy(ClassNode* cn, CodeMarker* marker);
 
@@ -210,7 +214,7 @@ private:
     QString getAutoLink(const Atom *atom, const Node *relative, const Node** node);
 
     QString registerRef(const QString& ref);
-    virtual QString fileBase(const Node *node) const;
+    virtual QString fileBase(const Node *node) const Q_DECL_OVERRIDE;
     QString fileName(const Node *node);
     static int hOffset(const Node *node);
     static bool isThreeColumnEnumValueTable(const Atom *atom);