Permalink
Browse files

Bug 652276 - Typedefs in manpages has too few linebreak possiblilities

  • Loading branch information...
ellert committed Aug 31, 2014
1 parent 7a0f5e6 commit 4bbcf71defb2e2be02494b7ff68d475d1a0438ac
Showing with 5 additions and 3 deletions.
  1. +2 −2 src/doxygen.cpp
  2. +3 −1 src/memberdef.cpp
@@ -2833,14 +2833,14 @@ static void addVariable(EntryNav *rootNav,int isFuncPtr=-1)
else if (root->type.find(')',i)!=-1) // function ptr, not variable like "int (*bla)[10]"
{
root->type=root->type.left(root->type.length()-1);
root->args.prepend(")");
root->args.prepend(") ");
//printf("root->type=%s root->args=%s\n",root->type.data(),root->args.data());
}
}
else if (root->type.find("typedef ")!=-1 && root->type.right(2)=="()") // typedef void (func)(int)
{
root->type=root->type.left(root->type.length()-1);
root->args.prepend(")");
root->args.prepend(") ");
}
}
@@ -1669,13 +1669,15 @@ void MemberDef::writeDeclaration(OutputList &ol,
// *** write arguments
if (argsString() && !isObjCMethod())
{
if (!isDefine()) ol.writeString(" ");
if (!isDefine() && !isTypedef()) ol.writeString(" ");
linkifyText(TextGeneratorOLImpl(ol), // out
d, // scope
getBodyDef(), // fileScope
this, // self
isDefine() ?
(const char*)substitute(argsString(),",",", ") :
isTypedef() ?
(const char*)substitute(argsString(),")(",") (") :
argsString(), // text
m_impl->annMemb, // autoBreak
TRUE, // external

0 comments on commit 4bbcf71

Please sign in to comment.