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

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 out() << "<b>"
 << paragraphName[currentParagraphNo[i]]
 << "&nbsp;</b>";
 }
 out() << "</td>\n";
+out() << "<td>";
 if ((currentParagraphNo[i] < NumParagraphs) &&
 !paragraphName[currentParagraphNo[i]].isEmpty()) {
 NodeMap::Iterator it;
 it = paragraph[currentParagraphNo[i]].begin();
 for (j = 0; j < currentOffsetInParagraph[i]; j++)
 ++it;
-out() << "<td>";
 // Previously, we used generateFullName() for this, but we
 // require some special formatting.
 out() << "<a href=\""
 << linkForNode(it.value(), relative)
 << "\">";
 if (pieces.size() > 1) {
 out() << " (";
 generateFullName(it.value()->parent(), relative, marker);
 out() << ")";
 }
-out() << "</td>\n";
+}
-}
+out() << "</td>\n";
 currentOffset[i]++;
 currentOffsetInParagraph[i]++;
 }
 }
 QString HtmlGenerator::fileName(const Node *node)
 {
 if (node->type() == Node::Fake) {
 if (static_cast<const FakeNode *>(node)->subType() == Node::ExternalPage)
 return node->name();
+if (static_cast<const FakeNode *>(node)->subType() == Node::Image)
+return node->name();
 }
 return PageGenerator::fileName(node);
 }
 QString HtmlGenerator::refForNode(const Node *node)
 ref = func->name();
 if (func->overloadNumber() != 1)
 ref += "-" + QString::number(func->overloadNumber());
 }
 break;
-case Node::Property:
+#ifdef QDOC_QML
-#ifdef QDOC_QML
+case Node::Fake:
+if (node->subType() != Node::QmlPropertyGroup)
+break;
 case Node::QmlProperty:
 #endif
+case Node::Property:
 ref = node->name() + "-prop";
 break;
 #ifdef QDOC_QML
 case Node::QmlSignal:
 ref = node->name() + "-signal";
 return fn;*/
 #if 0
 // ### reintroduce this test, without breaking .dcf files
 if (fn != outFileName())
 #endif
 link += fn;
-if (!node->isInnerNode()) {
+if (!node->isInnerNode() || node->subType() == Node::QmlPropertyGroup) {
 ref = refForNode(node);
 if (relative && fn == fileName(relative) && ref == refForNode(relative))
 return QString();
 link += "#";
 path.removeFirst();
 }
 if (path.isEmpty()) {
 link = linkForNode(*node, relative);
+if (*node && (*node)->subType() == Node::Image)
+link = "images/used-in-examples/" + link;
 if (targetAtom)
 link += "#" + refForAtom(targetAtom, *node);
 }
 }
 return link;
 if (!pleaseGenerateMacRef || marker == 0)
 return;
 QStringList macRefs = marker->macRefsForNode(node);
 foreach (const QString &macRef, macRefs)
-out() << "<a name=\"" << "//apple_ref/" << macRef << "\" />\n";
+out() << "<a name=\"" << "//apple_ref/" << macRef << "\"></a>\n";
 }
 void HtmlGenerator::beginLink(const QString &link,
 const Node *node,
 const Node *relative,
 out() << "<div class=\"qmlitem\">";
 if (node->subType() == Node::QmlPropertyGroup) {
 const QmlPropGroupNode* qpgn = static_cast<const QmlPropGroupNode*>(node);
 NodeList::ConstIterator p = qpgn->childNodes().begin();
 out() << "<div class=\"qmlproto\">";
-out() << "<table class=\"qmlname\">";
+out() << "<table width=\"100%\" class=\"qmlname\">";
 while (p != qpgn->childNodes().end()) {
 if ((*p)->type() == Node::QmlProperty) {
 qpn = static_cast<const QmlPropertyNode*>(*p);
 out() << "<tr><td>";
 out() << "<a name=\"" + refForNode(qpn) + "\"></a>";
+if (!qpn->isWritable())
+out() << "<span class=\"qmlreadonly\">read-only</span>";
 generateQmlItem(qpn, relative, marker, false);
 out() << "</td></tr>";
 if (qpgn->isDefault()) {
 out() << "</table>"
 << "</div></div>"
 }
 out() << "</table>";
 out() << "</div>";
 }
 else if (node->type() == Node::QmlSignal) {
-const QmlSignalNode* qsn = static_cast<const QmlSignalNode*>(node);
+const FunctionNode* qsn = static_cast<const FunctionNode*>(node);
 out() << "<div class=\"qmlproto\">";
 out() << "<table class=\"qmlname\">";
 out() << "<tr><td>";
 out() << "<a name=\"" + refForNode(qsn) + "\"></a>";
-generateQmlItem(qsn,relative,marker,false);
+generateSynopsis(qsn,relative,marker,CodeMarker::Detailed,false);
+//generateQmlItem(qsn,relative,marker,false);
 out() << "</td></tr>";
 out() << "</table>";
 out() << "</div>";
 }
 else if (node->type() == Node::QmlMethod) {
-const QmlMethodNode* qmn = static_cast<const QmlMethodNode*>(node);
+const FunctionNode* qmn = static_cast<const FunctionNode*>(node);
 out() << "<div class=\"qmlproto\">";
 out() << "<table class=\"qmlname\">";
 out() << "<tr><td>";
 out() << "<a name=\"" + refForNode(qmn) + "\"></a>";
-generateQmlItem(qmn,relative,marker,false);
+generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false);
 out() << "</td></tr>";
 out() << "</table>";
 out() << "</div>";
 }
 out() << "<div class=\"qmldoc\">";
 }
 }
 }
 /*!
-Output the "[Xxx instantiates the C++ class QFxXxx]"
+Output the "[Xxx instantiates the C++ class QmlGraphicsXxx]"
 line for the QML element, if there should be one.
 If there is no class node, or if the class node status
 is set to Node::Internal, do nothing.
 */
 out() << "</p>";
 }
 }
 /*!
-Output the "[QFxXxx is instantiated by QML element Xxx]"
+Output the "[QmlGraphicsXxx is instantiated by QML element Xxx]"
 line for the class, if there should be one.
 If there is no QML element, or if the class node status
 is set to Node::Internal, do nothing.
 */

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7