summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndreas Kling <andreas.kling@nokia.com>2010-06-22 02:32:36 +0200
committerAndreas Kling <andreas.kling@nokia.com>2010-06-22 02:32:36 +0200
commit77fcfd9231c08975331df14edb1c33c4cea44bea (patch)
tree1d2bbb33f0402717dba4e5c9b8395f80ed4c2c36 /tools
parent8b059a78b2632e31492fa25cfaae99b111a041a6 (diff)
qdoc3: Build fix for regression in e2f0e728e
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/ditaxmlgenerator.cpp4
-rw-r--r--tools/qdoc3/node.cpp2
-rw-r--r--tools/qdoc3/node.h5
3 files changed, 5 insertions, 6 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index e5481a03d5..aa4f304703 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 12dee87347..2586733337 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 4d1e7577d1..37f2f26194 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;