whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Make private friend public 

A friend operator was declared as a friend in the private part of the
class. qdoc thought this meant the operator should be private and
therefore should not be documented. But the friend operator should be
documented, despite being declared in the private part of the
class. This update changes qdoc so that it always treats a friend as
public.

Change-Id: I7f8bcf0c0fdffd32f67041f7d1a03eefa2a8b924
Task-number: QTBUG-46983
Reviewed-by: Martin Smith <martin.smith@digia.com>
bb10
Martin Smith 2015-07-02 12:11:51 +02:00
parent 0e16b6b598
commit 1477345990
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qdoc/cppcodeparser.cpp
View File

@ -1585,7 +1585,13 @@ bool CppCodeParser::matchFunctionDecl(Aggregate *parent,
bool createFunctionNode = false;
if (parsingHeaderFile_) {
if (matched_friend) {
if (matched_inline) {
// nothing yet
}
if (body_present) {
if (body_expected) {
// nothing yet
}
createFunctionNode = true;
if (parent && parent->parent())
parent = parent->parent();
@ -1601,6 +1607,8 @@ bool CppCodeParser::matchFunctionDecl(Aggregate *parent,
if (createFunctionNode) {
func = new FunctionNode(extra.type, parent, name, extra.isAttached);
if (matched_friend)
access = Node::Public;
func->setAccess(access);
func->setLocation(location());
func->setReturnType(returnType.toString());