From 73f011b69c6fcbd10c79aa19938201205b1c344f Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 19 Mar 2012 18:52:56 +0100 Subject: [PATCH] Notifier signals don't need separate documentation. Similar to getters and setters, notifier signals don't need separate documentation. Reimplementation of http://codereview.qt-project.org/#change,19374 in qtbase. Change-Id: If77fc554a3d8c1b520940d23e17cb7f76a71660f Reviewed-by: Girish Ramakrishnan Reviewed-by: Lincoln Ramsay Reviewed-by: Martin Smith --- src/tools/qdoc/htmlgenerator.cpp | 2 ++ src/tools/qdoc/node.h | 1 + src/tools/qdoc/tree.cpp | 12 ++++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 0662303d1e..c31a736389 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1331,6 +1331,8 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner, names << prop->setters().first()->name(); if (!prop->resetters().isEmpty()) names << prop->resetters().first()->name(); + if (!prop->notifiers().isEmpty()) + names << prop->notifiers().first()->name(); } else if ((*m)->type() == Node::Enum) { const EnumNode *enume = reinterpret_cast(*m); diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h index 8c6eb673cd..5b1eb21113 100644 --- a/src/tools/qdoc/node.h +++ b/src/tools/qdoc/node.h @@ -907,6 +907,7 @@ inline void PropertyNode::addFunction(FunctionNode* function, FunctionRole role) inline void PropertyNode::addSignal(FunctionNode* function, FunctionRole role) { funcs[(int)role].append(function); + function->setAssociatedProperty(this); } inline NodeList PropertyNode::functions() const diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp index 4b2a8ba55c..450f2d777c 100644 --- a/src/tools/qdoc/tree.cpp +++ b/src/tools/qdoc/tree.cpp @@ -1739,7 +1739,7 @@ bool Tree::generateIndexSection(QXmlStreamWriter& writer, const FunctionNode* functionNode = static_cast(fnNode); writer.writeStartElement("setter"); writer.writeAttribute("name", functionNode->name()); - writer.writeEndElement(); // getter + writer.writeEndElement(); // setter } } foreach (const Node* fnNode, propertyNode->resetters()) { @@ -1747,7 +1747,15 @@ bool Tree::generateIndexSection(QXmlStreamWriter& writer, const FunctionNode* functionNode = static_cast(fnNode); writer.writeStartElement("resetter"); writer.writeAttribute("name", functionNode->name()); - writer.writeEndElement(); // getter + writer.writeEndElement(); // resetter + } + } + foreach (const Node* fnNode, propertyNode->notifiers()) { + if (fnNode) { + const FunctionNode* functionNode = static_cast(fnNode); + writer.writeStartElement("notifier"); + writer.writeAttribute("name", functionNode->name()); + writer.writeEndElement(); // notifier } } }