summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 019943b..5c67c03 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -499,7 +499,19 @@ void MemberDef::writeLink(OutputList &ol,ClassDef *cd,NamespaceDef *nd,
}
else // local link
{
- ol.writeObjectLink(d->getReference(),d->getOutputFileBase(),anchor(),name());
+ QCString sep = Config_getBool("OPTIMIZE_OUTPUT_JAVA") ? "." : "::";
+ if (cd)
+ {
+ ol.writeObjectLink(d->getReference(),d->getOutputFileBase(),anchor(),cd->name()+sep+name());
+ }
+ else if (nd)
+ {
+ ol.writeObjectLink(d->getReference(),d->getOutputFileBase(),anchor(),nd->name()+sep+name());
+ }
+ else
+ {
+ ol.writeObjectLink(d->getReference(),d->getOutputFileBase(),anchor(),name());
+ }
}
}
@@ -2017,3 +2029,11 @@ void MemberDef::enableCallGraph(bool e)
if (e) Doxygen::parseSourcesNeeded = TRUE;
}
+bool MemberDef::protectionVisible() const
+{
+ return prot==Public ||
+ (prot==Private && Config_getBool("EXTRACT_PRIVATE")) ||
+ (prot==Protected && Config_getBool("EXTRACT_PROTECTED")) ||
+ (prot==Package && Config_getBool("EXTRACT_PACKAGE"));
+}
+