Tooltip was twice 'HTML escaped'

3 files changed, 1 insertions, 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 << "&lt;"; break;
-        case '>':  m_t << "&gt;"; 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 << "<div class=\"ttdoc\">";
-    docify_tt(desc); // desc is already HTML escaped; but there are still < and > signs
+    docify(desc);
     m_t << "</div>";
   }
   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 << "&quot;"; break;
-      case '\'':  m_t << "&#39;";  break;
-      case '<':   m_t << "&lt;";   break;
-      case '>':   m_t << "&gt;";   break;
-      case '&':   m_t << "&amp;";  break;
       default:    m_t << c;
     }
   }