diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-10 13:03:59 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-06 02:59:01 (GMT) |
| commit | a69084bf1d29f1c1a1c1fccd4d6ef008efbdd49e (patch) | |
| tree | 3d9430cf6772a4b3836b7b16c93be668ac3a6c1e | |
| parent | 6272b259e0ed457885929367c912bb8ffcd46096 (diff) | |
| download | Qt-a69084bf1d29f1c1a1c1fccd4d6ef008efbdd49e.zip Qt-a69084bf1d29f1c1a1c1fccd4d6ef008efbdd49e.tar.gz Qt-a69084bf1d29f1c1a1c1fccd4d6ef008efbdd49e.tar.bz2 | |
qdoc: Ensured that text is encoded correctly.
(cherry picked from commit 9986c3f0c0681c7ea8bc8e5cfea5662880db6654)
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index e52ec53..afec919 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1720,7 +1720,7 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, out() << "</li>\n"; } if (!cn->name().isEmpty()) - out() << " <li>" << protect(cn->name()) << "</li>\n"; + out() << " <li>" << protectEnc(cn->name()) << "</li>\n"; } else if (node->type() == Node::Fake) { const FakeNode* fn = static_cast<const FakeNode*>(node); @@ -1728,13 +1728,13 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, out() << " <li><a href=\"modules.html\">Modules</a></li>"; QString name = node->name(); if (!name.isEmpty()) - out() << " <li>" << protect(name) << "</li>\n"; + out() << " <li>" << protectEnc(name) << "</li>\n"; } else if (node->subType() == Node::Group) { if (fn->name() == QString("modules")) out() << " <li>Modules</li>"; else { - out() << " <li>" << protect(title) << "</li>"; + out() << " <li>" << protectEnc(title) << "</li>"; } } else if (node->subType() == Node::Page) { @@ -1744,18 +1744,18 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, } else if (fn->name().startsWith("examples-")) { out() << " <li><a href=\"all-examples.html\">Examples</a></li>"; - out() << " <li>" << protect(title) << "</li>"; + out() << " <li>" << protectEnc(title) << "</li>"; } else if (fn->name() == QString("namespaces.html")) { out() << " <li>Namespaces</li>"; } else { - out() << " <li>" << protect(title) << "</li>"; + out() << " <li>" << protectEnc(title) << "</li>"; } } else if (node->subType() == Node::QmlClass) { out() << " <li><a href=\"qdeclarativeelements.html\">QML Elements</a></li>"; - out() << " <li>" << protect(title) << "</li>"; + out() << " <li>" << protectEnc(title) << "</li>"; } else if (node->subType() == Node::Example) { out() << " <li><a href=\"all-examples.html\">Examples</a></li>"; @@ -1763,17 +1763,17 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, if (sl.contains("declarative")) out() << " <li><a href=\"qdeclarativeexamples.html\">QML Examples & Demos</a></li>"; else { - QString name = protect("examples-" + sl.at(0) + ".html"); // this generates an empty link + QString name = protectEnc("examples-" + sl.at(0) + ".html"); // this generates an empty link QString t = CodeParser::titleFromName(name); out() << " <li><a href=\"" << name << "\">" << t << "</a></li>"; } - out() << " <li>" << protect(title) << "</li>"; + out() << " <li>" << protectEnc(title) << "</li>"; } } else if (node->type() == Node::Namespace) { out() << " <li><a href=\"namespaces.html\">Namespaces</a></li>"; - out() << " <li>" << protect(title) << "</li>"; + out() << " <li>" << protectEnc(title) << "</li>"; } } |