diff options
Diffstat (limited to 'src/classdef.cpp')
| -rw-r--r-- | src/classdef.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index 3c70485..35b976a 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -1856,8 +1856,11 @@ void ClassDef::setTemplateArguments(ArgumentList *al) */ bool ClassDef::hasNonReferenceSuperClass() { - bool found=!isReference(); - if (found) return TRUE; // we're done if this class is not a reference + bool found=!isReference() && isLinkableInProject(); + if (found) + { + return TRUE; // we're done if this class is not a reference + } BaseClassListIterator bcli(*m_inheritedBy); for ( ; bcli.current() && !found ; ++bcli ) // for each super class { @@ -2879,6 +2882,7 @@ void ClassDef::getTemplateParameterLists(QList<ArgumentList> &lists) const QCString ClassDef::qualifiedNameWithTemplateParameters( QList<ArgumentList> *actualParams) const { + static bool optimizeOutputJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); //printf("qualifiedNameWithTemplateParameters() localName=%s\n",localName().data()); QCString scName; Definition *d=getOuterScope(); @@ -2896,7 +2900,7 @@ QCString ClassDef::qualifiedNameWithTemplateParameters( } QCString scopeSeparator; - if (Config_getBool("OPTIMIZE_OUTPUT_JAVA")) + if (optimizeOutputJava) scopeSeparator="."; else scopeSeparator="::"; |