Skip to content

Commit 69e24ff

Browse files
committed
issue #10937 unexpected token TK_COMMAND_BS as the argument of \ifile
From a tag file it is possible that detailed section is set but that no file name is included. The file `file` of `DocInfo` etc. is always present when the `DocInfo` is present, it is better to test whether the field is empty or not.
1 parent d51b6df commit 69e24ff

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/definition.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,7 +1570,9 @@ int DefinitionImpl::docLine() const
15701570

15711571
QCString DefinitionImpl::docFile() const
15721572
{
1573-
return m_impl->details ? m_impl->details->file : m_impl->brief ? m_impl->brief->file : QCString("<"+m_impl->name+">");
1573+
if (m_impl->details && !m_impl->details->file.isEmpty()) return m_impl->details->file;
1574+
else if (m_impl->brief && !m_impl->brief->file.isEmpty()) return m_impl->brief->file;
1575+
else return "<" + m_impl->name + ">";
15741576
}
15751577

15761578
//----------------------------------------------------------------------------
@@ -1652,7 +1654,7 @@ int DefinitionImpl::briefLine() const
16521654

16531655
QCString DefinitionImpl::briefFile() const
16541656
{
1655-
return m_impl->brief ? m_impl->brief->file : QCString("<"+m_impl->name+">");
1657+
return m_impl->brief && !m_impl->brief->file.isEmpty() ? m_impl->brief->file : QCString("<"+m_impl->name+">");
16561658
}
16571659

16581660
//----------------------
@@ -1669,7 +1671,7 @@ int DefinitionImpl::inbodyLine() const
16691671

16701672
QCString DefinitionImpl::inbodyFile() const
16711673
{
1672-
return m_impl->inbodyDocs ? m_impl->inbodyDocs->file : QCString("<"+m_impl->name+">");
1674+
return m_impl->inbodyDocs && !m_impl->inbodyDocs->file.isEmpty() ? m_impl->inbodyDocs->file : QCString("<"+m_impl->name+">");
16731675
}
16741676

16751677

0 commit comments

Comments
 (0)