From 77fcfd9231c08975331df14edb1c33c4cea44bea Mon Sep 17 00:00:00 2001
From: Andreas Kling <andreas.kling@nokia.com>
Date: Tue, 22 Jun 2010 02:32:36 +0200
Subject: qdoc3: Build fix for regression in e2f0e728e

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

diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index e5481a0..aa4f304 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -1402,8 +1402,8 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
     QList<Section> sections;
     QList<Section>::ConstIterator s;
 
-    ClassNode* cn = 0;
-    NamespaceNode* namespasse = 0;
+    const ClassNode* cn = 0;
+    const NamespaceNode* namespasse = 0;
 
     QString title;
     QString rawTitle;
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 12dee87..2586733 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -246,7 +246,7 @@ QString Node::fileBase() const
   If its UUID has not yet been created, it is created
   first.
  */
-QUuid Node::guid()
+QUuid Node::guid() const
 {
     if (uuid.isNull())
         uuid = QUuid::createUuid();
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 4d1e757..37f2f26 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -191,8 +191,7 @@ class Node
     void clearRelated() { rel = 0; }
 
     virtual QString fileBase() const;
-    //QUuid guid() const { return uuid; }
-    QUuid guid();
+    QUuid guid() const;
     QString ditaXmlHref();
 
  protected:
@@ -223,7 +222,7 @@ class Node
     QString u;
     QString sinc;
     QString tpl;
-    QUuid   uuid;
+    mutable QUuid uuid;
 };
 
 class FunctionNode;
-- 
cgit v0.12