diff options
author | Andreas Kling <andreas.kling@nokia.com> | 2010-06-22 00:32:36 (GMT) |
---|---|---|
committer | Andreas Kling <andreas.kling@nokia.com> | 2010-06-22 00:32:36 (GMT) |
commit | 77fcfd9231c08975331df14edb1c33c4cea44bea (patch) | |
tree | 1d2bbb33f0402717dba4e5c9b8395f80ed4c2c36 /tools/qdoc3 | |
parent | 8b059a78b2632e31492fa25cfaae99b111a041a6 (diff) | |
download | Qt-77fcfd9231c08975331df14edb1c33c4cea44bea.zip Qt-77fcfd9231c08975331df14edb1c33c4cea44bea.tar.gz Qt-77fcfd9231c08975331df14edb1c33c4cea44bea.tar.bz2 |
qdoc3: Build fix for regression in e2f0e728e
Diffstat (limited to 'tools/qdoc3')
-rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 4 | ||||
-rw-r--r-- | tools/qdoc3/node.cpp | 2 | ||||
-rw-r--r-- | 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; |