From 80c321c6856e7923e99c2ece878da5625566712c Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 7 Jul 2018 13:12:08 +0200 Subject: Tooltip was twice 'HTML escaped' --- src/htmlgen.cpp | 23 +---------------------- src/htmlgen.h | 1 - src/textdocvisitor.cpp | 5 ----- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 8feb8b0..32eaff6 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -514,27 +514,6 @@ void HtmlCodeGenerator::docify(const char *str) } } -void HtmlCodeGenerator::docify_tt(const char *str) -{ - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(str)); - - if (str && m_streamSet) - { - const char *p=str; - char c; - while (*p) - { - c=*p++; - switch(c) - { - case '<': m_t << "<"; break; - case '>': m_t << ">"; break; - default: m_t << c; - } - } - } -} - void HtmlCodeGenerator::writeLineNumber(const char *ref,const char *filename, const char *anchor,int l) { @@ -627,7 +606,7 @@ void HtmlCodeGenerator::writeTooltip(const char *id, const DocLinkInfo &docInfo, if (desc) { m_t << "
"; - docify_tt(desc); // desc is already HTML escaped; but there are still < and > signs + docify(desc); m_t << "
"; } if (!defInfo.file.isEmpty()) diff --git a/src/htmlgen.h b/src/htmlgen.h index b80d7d4..2d8d6e0 100644 --- a/src/htmlgen.h +++ b/src/htmlgen.h @@ -61,7 +61,6 @@ class HtmlCodeGenerator : public CodeOutputInterface const char *anchor,const char *name, const char *tooltip); void docify(const char *str); - void docify_tt(const char *str); bool m_streamSet; FTextStream m_t; int m_col; diff --git a/src/textdocvisitor.cpp b/src/textdocvisitor.cpp index 8c8ecad..c899232 100644 --- a/src/textdocvisitor.cpp +++ b/src/textdocvisitor.cpp @@ -50,11 +50,6 @@ void TextDocVisitor::filter(const char *str) switch(c) { case '\n': m_t << " "; break; - case '"': m_t << """; break; - case '\'': m_t << "'"; break; - case '<': m_t << "<"; break; - case '>': m_t << ">"; break; - case '&': m_t << "&"; break; default: m_t << c; } } -- cgit v0.12