diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-19 18:52:56 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 14:11:06 +0100 |
commit | 73f011b69c6fcbd10c79aa19938201205b1c344f (patch) | |
tree | 59d9058d76ddd775195fa80fb5850e19385c5cd6 | |
parent | 10537187b978df899a20e9997b859c60841bb5cc (diff) |
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 <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>
-rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 2 | ||||
-rw-r--r-- | src/tools/qdoc/node.h | 1 | ||||
-rw-r--r-- | 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<const EnumNode*>(*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<const FunctionNode*>(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<const FunctionNode*>(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<const FunctionNode*>(fnNode); + writer.writeStartElement("notifier"); + writer.writeAttribute("name", functionNode->name()); + writer.writeEndElement(); // notifier } } } |