FCL/sf/mw/qt: comparison tools/qdoc3/tree.cpp

equal deleted inserted replaced

-:93b982ccede2
+:5daf16870df6
 /*
 tree.cpp
 */
-#include <QtCore>
 #include <QDomDocument>
 #include "atom.h"
 #include "doc.h"
 #include "htmlgenerator.h"
 #include "location.h"
 #include "node.h"
 #include "text.h"
 #include "tree.h"
+#include <limits.h>
+#include <qdebug.h>
 QT_BEGIN_NAMESPACE
 struct InheritanceBound
 {
 if (node == 0 || !node->isInnerNode())
 break;
 const Node *next =
 static_cast<const InnerNode*>(node)->findNode(path.at(i));
 if (!next && (findFlags & SearchEnumValues) && i == path.size()-1)
 next = static_cast<const InnerNode*>(node)->findEnumNodeForValue(path.at(i));
 if (!next && node->type() == Node::Class && (findFlags & SearchBaseClasses)) {
 NodeList baseClasses = allBaseClasses(static_cast<const ClassNode *>(node));
 nodeName = "variable";
 break;
 case Node::Target:
 nodeName = "target";
 break;
+case Node::QmlProperty:
+nodeName = "qmlproperty";
+break;
+case Node::QmlSignal:
+nodeName = "qmlsignal";
+break;
+case Node::QmlMethod:
+nodeName = "qmlmethod";
+break;
 default:
 return false;
 }
 QString access;
 writer.writeAttribute("name", objName);
 QString fullName = fullDocumentName(node);
 if (fullName != objName)
 writer.writeAttribute("fullname", fullName);
 writer.writeAttribute("href", fullDocumentLocation(node));
-if (node->type() != Node::Fake)
+if ((node->type() != Node::Fake) && (!node->isQmlNode()))
 writer.writeAttribute("location", node->location().fileName());
 switch (node->type()) {
 case Node::Class:
 case Node::Page:
 writer.writeAttribute("subtype", "page");
 break;
 case Node::ExternalPage:
 writer.writeAttribute("subtype", "externalpage");
+break;
+case Node::QmlClass:
+writer.writeAttribute("subtype", "qmlclass");
+break;
+case Node::QmlBasicType:
+writer.writeAttribute("subtype", "qmlbasictype");
 break;
 default:
 break;
 }
 writer.writeAttribute("title", fakeNode->title());
 writer.writeAttribute("associated-property", propertyNode->name());
 writer.writeAttribute("type", functionNode->returnType());
 }
 break;
+case Node::QmlProperty:
+{
+const QmlPropertyNode *qpn = static_cast<const QmlPropertyNode*>(node);
+writer.writeAttribute("type", qpn->dataType());
+}
+break;
 case Node::Property:
 {
 const PropertyNode *propertyNode = static_cast<const PropertyNode*>(node);
 writer.writeAttribute("type", propertyNode->dataType());
 foreach (const Node *fnNode, propertyNode->getters()) {
 if (generateIndexSection(writer, node, generateInternalNodes)) {
 if (node->isInnerNode()) {
 const InnerNode *inner = static_cast<const InnerNode *>(node);
-// Recurse to write an element for this child node and all its children.
+foreach (const Node *child, inner->childNodes()) {
-foreach (const Node *child, inner->childNodes())
+/*
-generateIndexSections(writer, child, generateInternalNodes);
+Don't generate anything for a QML property group node.
+It is just a place holder for a collection of QML property
+nodes. Recurse to its children, which are the QML property
+nodes.
+*/
+if (child->subType() == Node::QmlPropertyGroup) {
+const InnerNode *pgn = static_cast<const InnerNode*>(child);
+foreach (const Node *c, pgn->childNodes()) {
+generateIndexSections(writer, c, generateInternalNodes);
+}
+}
+else
+generateIndexSections(writer, child, generateInternalNodes);
+}
 /*
 foreach (const Node *child, inner->relatedNodes()) {
 QDomElement childElement = generateIndexSections(document, child);
 element.appendChild(childElement);
 else
 return "";
 }
 else if (node->type() == Node::Fake) {
 #ifdef QDOC_QML
-if (node->subType() == Node::QmlClass)
+if ((node->subType() == Node::QmlClass) ||
+(node->subType() == Node::QmlBasicType))
 return "qml-" + node->fileBase() + ".html";
 else
 #endif
 parentName = node->fileBase() + ".html";
 }
 Node *parentNode = 0;
 if ((parentNode = node->relates()))
 parentName = fullDocumentLocation(node->relates());
-else if ((parentNode = node->parent()))
+else if ((parentNode = node->parent())) {
-parentName = fullDocumentLocation(node->parent());
+if (parentNode->subType() == Node::QmlPropertyGroup) {
+parentNode = parentNode->parent();
+parentName = "qml-" + parentNode->fileBase() + ".html";
+}
+else
+parentName = fullDocumentLocation(node->parent());
+}
+#if 0
+if (node->type() == Node::QmlProperty) {
+qDebug() << "Node::QmlProperty:" << node->name()
+<< "parentName:" << parentName;
+if (parentNode)
+qDebug() << "PARENT NODE" << parentNode->type()
+<< parentNode->subType() << parentNode->name();
+}
+#endif
 switch (node->type()) {
 case Node::Class:
 case Node::Namespace:
 if (parentNode && !parentNode->name().isEmpty())
 parentName = parentName.replace(".html", "") + "-"
 case Node::Typedef:
 anchorRef = "#" + node->name() + "-typedef";
 break;
 case Node::Property:
 anchorRef = "#" + node->name() + "-prop";
+break;
+case Node::QmlProperty:
+anchorRef = "#" + node->name() + "-prop";
+break;
+case Node::QmlSignal:
+anchorRef = "#" + node->name() + "-signal";
+break;
+case Node::QmlMethod:
+anchorRef = "#" + node->name() + "-method";
 break;
 case Node::Variable:
 anchorRef = "#" + node->name() + "-var";
 break;
 case Node::Target:
 return parentName.toLower() + anchorRef;
 }
 /*!
+Construct the full document name for \a node and return the
+name.
 */
 QString Tree::fullDocumentName(const Node *node) const
 {
 if (!node)
 return "";
 QStringList pieces;
 const Node *n = node;
 do {
-if (!n->name().isEmpty())
+if (!n->name().isEmpty() &&
+((n->type() != Node::Fake) || (n->subType() != Node::QmlPropertyGroup)))
 pieces.insert(0, n->name());
-if (n->type() == Node::Fake)
+if ((n->type() == Node::Fake) && (n->subType() != Node::QmlPropertyGroup))
 break;
 // Examine the parent node if one exists.
 if (n->parent())
 n = n->parent();

branch	GCC_SURGE
changeset 31	5daf16870df6
parent 30	5dc02b23752f
child 33	3e2da88830cd