diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-06 10:24:20 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-06 10:24:20 (GMT) |
| commit | 3b6c44f773d293f807784b775f352873c793e75a (patch) | |
| tree | d6d8655179b3f74b73f4897007d1dc2983d9a8ac /tools/qdoc3/htmlgenerator.h | |
| parent | f8906a729761203866b100f5cd74e452cc94c451 (diff) | |
| download | Qt-3b6c44f773d293f807784b775f352873c793e75a.zip Qt-3b6c44f773d293f807784b775f352873c793e75a.tar.gz Qt-3b6c44f773d293f807784b775f352873c793e75a.tar.bz2 | |
qdoc: Simplified code to enable fixing of QTBUG-6340.
Also reworded some of the text for QTBUG-11575.
Task-number: QTBUG-6340, QTBUG-11575
Diffstat (limited to 'tools/qdoc3/htmlgenerator.h')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.h | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index aad5021..80341de 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -46,8 +46,6 @@ #ifndef HTMLGENERATOR_H #define HTMLGENERATOR_H -#define QDOC_NAME_ALIGNMENT - #include <qmap.h> #include <qregexp.h> #include <QXmlStreamWriter> @@ -198,7 +196,7 @@ class HtmlGenerator : public PageGenerator void generateQmlInstantiates(const QmlClassNode* qcn, CodeMarker* marker); void generateInstantiatedBy(const ClassNode* cn, CodeMarker* marker); #endif -#ifdef QDOC_NAME_ALIGNMENT + void generateSection(const NodeList& nl, const Node *relative, CodeMarker *marker, @@ -207,28 +205,15 @@ class HtmlGenerator : public PageGenerator const Node *relative, CodeMarker *marker, CodeMarker::SynopsisStyle style, - bool nameAlignment = false); - void generateSectionInheritedList(const Section& section, - const Node *relative, - CodeMarker *marker, - bool nameAlignment = false); - QString highlightedCode(const QString& markedCode, - CodeMarker *marker, - const Node *relative, - CodeMarker::SynopsisStyle style = CodeMarker::Accessors, - bool nameAlignment = false); -#else - void generateSynopsis(const Node *node, - const Node *relative, - CodeMarker *marker, - CodeMarker::SynopsisStyle style); + bool alignNames = false); void generateSectionInheritedList(const Section& section, const Node *relative, CodeMarker *marker); QString highlightedCode(const QString& markedCode, CodeMarker *marker, - const Node *relative); -#endif + const Node *relative, + bool alignNames = false); + void generateFullName(const Node *apparentNode, const Node *relative, CodeMarker *marker, |