diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-04-03 10:17:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-03 12:45:46 +0200 |
| commit | 98fed68347ed59f5f9a55230cc6ec21311f3ef07 (patch) | |
| tree | 9c0c9273a54638d377c0d1c53a0b266cbe58ffd0 /src/tools/qdoc/tree.cpp | |
| parent | e09fc38a3624f372c9f0b7339b460468961e918b (diff) | |
qdoc: findNodeRecursive() was called with a null start node
This occurred in several places. They have
all been corrected to start at the tree root,
when the start node passed is null.
Task nr: QTBUG-25146
Change-Id: I5d75db0626451d30e8be8de5605036ba168f2a14
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/tree.cpp')
| -rw-r--r-- | src/tools/qdoc/tree.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp index a735f02d262..3dfcfea48b8 100644 --- a/src/tools/qdoc/tree.cpp +++ b/src/tools/qdoc/tree.cpp @@ -2407,6 +2407,8 @@ Node* Tree::findNodeRecursive(const QStringList& path, */ EnumNode* Tree::findEnumNode(const QStringList& path, Node* start) { + if (!start) + start = const_cast<NamespaceNode*>(root()); return static_cast<EnumNode*>(findNodeRecursive(path, 0, start, Node::Enum, Node::NoSubType)); } @@ -2418,6 +2420,8 @@ EnumNode* Tree::findEnumNode(const QStringList& path, Node* start) */ ClassNode* Tree::findClassNode(const QStringList& path, Node* start) { + if (!start) + start = const_cast<NamespaceNode*>(root()); return static_cast<ClassNode*>(findNodeRecursive(path, 0, start, Node::Class, Node::NoSubType)); } @@ -2441,6 +2445,8 @@ QmlClassNode* Tree::findQmlClassNode(const QStringList& path, Node* start) return qcn; } + if (!start) + start = const_cast<NamespaceNode*>(root()); return static_cast<QmlClassNode*>(findNodeRecursive(path, 0, start, Node::Fake, Node::QmlClass)); } @@ -2452,6 +2458,8 @@ QmlClassNode* Tree::findQmlClassNode(const QStringList& path, Node* start) */ NamespaceNode* Tree::findNamespaceNode(const QStringList& path, Node* start) { + if (!start) + start = const_cast<NamespaceNode*>(root()); return static_cast<NamespaceNode*>(findNodeRecursive(path, 0, start, Node::Namespace, Node::NoSubType)); } @@ -2463,6 +2471,8 @@ NamespaceNode* Tree::findNamespaceNode(const QStringList& path, Node* start) */ FakeNode* Tree::findGroupNode(const QStringList& path, Node* start) { + if (!start) + start = const_cast<NamespaceNode*>(root()); return static_cast<FakeNode*>(findNodeRecursive(path, 0, start, Node::Fake, Node::Group)); } @@ -2474,6 +2484,8 @@ FakeNode* Tree::findGroupNode(const QStringList& path, Node* start) */ FakeNode* Tree::findQmlModuleNode(const QStringList& path, Node* start) { + if (!start) + start = const_cast<NamespaceNode*>(root()); return static_cast<FakeNode*>(findNodeRecursive(path, 0, start, Node::Fake, Node::QmlModule)); } |