summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-08-22 19:16:14 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-08-23 13:38:23 (GMT)
commit16bc7735b18c77ceee17fc06f04a73aca7e48e13 (patch)
tree66379b21465e07f14783abfd867c0a6d8b98d15a
parent72edccb2a4d04382f07641cf09a0567fcf281e45 (diff)
downloadDoxygen-16bc7735b18c77ceee17fc06f04a73aca7e48e13.zip
Doxygen-16bc7735b18c77ceee17fc06f04a73aca7e48e13.tar.gz
Doxygen-16bc7735b18c77ceee17fc06f04a73aca7e48e13.tar.bz2
Avoid double brief description when there are no detailed docs
-rw-r--r--src/definition.cpp37
1 files changed, 20 insertions, 17 deletions
diff --git a/src/definition.cpp b/src/definition.cpp
index c5d812f..b259088 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -647,28 +647,31 @@ void Definition::_setBriefDescription(const char *b,const char *briefFile,int br
}
}
- if (m_impl->brief && !m_impl->brief->doc.isEmpty())
+ if (!_docsAlreadyAdded(brief,m_impl->briefSignatures))
{
- //printf("adding to details\n");
- _setDocumentation(brief,briefFile,briefLine,FALSE,TRUE);
- }
- else if (!_docsAlreadyAdded(brief,m_impl->briefSignatures))
- {
- //fprintf(stderr,"Definition::setBriefDescription(%s,%s,%d)\n",b,briefFile,briefLine);
- if (m_impl->brief==0)
+ if (m_impl->brief && !m_impl->brief->doc.isEmpty())
{
- m_impl->brief = new BriefInfo;
- }
- m_impl->brief->doc=brief;
- if (briefLine!=-1)
- {
- m_impl->brief->file = briefFile;
- m_impl->brief->line = briefLine;
+ //printf("adding to details\n");
+ _setDocumentation(brief,briefFile,briefLine,FALSE,TRUE);
}
else
{
- m_impl->brief->file = briefFile;
- m_impl->brief->line = 1;
+ //fprintf(stderr,"Definition::setBriefDescription(%s,%s,%d)\n",b,briefFile,briefLine);
+ if (m_impl->brief==0)
+ {
+ m_impl->brief = new BriefInfo;
+ }
+ m_impl->brief->doc=brief;
+ if (briefLine!=-1)
+ {
+ m_impl->brief->file = briefFile;
+ m_impl->brief->line = briefLine;
+ }
+ else
+ {
+ m_impl->brief->file = briefFile;
+ m_impl->brief->line = 1;
+ }
}
}
else