summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/pagegenerator.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-02-10 15:51:48 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-02-10 15:51:48 (GMT)
commitc072fa8fdd0cebcaff9062e07d4623bbd7aded3c (patch)
treedb35223ec643fbc5aeadcfab4112e5686ff44b8f /tools/qdoc3/pagegenerator.cpp
parentbf54d63fb1b60ad899d0b14889109278bd04fd9d (diff)
parent9a83bf2676dabdf36f9ca491b480b50d8e7ed93d (diff)
downloadQt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.zip
Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.gz
Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
-rw-r--r--tools/qdoc3/pagegenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index bc73eb0..2cad9ed 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -77,7 +77,7 @@ void PageGenerator::generateTree(const Tree *tree, CodeMarker *marker)
generateInnerNode(tree->root(), marker);
}
-QString PageGenerator::fileBase(const Node *node)
+QString PageGenerator::fileBase(const Node *node) const
{
if (node->relates())
node = node->relates();
@@ -153,7 +153,7 @@ QString PageGenerator::fileBase(const Node *node)
return res;
}
-QString PageGenerator::fileName(const Node *node)
+QString PageGenerator::fileName(const Node *node) const
{
if (!node->url().isEmpty())
return node->url();