summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2005-07-07 20:16:18 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2005-07-07 20:16:18 (GMT)
commit6c5b1ce29dc2ed6a8fbf7e69b7d085bdb3e87647 (patch)
tree3b82721edc171f76f1a6712ff59e547a592aec23 /src/doxygen.cpp
parentf92ed7a658968bac5b777322fea4d7216e41b487 (diff)
downloadDoxygen-6c5b1ce29dc2ed6a8fbf7e69b7d085bdb3e87647.zip
Doxygen-6c5b1ce29dc2ed6a8fbf7e69b7d085bdb3e87647.tar.gz
Doxygen-6c5b1ce29dc2ed6a8fbf7e69b7d085bdb3e87647.tar.bz2
Release-1.4.3-20050707
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index e45f91c..8a78ea9 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1582,19 +1582,24 @@ static MemberDef *addVariableToFile(
}
}
QCString def;
+
// determine the definition of the global variable
if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@' &&
!Config_getBool("HIDE_SCOPE_NAMES")
)
// variable is inside a namespace, so put the scope before the name
{
+ static bool optimizeForJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA");
+ QCString sep="::";
+ if (optimizeForJava) sep=".";
+
if (!root->type.isEmpty())
{
- def=root->type+" "+nd->name()+"::"+name+root->args;
+ def=root->type+" "+nd->name()+sep+name+root->args;
}
else
{
- def=nd->name()+"::"+name+root->args;
+ def=nd->name()+sep+name+root->args;
}
}
else