diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-09-24 14:58:43 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-09-24 14:58:43 (GMT) |
| commit | 4c0016bd7f177603bab05c2a71cd45e839c11173 (patch) | |
| tree | 17c250b1b0bfd99ef4cfad2a3d0b308c5d5b5237 | |
| parent | 9634e133db1bf50a55ed44b3fe01e49954c80d08 (diff) | |
| download | Qt-4c0016bd7f177603bab05c2a71cd45e839c11173.zip Qt-4c0016bd7f177603bab05c2a71cd45e839c11173.tar.gz Qt-4c0016bd7f177603bab05c2a71cd45e839c11173.tar.bz2 | |
Added a condition to skip obsolete functions during the threadness check.
Reviewed-by: David Boddie
Task:QTBUG-13786
| -rw-r--r-- | tools/qdoc3/generator.cpp | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index 7f39be2..f1eaddc 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -981,23 +981,26 @@ void Generator::generateThreadSafeness(const Node *node, CodeMarker *marker) NodeList nonreentrant; NodeList::ConstIterator c = innerNode->childNodes().begin(); while (c != innerNode->childNodes().end()) { - switch ((*c)->threadSafeness()) { - case Node::Reentrant: - reentrant.append(*c); - if (threadSafeness == Node::ThreadSafe) - exceptions = true; - break; - case Node::ThreadSafe: - threadsafe.append(*c); - if (threadSafeness == Node::Reentrant) + + if ((*c)->status() != Node::Obsolete){ + switch ((*c)->threadSafeness()) { + case Node::Reentrant: + reentrant.append(*c); + if (threadSafeness == Node::ThreadSafe) + exceptions = true; + break; + case Node::ThreadSafe: + threadsafe.append(*c); + if (threadSafeness == Node::Reentrant) + exceptions = true; + break; + case Node::NonReentrant: + nonreentrant.append(*c); exceptions = true; - break; - case Node::NonReentrant: - nonreentrant.append(*c); - exceptions = true; - break; - default: - break; + break; + default: + break; + } } ++c; } |