diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-06 18:18:02 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-06 18:18:02 (GMT) |
commit | 69af1c8a96c30da8ac4f1d4a14c3b2fe2ef8e0e9 (patch) | |
tree | 1785127112a09a1004811246251c7e0510517817 /src/definition.cpp | |
parent | 496c3bb525b617d8cfce69e6a0c1a479b323e127 (diff) | |
download | Doxygen-69af1c8a96c30da8ac4f1d4a14c3b2fe2ef8e0e9.zip Doxygen-69af1c8a96c30da8ac4f1d4a14c3b2fe2ef8e0e9.tar.gz Doxygen-69af1c8a96c30da8ac4f1d4a14c3b2fe2ef8e0e9.tar.bz2 |
Brief description did not appear in the page index, when a page did not have any details.
Diffstat (limited to 'src/definition.cpp')
-rw-r--r-- | src/definition.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/definition.cpp b/src/definition.cpp index b55eed5..c5d812f 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -67,6 +67,7 @@ class DefinitionImpl DocInfo *inbodyDocs; // not exported BriefInfo *brief; // not exported BodyInfo *body; // not exported + QCString briefSignatures; QCString docSignatures; QCString localName; // local (unqualified) name of the definition @@ -536,7 +537,7 @@ void Definition::writeDocAnchorsToTagFile() } } -bool Definition::_docsAlreadyAdded(const QCString &doc) +bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList) { uchar md5_sig[16]; QCString sigStr(33); @@ -545,9 +546,11 @@ bool Definition::_docsAlreadyAdded(const QCString &doc) QCString docStr = doc.simplifyWhiteSpace(); MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig); MD5SigToString(md5_sig,sigStr.data(),33); - if (m_impl->docSignatures.find(sigStr)==-1) // new docs, add signature to prevent re-adding it + //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n", + // name().data(),doc.data(),sigStr.data(),sigList.data()); + if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it { - m_impl->docSignatures+=":"+sigStr; + sigList+=":"+sigStr; return FALSE; } else @@ -570,7 +573,7 @@ void Definition::_setDocumentation(const char *d,const char *docFile,int docLine { doc=d; } - if (!_docsAlreadyAdded(doc)) + if (!_docsAlreadyAdded(doc,m_impl->docSignatures)) { //printf("setting docs for %s: `%s'\n",name().data(),m_doc.data()); if (m_impl->details==0) @@ -649,7 +652,7 @@ void Definition::_setBriefDescription(const char *b,const char *briefFile,int br //printf("adding to details\n"); _setDocumentation(brief,briefFile,briefLine,FALSE,TRUE); } - else if (!_docsAlreadyAdded(brief)) + else if (!_docsAlreadyAdded(brief,m_impl->briefSignatures)) { //fprintf(stderr,"Definition::setBriefDescription(%s,%s,%d)\n",b,briefFile,briefLine); if (m_impl->brief==0) @@ -668,6 +671,10 @@ void Definition::_setBriefDescription(const char *b,const char *briefFile,int br m_impl->brief->line = 1; } } + else + { + //printf("do nothing!\n"); + } } void Definition::setBriefDescription(const char *b,const char *briefFile,int briefLine) @@ -1694,6 +1701,7 @@ QCString abbreviate(const char *s,const char *name) QCString Definition::briefDescription(bool abbr) const { + //printf("%s::briefDescription(%d)='%s'\n",name().data(),abbr,m_impl->brief?m_impl->brief->doc.data():"<none>"); return m_impl->brief ? (abbr ? abbreviate(m_impl->brief->doc,displayName()) : m_impl->brief->doc) : QCString(""); |