From f854e1d9f1a60a7e254dcc20a4e6db0aa9172b2c Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 26 Aug 2014 12:09:40 +0200 Subject: This is the patch attached to bz 651848 by Robin Gareus. --- src/memberdef.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/memberdef.cpp b/src/memberdef.cpp index a25528a..bfbec2b 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -270,8 +270,11 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, //{ // ol.docify(" "); //} - ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::Latex); + ol.disable(OutputGenerator::Html); + ol.docify(" "); /* man page */ + if (htmlOn) ol.enable(OutputGenerator::Html); + ol.disable(OutputGenerator::Man); ol.startEmphasis(); ol.enable(OutputGenerator::Man); if (latexOn) ol.enable(OutputGenerator::Latex); -- cgit v0.12 From bcd3fbf59f9199470d51938486fecda05006da61 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 26 Aug 2014 13:10:31 +0200 Subject: Fix for the second issue in bz 651848 --- src/memberdef.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/memberdef.cpp b/src/memberdef.cpp index bfbec2b..794fa15 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1674,7 +1674,10 @@ void MemberDef::writeDeclaration(OutputList &ol, d, // scope getBodyDef(), // fileScope this, // self - argsString(), // text + isDefine() ? + QString(argsString()).replace(QRegExp(","), + QString(", ")).data() : + argsString(), // text m_impl->annMemb, // autoBreak TRUE, // external FALSE, // keepSpaces -- cgit v0.12 From 7a0f5e6d565db6192f8c22045d7988a0b4e4d8c3 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 27 Aug 2014 05:40:16 +0200 Subject: Use substitute() instead of QString conversion --- src/memberdef.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 794fa15..7b4908a 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1675,8 +1675,7 @@ void MemberDef::writeDeclaration(OutputList &ol, getBodyDef(), // fileScope this, // self isDefine() ? - QString(argsString()).replace(QRegExp(","), - QString(", ")).data() : + (const char*)substitute(argsString(),",",", ") : argsString(), // text m_impl->annMemb, // autoBreak TRUE, // external -- cgit v0.12 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