diff options
Diffstat (limited to 'src/tools/qdoc/helpprojectwriter.cpp')
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index da2a43d7e8..590feba166 100644 --- a/src/tools/qdoc/helpprojectwriter.cpp +++ b/src/tools/qdoc/helpprojectwriter.cpp @@ -211,7 +211,7 @@ QStringList HelpProjectWriter::keywordDetails(const Node *node) const details << node->name(); details << node->name(); } - details << HtmlGenerator::fullDocumentLocation(node,true); + details << Generator::fullDocumentLocation(node,true); return details; } @@ -271,12 +271,12 @@ bool HelpProjectWriter::generateSection(HelpProject &project, case Node::Class: project.keywords.append(keywordDetails(node)); - project.files.insert(HtmlGenerator::fullDocumentLocation(node,true)); + project.files.insert(Generator::fullDocumentLocation(node,true)); break; case Node::Namespace: project.keywords.append(keywordDetails(node)); - project.files.insert(HtmlGenerator::fullDocumentLocation(node,true)); + project.files.insert(Generator::fullDocumentLocation(node,true)); break; case Node::Enum: @@ -296,7 +296,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project, details << item.name(); // "name" details << item.name(); // "id" } - details << HtmlGenerator::fullDocumentLocation(node,true); + details << Generator::fullDocumentLocation(node,true); project.keywords.append(details); } } @@ -328,7 +328,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project, if (node->relates()) { project.memberStatus[node->relates()].insert(node->status()); - project.files.insert(HtmlGenerator::fullDocumentLocation(node->relates(),true)); + project.files.insert(Generator::fullDocumentLocation(node->relates(),true)); } else if (node->parent()) project.memberStatus[node->parent()].insert(node->status()); } @@ -342,7 +342,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project, // Use the location of any associated enum node in preference // to that of the typedef. if (enumNode) - typedefDetails[2] = HtmlGenerator::fullDocumentLocation(enumNode,true); + typedefDetails[2] = Generator::fullDocumentLocation(enumNode,true); project.keywords.append(typedefDetails); } @@ -350,7 +350,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project, case Node::Variable: { - QString location = HtmlGenerator::fullDocumentLocation(node,true); + QString location = Generator::fullDocumentLocation(node,true); project.files.insert(location.left(location.lastIndexOf(QLatin1Char('#')))); project.keywords.append(keywordDetails(node)); } @@ -370,12 +370,12 @@ bool HelpProjectWriter::generateSection(HelpProject &project, QStringList details; details << keyword->string() << keyword->string() - << HtmlGenerator::fullDocumentLocation(node,true) + + << Generator::fullDocumentLocation(node,true) + QLatin1Char('#') + Doc::canonicalTitle(keyword->string()); project.keywords.append(details); } else fakeNode->doc().location().warning( - tr("Bad keyword in %1").arg(HtmlGenerator::fullDocumentLocation(node,true)) + tr("Bad keyword in %1").arg(Generator::fullDocumentLocation(node,true)) ); } } @@ -398,7 +398,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project, } } */ - project.files.insert(HtmlGenerator::fullDocumentLocation(node,true)); + project.files.insert(Generator::fullDocumentLocation(node,true)); } break; } @@ -477,7 +477,7 @@ void HelpProjectWriter::generate(const Tree *tre) void HelpProjectWriter::writeNode(HelpProject &project, QXmlStreamWriter &writer, const Node *node) { - QString href = HtmlGenerator::fullDocumentLocation(node,true); + QString href = Generator::fullDocumentLocation(node,true); QString objName = node->name(); switch (node->type()) { @@ -625,12 +625,12 @@ void HelpProjectWriter::generateProject(HelpProject &project) node = tree->findNode(QStringList("index.html")); QString indexPath; if (node) - indexPath = HtmlGenerator::fullDocumentLocation(node,true); + indexPath = Generator::fullDocumentLocation(node,true); else indexPath = "index.html"; writer.writeAttribute("ref", indexPath); writer.writeAttribute("title", project.indexTitle); - project.files.insert(HtmlGenerator::fullDocumentLocation(rootNode)); + project.files.insert(Generator::fullDocumentLocation(rootNode)); generateSections(project, writer, rootNode); @@ -668,7 +668,7 @@ void HelpProjectWriter::generateProject(HelpProject &project) const FakeNode *page = tree->findFakeNodeByTitle(atom->string()); writer.writeStartElement("section"); - QString indexPath = HtmlGenerator::fullDocumentLocation(page,true); + QString indexPath = Generator::fullDocumentLocation(page,true); writer.writeAttribute("ref", indexPath); writer.writeAttribute("title", atom->string()); project.files.insert(indexPath); @@ -693,7 +693,7 @@ void HelpProjectWriter::generateProject(HelpProject &project) if (!name.isEmpty()) { writer.writeStartElement("section"); - QString indexPath = HtmlGenerator::fullDocumentLocation(tree->findFakeNodeByTitle(subproject.indexTitle),true); + QString indexPath = Generator::fullDocumentLocation(tree->findFakeNodeByTitle(subproject.indexTitle),true); writer.writeAttribute("ref", indexPath); writer.writeAttribute("title", subproject.title); project.files.insert(indexPath); |