diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-09 22:26:43 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-09 22:26:43 (GMT) |
| commit | c85bf4b51331496fcfb8befb4cdcc56d2fa0a213 (patch) | |
| tree | 270b4331dbaf72868b3211510e1fdd8cc4192c7f /tools/qdoc3/node.cpp | |
| parent | f2eab026602a0608e036018eeacf3fa6c8ca3fa7 (diff) | |
| parent | 25fd8c268acdcc9ab4918738040e7d70210bd686 (diff) | |
| download | Qt-c85bf4b51331496fcfb8befb4cdcc56d2fa0a213.zip Qt-c85bf4b51331496fcfb8befb4cdcc56d2fa0a213.tar.gz Qt-c85bf4b51331496fcfb8befb4cdcc56d2fa0a213.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qdoc3/node.cpp')
| -rw-r--r-- | tools/qdoc3/node.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 4ba3a32..3c7e9dc 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -624,7 +624,7 @@ void InnerNode::removeChild(Node *child) QMap<QString, Node *>::Iterator prim = primaryFunctionMap.find(child->name()); NodeList& secs = secondaryFunctionMap[child->name()]; - if (*prim == child) { + if (prim != primaryFunctionMap.end() && *prim == child) { if (secs.isEmpty()) { primaryFunctionMap.remove(child->name()); } @@ -636,12 +636,12 @@ void InnerNode::removeChild(Node *child) secs.removeAll(child); } QMap<QString, Node *>::Iterator ent = childMap.find( child->name() ); - if ( *ent == child ) + if (ent != childMap.end() && *ent == child) childMap.erase( ent ); } else { QMap<QString, Node *>::Iterator ent = childMap.find(child->name()); - if (*ent == child) + if (ent != childMap.end() && *ent == child) childMap.erase(ent); } } |