diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2019-03-15 12:11:21 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2019-03-15 16:24:23 +0000 |
| commit | 46ddc9424ddd64316234194c31ac4ffad6cbab07 (patch) | |
| tree | 8e1b61f3eef57a736019d89600c6c50aaf358357 /src/qdoc/webxmlgenerator.h | |
| parent | 199ab6882e40e244eabf93538b6765e4da43a9f8 (diff) | |
qdoc: Fix regressions in WebXML output
An update to qdoc that refactored the index file output was not reflected
in the webxmlgenerator.
This commit implements a callback interface between QDocIndexFiles and
WebXMLGenerator to enable the latter to append documentation to generated
elements. This also eliminates virtually all duplicated logic between the
two classes.
Fixes: QTBUG-74424
Change-Id: Ia302bbfd290c8d74591cb4804458d5b73c301378
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qdoc/webxmlgenerator.h')
| -rw-r--r-- | src/qdoc/webxmlgenerator.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qdoc/webxmlgenerator.h b/src/qdoc/webxmlgenerator.h index b5cb0e8b4..f243a5402 100644 --- a/src/qdoc/webxmlgenerator.h +++ b/src/qdoc/webxmlgenerator.h @@ -34,10 +34,11 @@ #include "codemarker.h" #include "config.h" #include "htmlgenerator.h" +#include "qdocindexfiles.h" QT_BEGIN_NAMESPACE -class WebXMLGenerator : public HtmlGenerator +class WebXMLGenerator : public HtmlGenerator, public IndexSectionWriter { public: explicit WebXMLGenerator() {} @@ -46,7 +47,8 @@ public: void initializeGenerator(const Config &config) override; void terminateGenerator() override; QString format() override; - //void generateDocs() override; + // from IndexSectionWriter + void append(QXmlStreamWriter &writer, Node *node) override; protected: int generateAtom(const Atom *atom, const Node *relative, CodeMarker *marker) override; @@ -57,8 +59,7 @@ protected: virtual const Atom *addAtomElements(QXmlStreamWriter &writer, const Atom *atom, const Node *relative, CodeMarker *marker); - virtual void generateIndexSections(QXmlStreamWriter &writer, Node *node, - CodeMarker *marker); + virtual void generateIndexSections(QXmlStreamWriter &writer, Node *node); private: |