summaryrefslogtreecommitdiffstats
path: root/src/namespacedef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2012-04-08 14:16:03 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2012-04-08 14:16:03 (GMT)
commit17ee30b327bf4f07f2411a50a46f5467456beacf (patch)
treeffd092e761289b417363c0562ceb9b93b88f19a4 /src/namespacedef.cpp
parent0039b4f79ad7e628dcab61e1d82f26fb8fa11cfe (diff)
downloadDoxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.zip
Doxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.tar.gz
Doxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.tar.bz2
Release-1.8.0-20120408
Diffstat (limited to 'src/namespacedef.cpp')
-rw-r--r--src/namespacedef.cpp19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index 4d53a12..22ca7a3 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -752,6 +752,17 @@ QCString NamespaceDef::displayName() const
return result;
}
+QCString NamespaceDef::localName() const
+{
+ QCString result=name();
+ int i=result.findRev("::");
+ if (i!=-1)
+ {
+ result=result.mid(i+2);
+ }
+ return result;
+}
+
void NamespaceDef::combineUsingRelations()
{
if (visited) return; // already done
@@ -959,10 +970,9 @@ bool NamespaceDef::isLinkableInProject() const
int i = name().findRev("::");
if (i==-1) i=0; else i+=2;
static bool extractAnonNs = Config_getBool("EXTRACT_ANON_NSPACES");
- static bool showNamespaces = Config_getBool("SHOW_NAMESPACES");
if (extractAnonNs && // extract anonymous ns
- name().mid(i,20)=="anonymous_namespace{" && // correct prefix
- showNamespaces) // not disabled by config
+ name().mid(i,20)=="anonymous_namespace{" // correct prefix
+ ) // not disabled by config
{
return TRUE;
}
@@ -970,8 +980,7 @@ bool NamespaceDef::isLinkableInProject() const
(hasDocumentation() || getLanguage()==SrcLangExt_CSharp) && // documented
!isReference() && // not an external reference
!isHidden() && // not hidden
- !isArtificial() && // or artificial
- showNamespaces; // not disabled by config
+ !isArtificial(); // or artificial
}
bool NamespaceDef::isLinkable() const