summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.h
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-11-28 19:44:21 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-11-28 19:44:21 (GMT)
commit344c3ad32bd36ad67731aa3171103a6c5e2f93e0 (patch)
tree218e2ae90de49df48f2fc7fc0f9e1ebd6571bf6e /tools/qdoc3/htmlgenerator.h
parentb81081ff67d3e27e36c8165c9b0814feca1fcf15 (diff)
downloadQt-344c3ad32bd36ad67731aa3171103a6c5e2f93e0.zip
Qt-344c3ad32bd36ad67731aa3171103a6c5e2f93e0.tar.gz
Qt-344c3ad32bd36ad67731aa3171103a6c5e2f93e0.tar.bz2
Added the foundations of QML markup support.
Use the QtDeclarative parser instead of Qt Creator's QML parser. Split the QML visitor into documentation and markup visitors. The code marker used for each file is now determined from its extension.
Diffstat (limited to 'tools/qdoc3/htmlgenerator.h')
-rw-r--r--tools/qdoc3/htmlgenerator.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 547cf2f..4276475 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -92,7 +92,7 @@ class HtmlGenerator : public PageGenerator
virtual void initializeGenerator(const Config& config);
virtual void terminateGenerator();
virtual QString format();
- virtual void generateTree(const Tree *tree, CodeMarker *marker);
+ virtual void generateTree(const Tree *tree);
QString protectEnc(const QString &string);
static QString protect(const QString &string, const QString &encoding = "ISO-8859-1");
@@ -247,8 +247,7 @@ class HtmlGenerator : public PageGenerator
void generatePageElements(QXmlStreamWriter& writer,
const Node* node,
CodeMarker* marker) const;
- void generatePageIndex(const QString& fileName,
- CodeMarker* marker) const;
+ void generatePageIndex(const QString& fileName) const;
void generateExtractionMark(const Node *node, ExtractionMarkType markType);
QMap<QString, QString> refMap;