diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2006-10-17 18:03:21 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2006-10-17 18:03:21 (GMT) |
commit | 8a6cb1baa8edce0b56a07e97bd57f5d5dd756cb5 (patch) | |
tree | 54faf2b759aca5cdc6184168aa676ed669435766 /src/doxygen.cpp | |
parent | ca720513ae89ad82fd8d8c4340271375ae1e9f64 (diff) | |
download | Doxygen-8a6cb1baa8edce0b56a07e97bd57f5d5dd756cb5.zip Doxygen-8a6cb1baa8edce0b56a07e97bd57f5d5dd756cb5.tar.gz Doxygen-8a6cb1baa8edce0b56a07e97bd57f5d5dd756cb5.tar.bz2 |
Release-1.5.0
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 695cfc9..f825d34 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1041,14 +1041,18 @@ static void addClassToContext(EntryNav *rootNav) { scName=rootNav->parent()->name(); } - // name without parent's scope + // name without parent's scope: TODO: is this still true? QCString fullName = root->name; // strip off any template parameters (but not those for specializations) fullName=stripTemplateSpecifiersFromScope(fullName); // name with scope - QCString qualifiedName = scName.isEmpty() ? fullName : scName+"::"+fullName; + QCString qualifiedName = fullName; + if (!scName.isEmpty() && !leftScopeMatch(fullName,scName)) + { + qualifiedName.prepend(scName+"::"); + } ClassDef *cd = getClass(qualifiedName); |