diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2005-07-07 20:16:18 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2005-07-07 20:16:18 (GMT) |
commit | e00238b5830e4cd858fe8a10cc7ac83981212203 (patch) | |
tree | 3b82721edc171f76f1a6712ff59e547a592aec23 /src/doxygen.cpp | |
parent | d497898d92c2d2e3495505095563f07549dc2201 (diff) | |
download | Doxygen-e00238b5830e4cd858fe8a10cc7ac83981212203.zip Doxygen-e00238b5830e4cd858fe8a10cc7ac83981212203.tar.gz Doxygen-e00238b5830e4cd858fe8a10cc7ac83981212203.tar.bz2 |
Release-1.4.3-20050707
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 9 |
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 |