diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-11-24 18:07:42 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2018-11-24 18:07:42 (GMT) |
| commit | dcf89b56c0fd1fb75fbdd2eddff33187ceac0b23 (patch) | |
| tree | 74fb83fdf0b35b794c1eecae5e82266281a07c5e /src | |
| parent | e8ad5f9987d2284b8052031f4a7160ac303ae242 (diff) | |
| parent | c0b367ecd4a2f48cde85d4f5aed416892d3fa775 (diff) | |
| download | Doxygen-dcf89b56c0fd1fb75fbdd2eddff33187ceac0b23.zip Doxygen-dcf89b56c0fd1fb75fbdd2eddff33187ceac0b23.tar.gz Doxygen-dcf89b56c0fd1fb75fbdd2eddff33187ceac0b23.tar.bz2 | |
Merge branch 'feature/issue_6632' of https://github.com/albert-github/doxygen into albert-github-feature/issue_6632
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflist.cpp | 5 | ||||
| -rw-r--r-- | src/util.cpp | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/reflist.cpp b/src/reflist.cpp index 6f2a763..fe87bd5 100644 --- a/src/reflist.cpp +++ b/src/reflist.cpp @@ -162,7 +162,10 @@ void RefList::generatePage() if (item->scope->name() != "<globalScope>") { doc += "\\_setscope "; - doc += item->scope->name(); + if (item->scope->name().right(3)==" -p") + doc += item->scope->name().left(item->scope->name().length()-3) + "-p"; + else + doc += item->scope->name(); doc += " "; } } diff --git a/src/util.cpp b/src/util.cpp index 819903c..330fc57 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1424,8 +1424,12 @@ static ClassDef *getResolvedClassRec(const Definition *scope, di = Doxygen::symbolMap->find(name+"-p"); if (di==0) { - //printf("no such symbol!\n"); - return 0; + di = Doxygen::symbolMap->find(name+" -p"); + if (di==0) + { + //printf("no such symbol!\n"); + return 0; + } } //} } @@ -4556,7 +4560,8 @@ static bool getScopeDefs(const char *docScope,const char *scope, if (scopeOffset>0) fullName.prepend(docScopeName.left(scopeOffset)+"::"); if (((cd=getClass(fullName)) || // normal class - (cd=getClass(fullName+"-p")) //|| // ObjC protocol + (cd=getClass(fullName+"-p")) || // ObjC protocol + (cd=getClass(fullName+" -p")) //|| // ObjC protocol //(cd=getClass(fullName+"-g")) // C# generic ) && cd->isLinkable()) { |