diff options
| -rw-r--r-- | src/classdef.cpp | 8 | ||||
| -rw-r--r-- | src/commentscan.l | 2 | ||||
| -rw-r--r-- | src/index.cpp | 2 | ||||
| -rw-r--r-- | src/markdown.cpp | 5 | ||||
| -rw-r--r-- | src/memberdef.cpp | 2 | ||||
| -rw-r--r-- | src/scanner.l | 4 |
6 files changed, 17 insertions, 6 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index fc7a62f..a7f24ed 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -518,7 +518,7 @@ class ClassDefAliasImpl : public DefinitionAliasImpl, public ClassDef { return getCdAlias()->countInheritanceNodes(); } virtual int countMemberDeclarations(MemberListType lt,const ClassDef *inheritedFrom, int lt2,bool invert,bool showAlways,QPtrDict<void> *visitedClasses) const - { return countMemberDeclarations(lt,inheritedFrom,lt2,invert,showAlways,visitedClasses); } + { return getCdAlias()->countMemberDeclarations(lt,inheritedFrom,lt2,invert,showAlways,visitedClasses); } virtual void writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title, const char *subTitle=0,bool showInline=FALSE,const ClassDef *inheritedFrom=0, int lt2=-1,bool invert=FALSE,bool showAlways=FALSE, @@ -1720,7 +1720,11 @@ void ClassDefImpl::writeInheritanceGraph(OutputList &ol) const // write class diagram using dot { DotClassGraph inheritanceGraph(this,Inheritance); - if (!inheritanceGraph.isTrivial() && !inheritanceGraph.isTooBig()) + if (inheritanceGraph.isTooBig()) + { + warn_uncond("Inheritance graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",name().data()); + } + else if (!inheritanceGraph.isTrivial()) { ol.pushGeneratorState(); ol.disable(OutputGenerator::Man); diff --git a/src/commentscan.l b/src/commentscan.l index eb1629e..e75d023 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -2298,7 +2298,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" if (*yytext=='\n') yyLineNr++; addOutput('\n'); setOutput(OutputDoc); - addOutput("\\copydetails "); + addOutput(" \\copydetails "); addOutput(g_copyDocArg); addOutput("\n"); BEGIN(Comment); diff --git a/src/index.cpp b/src/index.cpp index 46ec48c..5d6c0a5 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -4731,7 +4731,7 @@ static void writeIndex(OutputList &ol) ol.parseText(/*projPrefix+*/theTranslator->trExceptionIndex()); ol.endIndexSection(isCompoundIndex); } - if (documentedFiles>0) + if (Config_getBool(SHOW_FILES) && (documentedFiles>0)) { ol.startIndexSection(isFileIndex); ol.parseText(/*projPrefix+*/theTranslator->trFileIndex()); diff --git a/src/markdown.cpp b/src/markdown.cpp index 15f119b..8670642 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -2439,7 +2439,10 @@ static QCString extractPageTitle(QCString &docs,QCString &id) { docs=docs.mid(end1); } - id = extractTitleId(title, 0); + else + { + id = extractTitleId(title, 0); + } //printf("extractPageTitle(title='%s' docs='%s' id='%s')\n",title.data(),docs.data(),id.data()); return title; } diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 3383dfe..15da899 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2946,7 +2946,7 @@ void MemberDefImpl::_writeCallerGraph(OutputList &ol) const { warn_uncond("Caller graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",qPrint(qualifiedName())); } - else if (!callerGraph.isTrivial() && !callerGraph.isTooBig()) + else if (!callerGraph.isTrivial()) { msg("Generating caller graph for function %s\n",qPrint(qualifiedName())); ol.disable(OutputGenerator::Man); diff --git a/src/scanner.l b/src/scanner.l index f94e4f8..e36b36d 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1390,6 +1390,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) current->explicitExternal = TRUE; lineCount(); } +<FindMembers>{B}*"const"{BN}+ { current->type += " const "; + if (insideCS) current->stat = TRUE; + lineCount(); + } <FindMembers>{B}*"virtual"{BN}+ { current->type += " virtual "; current->virt = Virtual; lineCount(); |