diff options
| author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-12-16 12:39:59 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2016-01-04 15:27:38 +0000 |
| commit | f163790f57d9befb1459221781aebb3b6f86e463 (patch) | |
| tree | 47575cad1c3ea3d5b16478a6452c099523e05285 | |
| parent | fd6da222d116b49a6feee1f70a83e1bb447f4cec (diff) | |
qdoc: Unify CodeNew and Code blocks in HTML generation
As for CodeOld and CodeBad.
Change-Id: I8c6fc90d0cafef3a77ec48c0a2961f6041e056fd
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| -rw-r--r-- | src/qdoc/htmlgenerator.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 956868ef5..6b43cc653 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -586,11 +586,6 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark in_para = false; } break; - case Atom::Code: - out() << "<pre class=\"cpp\">" - << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),relative), codePrefix, codeSuffix) - << "</pre>\n"; - break; case Atom::Qml: out() << "<pre class=\"qml\">" << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),relative), codePrefix, codeSuffix) @@ -602,8 +597,10 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark << "</pre>\n"; break; case Atom::CodeNew: - out() << "<p>you can rewrite it as</p>\n" - << "<pre class=\"cpp\">" + out() << "<p>you can rewrite it as</p>\n"; + // fallthrough + case Atom::Code: + out() << "<pre class=\"cpp\">" << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),relative), codePrefix, codeSuffix) << "</pre>\n"; break; |