From 4bbcf71defb2e2be02494b7ff68d475d1a0438ac Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 31 Aug 2014 19:19:01 +0200 Subject: Bug 652276 - Typedefs in manpages has too few linebreak possiblilities --- src/doxygen.cpp | 4 ++-- src/memberdef.cpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 533e6ef..d263ac5 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.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(") "); } } diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 7b4908a..1af58ef 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -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 -- cgit v0.12