diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-11-11 08:51:57 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-11-11 08:51:57 (GMT) |
| commit | 6315183497eee1867c7ed899c6ea22fb66a4cfed (patch) | |
| tree | 3d57e0e79c8c0a0932ec18c97fa5851a00eecd98 /tools/qdoc3 | |
| parent | 749632c12feb8a43594d52309ea630c2bc8c5161 (diff) | |
| parent | fce752ba402535a62e420a83483d0f92623d684a (diff) | |
| download | Qt-6315183497eee1867c7ed899c6ea22fb66a4cfed.zip Qt-6315183497eee1867c7ed899c6ea22fb66a4cfed.tar.gz Qt-6315183497eee1867c7ed899c6ea22fb66a4cfed.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 4 | ||||
| -rw-r--r-- | tools/qdoc3/tokenizer.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index a83a321..d43ad96 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -2015,7 +2015,7 @@ void DitaXmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *mark } /*! - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void DitaXmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, @@ -2101,7 +2101,7 @@ void DitaXmlGenerator::generateTableOfContents(const Node *node, /*! Revised for the new doc format. - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void DitaXmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, diff --git a/tools/qdoc3/tokenizer.h b/tools/qdoc3/tokenizer.h index bd35965..1b33f6f 100644 --- a/tools/qdoc3/tokenizer.h +++ b/tools/qdoc3/tokenizer.h @@ -145,7 +145,7 @@ class Tokenizer int ch = getch(); if (ch == EOF) return EOF; - // cast explicitely to make sure the value of ch + // cast explicitly to make sure the value of ch // is in range [0..255] to avoid assert messages // when using debug CRT that checks its input. return int(uint(uchar(ch))); |