From 185ad65aedeb45ee3739a4377c44f8d56a3bb4f5 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Thu, 9 Dec 2010 09:53:01 +0100
Subject: qdoc: Updated signature of generateInnerNode() in the XML generator.

---
 tools/qdoc3/ditaxmlgenerator.cpp | 17 +++++++++++------
 tools/qdoc3/ditaxmlgenerator.h   |  2 +-
 tools/qdoc3/qdoc3.pro            |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index 6b7d1fb..abe247b 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -699,11 +699,11 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                 skipAhead++;
                 atom = atom->next();
             }
+            str[0] = str[0].toLower();
+            if (str.right(1) == ".")
+                str.truncate(str.length() - 1);
+            writeCharacters(str + ".");
         }
-        str[0] = str[0].toLower();
-        if (str.right(1) == ".")
-            str.truncate(str.length() - 1);
-        writeCharacters(str + ".");
         break;
     case Atom::BriefRight:
         //        if (relative->type() != Node::Fake) 
@@ -5315,7 +5315,7 @@ void DitaXmlGenerator::writeNestedClasses(const Section& s,
   Recursive writing of DITA XML files from the root \a node.
  */
 void
-DitaXmlGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker)
+DitaXmlGenerator::generateInnerNode(const InnerNode* node)
 {
     if (!node->url().isNull())
         return;
@@ -5334,6 +5334,11 @@ DitaXmlGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker)
         }
     }
 
+    /*
+      Obtain a code marker for the source file.
+     */
+    CodeMarker *marker = CodeMarker::markerForFileName(node->location().filePath());
+
     if (node->parent() != 0) {
 	beginSubPage(node->location(), fileName(node));
 	if (node->type() == Node::Namespace || node->type() == Node::Class) {
@@ -5353,7 +5358,7 @@ DitaXmlGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker)
     NodeList::ConstIterator c = node->childNodes().begin();
     while (c != node->childNodes().end()) {
 	if ((*c)->isInnerNode() && (*c)->access() != Node::Private)
-	    generateInnerNode((const InnerNode*) *c, marker);
+	    generateInnerNode((const InnerNode*) *c);
 	++c;
     }
 }
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 6075a86..1a42e5f 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -252,7 +252,7 @@ class DitaXmlGenerator : public PageGenerator
     GuidMap* lookupGuidMap(const QString& fileName);
     virtual void beginSubPage(const Location& location, const QString& fileName);
     virtual void endSubPage();
-    virtual void generateInnerNode(const InnerNode* node, CodeMarker* marker);
+    virtual void generateInnerNode(const InnerNode* node);
     QXmlStreamWriter& xmlWriter();
     void writeDetailedDescription(const Node* node,
                                   CodeMarker* marker,
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 4bc6bca..50c20ec 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -86,7 +86,7 @@ SOURCES += atom.cpp \
 	   tree.cpp \
 	   yyindent.cpp
 
-INCLUDEPATH += $$(QT_BUILD_TREE)/include/QtDeclarative
+INCLUDEPATH += $$(QT_SOURCE_TREE)/include/QtDeclarative
 
 include($$(QT_SOURCE_TREE)/src/declarative/qml/parser/parser.pri)
 
-- 
cgit v0.12