issue #11128 Unknown anchors in code

Author: doxygen

src/docsets.cpp

@@ -333,17 +333,8 @@ void DocSets::addIndexItem(const Definition *context,const MemberDef *md,
     case SrcLangExt::Unknown: lang="unknown"; break;    // should not happen!
   }
 
-  if (md)
+  if (context && md)
   {
-    if (context==nullptr)
-    {
-      if (md->getGroupDef())
-        context = md->getGroupDef();
-      else if (md->getFileDef())
-        context = md->getFileDef();
-    }
-    if (context==nullptr) return; // should not happen
-
     switch (md->memberType())
     {
       case MemberType::Define:
@@ -402,16 +393,7 @@ void DocSets::addIndexItem(const Definition *context,const MemberDef *md,
       case MemberType::Dictionary:
         type="dictionary"; break;
     }
-    cd = md->getClassDef();
-    nd = md->getNamespaceDef();
-    if (cd)
-    {
-      scope = cd->qualifiedName();
-    }
-    else if (nd)
-    {
-      scope = nd->name();
-    }
+    scope = md->getScopeString();
     fd = md->getFileDef();
     if (fd)
     {

src/htmlhelp.cpp

@@ -602,28 +602,15 @@ void HtmlHelp::addContentsItem(bool isDir,
 void HtmlHelp::addIndexItem(const Definition *context,const MemberDef *md,
                             const QCString &sectionAnchor,const QCString &word)
 {
-  if (md)
+  if (context && md)
   {
-    bool separateMemberPages = Config_getBool(SEPARATE_MEMBER_PAGES);
-    if (context==nullptr) // global member
-    {
-      if (md->getGroupDef())
-        context = md->getGroupDef();
-      else if (md->getFileDef())
-        context = md->getFileDef();
-    }
-    if (context==nullptr) return; // should not happen
-
     QCString cfname  = md->getOutputFileBase();
     QCString argStr  = md->argsString();
-    QCString cfiname = context->getOutputFileBase();
     QCString level1  = context->name();
     QCString level2  = md->name() + argStr;
-    QCString contRef = separateMemberPages ? cfname : cfiname;
-    QCString memRef  = cfname;
     QCString anchor  = !sectionAnchor.isEmpty() ? sectionAnchor : md->anchor();
-    p->index.addItem(level1,level2,contRef,anchor,TRUE,FALSE);
-    p->index.addItem(level2,level1,memRef,anchor,TRUE,TRUE);
+    p->index.addItem(level1,level2,cfname,anchor,TRUE,FALSE);
+    p->index.addItem(level2,level1,cfname,anchor,TRUE,TRUE);
   }
   else if (context)
   {

src/qhp.cpp

@@ -350,7 +350,7 @@ void Qhp::addContentsItem(bool /* isDir */, const QCString & name,
       blank << "<title>Validator / crawler helper</title>\n";
       blank << "<meta http-equiv=\"Content-Type\" content=\"text/xhtml;charset=UTF-8\"/>\n";
       blank << "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=11\"/>\n";
-    
+
       blank << "<meta name=\"generator\" content=\"Doxygen " + getDoxygenVersion() + "\"/>\n";
       blank << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/>\n";
       blank << "</head>\n";
@@ -375,28 +375,17 @@ void Qhp::addIndexItem(const Definition *context,const MemberDef *md,
   //       md?md->name().data():"<none>",
   //       qPrint(word));
 
-  if (md) // member
+  if (context && md) // member
   {
-    bool separateMemberPages = Config_getBool(SEPARATE_MEMBER_PAGES);
-    if (context==nullptr) // global member
-    {
-      if (md->getGroupDef())
-        context = md->getGroupDef();
-      else if (md->getFileDef())
-        context = md->getFileDef();
-    }
-    if (context==nullptr) return; // should not happen
     QCString cfname  = md->getOutputFileBase();
     QCString argStr  = md->argsString();
-    QCString cfiname = context->getOutputFileBase();
     QCString level1  = context->name();
     QCString level2  = !word.isEmpty() ? word : md->name();
-    QCString contRef = separateMemberPages ? cfname : cfiname;
     QCString anchor  = !sectionAnchor.isEmpty() ? sectionAnchor : md->anchor();
     QCString ref;
 
     // <keyword name="foo" id="MyApplication::foo" ref="doc.html#foo"/>
-    ref = makeRef(contRef, anchor);
+    ref = makeRef(cfname, anchor);
     QCString id = level1+"::"+level2;
     writeIndent(p->index,3);
     p->index << "<keyword name=\"" << convertToXML(level2 + argStr) << "\""

src/sitemap.cpp

@@ -189,28 +189,15 @@ static QCString makeRef(const QCString & withoutExtension, const QCString & anch
   if (anchor.isEmpty()) return result;
   return result+"#"+anchor;
 }
+
 void Crawlmap::addIndexItem(const Definition *context, const MemberDef *md,
                             const QCString &sectionAnchor, const QCString &title)
 {
   if (md) // member
   {
-    bool separateMemberPages = Config_getBool(SEPARATE_MEMBER_PAGES);
-    if (context==nullptr) // global member
-    {
-      if (md->getGroupDef())
-        context = md->getGroupDef();
-      else if (md->getFileDef())
-        context = md->getFileDef();
-    }
-    if (context==nullptr) return; // should not happen
     QCString cfname  = md->getOutputFileBase();
-    //QCString argStr  = md->argsString();
-    QCString cfiname = context->getOutputFileBase();
-    QCString contRef = separateMemberPages ? cfname : cfiname;
     QCString anchor  = !sectionAnchor.isEmpty() ? sectionAnchor : md->anchor();
-    QCString ref;
-
-    ref = makeRef(contRef, anchor);
+    QCString ref     = makeRef(cfname, anchor);
     p->crawlLinks.insert(ref.str());
   }
   else if (context) // container