From 0840b0a1c14093c3dc1cbe16561ae6c8d7096fa9 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Tue, 21 Sep 2010 14:23:11 +0200
Subject: qdoc: YREKA! Now using GUIDs for node <xref> href attributes.

---
 tools/qdoc3/ditaxmlgenerator.cpp | 26 +++++++++++++++++++++-----
 tools/qdoc3/ditaxmlgenerator.h   |  3 ++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index d25c76c..13d33e8 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -531,6 +531,17 @@ QString DitaXmlGenerator::writeGuidAttribute(QString text)
     return guid;
 }
 
+
+/*!
+  Write's the GUID for the \a node to the current XML stream
+  as an "id" attribute. If the \a node doesn't yet have a GUID,
+  one is generated.
+ */
+void DitaXmlGenerator::writeGuidAttribute(Node* node)
+{
+    xmlWriter().writeAttribute("id",node->guid());
+}
+
 /*!
   Looks up \a text in the GUID map. If it finds \a text,
   it returns the associated GUID. Otherwise it inserts
@@ -1863,7 +1874,7 @@ void DitaXmlGenerator::generateHeader(const Node* node, const QString& name)
             outputclass = "example";
             break;
         case Node::HeaderFile:
-            outputclass = "header";
+            outputclass = "headerfile";
             break;
         case Node::File:
             outputclass = "file";
@@ -3296,6 +3307,8 @@ QString DitaXmlGenerator::registerRef(const QString& ref)
         }
         else if (prevRef == ref)
             break;
+        else
+            qDebug() << "PREVREF:" << prevRef;
         clean += "x";
     }
     return clean;
@@ -3470,8 +3483,10 @@ QString DitaXmlGenerator::linkForNode(const Node* node, const Node* relative)
         return QString();
 
     fn = fileName(node);
-    link += fn;
+    link += fn + "#" + node->guid();
+    return link;
 
+#if 0    
     if (!node->isInnerNode() || node->subType() == Node::QmlPropertyGroup) {
         ref = refForNode(node);
         if (relative && fn == fileName(relative) && ref == refForNode(relative))
@@ -3481,6 +3496,7 @@ QString DitaXmlGenerator::linkForNode(const Node* node, const Node* relative)
         link += ref;
     }
     return link;
+#endif    
 }
 
 QString DitaXmlGenerator::refForAtom(Atom* atom, const Node* /* node */)
@@ -3517,7 +3533,7 @@ void DitaXmlGenerator::generateFullName(const Node* apparentNode,
     xmlWriter().writeEndElement(); // </xref>
 }
 
-void DitaXmlGenerator::generateDetailedMember(const Node* node,
+void DitaXmlGenerator::generateDetailedMember(Node* node,
                                               const InnerNode* relative,
                                               CodeMarker* marker)
 {
@@ -3527,7 +3543,7 @@ void DitaXmlGenerator::generateDetailedMember(const Node* node,
     if ((node->type() == Node::Enum) &&
         (en = static_cast<const EnumNode*>(node))->flagsType()) {
         xmlWriter().writeStartElement("p");
-        writeGuidAttribute(refForNode(node));
+        writeGuidAttribute(node);
         xmlWriter().writeAttribute("outputclass","h3 flags");
         marked = getMarkedUpSynopsis(en, relative, marker, CodeMarker::Detailed);
         writeText(marked, marker, relative);
@@ -3538,7 +3554,7 @@ void DitaXmlGenerator::generateDetailedMember(const Node* node,
     }
     else {
         xmlWriter().writeStartElement("p");
-        writeGuidAttribute(refForNode(node));
+        writeGuidAttribute(node);
         xmlWriter().writeAttribute("outputclass","h3 fn");
         marked = getMarkedUpSynopsis(node, relative, marker, CodeMarker::Detailed);
         writeText(marked, marker, relative);
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 6f99e90..6a52441 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -222,7 +222,7 @@ class DitaXmlGenerator : public PageGenerator
                           const Node* relative, 
                           CodeMarker* marker,
 			  const Node* actualNode = 0);
-    void generateDetailedMember(const Node* node, 
+    void generateDetailedMember(Node* node, 
                                 const InnerNode* relative, 
                                 CodeMarker* marker);
     void generateLink(const Atom* atom, 
@@ -256,6 +256,7 @@ class DitaXmlGenerator : public PageGenerator
                    CodeMarker* marker);
     void endLink();
     QString writeGuidAttribute(QString text);
+    void writeGuidAttribute(Node* node);
     QString lookupGuid(QString text);
     virtual void beginSubPage(const Location& location, const QString& fileName);
     virtual void endSubPage();
-- 
cgit v0.12