summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-11-24 17:56:10 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2018-11-24 17:56:10 (GMT)
commite8ad5f9987d2284b8052031f4a7160ac303ae242 (patch)
treed1cacf0e234913f1396774ce7a7a2e9994c19983
parent4603ba0af233674c6612395e4fa8e94b9bb25141 (diff)
parent4ed08b969b575d6dc1a49bca936a43eb43d337e2 (diff)
downloadDoxygen-e8ad5f9987d2284b8052031f4a7160ac303ae242.zip
Doxygen-e8ad5f9987d2284b8052031f4a7160ac303ae242.tar.gz
Doxygen-e8ad5f9987d2284b8052031f4a7160ac303ae242.tar.bz2
Merge branch 'albert-github-feature/bug_emoji_objc'
-rw-r--r--src/reflist.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/reflist.cpp b/src/reflist.cpp
index 7ae4c80..6f2a763 100644
--- a/src/reflist.cpp
+++ b/src/reflist.cpp
@@ -169,10 +169,19 @@ void RefList::generatePage()
doc += item->prefix;
doc += " \\_internalref ";
doc += item->name;
- doc += " \"";
// escape \'s in title, see issue #5901
- doc += substitute(item->title,"\\","\\\\");
- doc += "\" ";
+ QCString escapedTitle = substitute(item->title,"\\","\\\\");
+ if (item->scope &&
+ (item->scope->definitionType()==Definition::TypeClass ||
+ item->scope->definitionType()==Definition::TypeNamespace ||
+ item->scope->definitionType()==Definition::TypeMember ||
+ item->scope->definitionType()==Definition::TypePackage)
+ )
+ {
+ // prevent Obj-C names in e.g. todo list are seen as emoji
+ escapedTitle = substitute(escapedTitle,":","&Colon;");
+ }
+ doc += " \""+escapedTitle+"\" ";
// write declaration in case a function with arguments
if (!item->args.isEmpty())
{