summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2006-10-17 18:03:21 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2006-10-17 18:03:21 (GMT)
commit65f47e04daaf7f06da11c64af364e65e60e66387 (patch)
tree54faf2b759aca5cdc6184168aa676ed669435766 /src/doxygen.cpp
parent3c8148441a129febc5c2b9e4b2b2cbd018ad3b6e (diff)
downloadDoxygen-65f47e04daaf7f06da11c64af364e65e60e66387.zip
Doxygen-65f47e04daaf7f06da11c64af364e65e60e66387.tar.gz
Doxygen-65f47e04daaf7f06da11c64af364e65e60e66387.tar.bz2
Release-1.5.0
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp8
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);