diff options
author | Joe George <joe@zeroc.com> | 2018-11-02 19:04:31 (GMT) |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2018-11-02 19:04:31 (GMT) |
commit | 1bbf1a37dfc67331a72918df3580818e7f21d0ae (patch) | |
tree | 17456c1f92616203975e20de9a6198fb585c07ad /src/reflist.cpp | |
parent | e36d06860e9e1441a402ec8c9a7e03742eb85e9a (diff) | |
parent | 1b88f2417deadcd6c25a47bd6f37c524c61abefc (diff) | |
download | Doxygen-1bbf1a37dfc67331a72918df3580818e7f21d0ae.zip Doxygen-1bbf1a37dfc67331a72918df3580818e7f21d0ae.tar.gz Doxygen-1bbf1a37dfc67331a72918df3580818e7f21d0ae.tar.bz2 |
Merge remote-tracking branch 'doxygen/master'
Diffstat (limited to 'src/reflist.cpp')
-rw-r--r-- | src/reflist.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/reflist.cpp b/src/reflist.cpp index 1da603e..7ae4c80 100644 --- a/src/reflist.cpp +++ b/src/reflist.cpp @@ -131,7 +131,15 @@ void RefList::insertIntoList(const char *key,RefItem *item) { if (ri!=item) { - ri->extraItems.append(item); + // We also have to check if the item is not already in the "extra" list + QListIterator<RefItem> li(ri->extraItems); + RefItem *extraItem; + bool doubleItem = false; + for (li.toFirst();(extraItem=li.current());++li) + { + if (item == extraItem) doubleItem = true; + } + if (!doubleItem) ri->extraItems.append(item); } } } @@ -148,8 +156,6 @@ void RefList::generatePage() for (it.toFirst();(item=it.current());++it) { doc += " <dt>"; - doc += "\\anchor "; - doc += item->listAnchor; doc += "\n"; if (item->scope) { @@ -171,15 +177,21 @@ void RefList::generatePage() if (!item->args.isEmpty()) { // escape @'s in argument list, needed for Java annotations (see issue #6208) - doc += substitute(item->args,"@","@@"); + // escape \'s in argument list (see issue #6533) + doc += substitute(substitute(item->args,"@","@@"),"\\","\\\\"); } - doc += "</dt><dd> "; + doc += "</dt><dd> \\anchor "; + doc += item->listAnchor; + doc += " "; doc += item->text; QListIterator<RefItem> li(item->extraItems); RefItem *extraItem; for (li.toFirst();(extraItem=li.current());++li) { - doc += "<p>" + extraItem->text; + doc += "<p> \\anchor "; + doc += extraItem->listAnchor; + doc += " "; + doc += extraItem->text; } doc += "</dd>"; } |