diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-09-21 11:05:07 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-09-21 11:05:07 (GMT) |
| commit | 5d1a38fc9e5a8fbbbb78ed8aeb7e328b97781474 (patch) | |
| tree | 6910fbbfd547510f34307e325174a4250dd6d942 | |
| parent | 445513153c6c4f80eccf77c33ca38574b5972922 (diff) | |
| download | Qt-5d1a38fc9e5a8fbbbb78ed8aeb7e328b97781474.zip Qt-5d1a38fc9e5a8fbbbb78ed8aeb7e328b97781474.tar.gz Qt-5d1a38fc9e5a8fbbbb78ed8aeb7e328b97781474.tar.bz2 | |
qdoc: Replaced missing "const" That caused link errors.
A const had been erroneously dropped from some fileBase()
functions.
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.h | 5 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 4 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.h | 4 |
4 files changed, 6 insertions, 9 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index de70d29..d25c76c 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -3361,7 +3361,7 @@ QString DitaXmlGenerator::protect(const QString& string, const QString& outputEn Constructs a file name appropriate for the \a node and returns the file name. */ -QString DitaXmlGenerator::fileBase(const Node* node) +QString DitaXmlGenerator::fileBase(const Node* node) const { QString result; result = PageGenerator::fileBase(node); diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h index a5346a5..6f99e90 100644 --- a/tools/qdoc3/ditaxmlgenerator.h +++ b/tools/qdoc3/ditaxmlgenerator.h @@ -231,10 +231,7 @@ class DitaXmlGenerator : public PageGenerator void generateStatus(const Node* node, CodeMarker* marker); QString registerRef(const QString& ref); - QString fileBase(const Node* node); -#if 0 - QString fileBase(const Node* node, const SectionIterator& section); -#endif + QString fileBase(const Node* node) const; QString fileName(const Node* node); void findAllClasses(const InnerNode* node); void findAllFunctions(const InnerNode* node); diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 77e306a..2849325 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -3417,7 +3417,7 @@ QString HtmlGenerator::protect(const QString &string, const QString &outputEncod #undef APPEND } -QString HtmlGenerator::fileBase(const Node *node) +QString HtmlGenerator::fileBase(const Node *node) const { QString result; @@ -3440,7 +3440,7 @@ QString HtmlGenerator::fileBase(const Node *node) #if 0 QString HtmlGenerator::fileBase(const Node *node, - const SectionIterator& section) + const SectionIterator& section) const { QStringList::ConstIterator s = section.sectionNumber().end(); QStringList::ConstIterator b = section.baseNameStack().end(); diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index d885ada..430aca2 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -241,9 +241,9 @@ class HtmlGenerator : public PageGenerator void generateStatus(const Node *node, CodeMarker *marker); QString registerRef(const QString& ref); - QString fileBase(const Node *node); + QString fileBase(const Node *node) const; #if 0 - QString fileBase(const Node *node, const SectionIterator& section); + QString fileBase(const Node *node, const SectionIterator& section) const; #endif QString fileName(const Node *node); void findAllClasses(const InnerNode *node); |