diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-11-11 08:50:30 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-11-11 08:50:30 (GMT) |
| commit | 749632c12feb8a43594d52309ea630c2bc8c5161 (patch) | |
| tree | 7f01814bf123ab609230dfdff331323140796f91 /tools | |
| parent | d7da33a914a7e84ebf38cbb3244aac936838ecb1 (diff) | |
| download | Qt-749632c12feb8a43594d52309ea630c2bc8c5161.zip Qt-749632c12feb8a43594d52309ea630c2bc8c5161.tar.gz Qt-749632c12feb8a43594d52309ea630c2bc8c5161.tar.bz2 | |
qdoc: Fixed virtualness and constness of the fileBase() function.
Task-number: QTBUG-13939
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 9 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 9e45f8c..76ee4e8 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -3413,7 +3413,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; @@ -3544,8 +3544,11 @@ QString HtmlGenerator::linkForNode(const Node *node, const Node *relative) return QString(); fn = fileName(node); -/* if (!node->url().isEmpty()) - return fn;*/ +#if 0 + if (!node->url().isEmpty()) + return fn; +#endif + #if 0 // ### reintroduce this test, without breaking .dcf files if (fn != outFileName()) diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index d885ada..b96d737 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -241,7 +241,7 @@ class HtmlGenerator : public PageGenerator void generateStatus(const Node *node, CodeMarker *marker); QString registerRef(const QString& ref); - QString fileBase(const Node *node); + virtual QString fileBase(const Node *node) const; #if 0 QString fileBase(const Node *node, const SectionIterator& section); #endif |