diff options
| author | Martin Smith <martin.smith@digia.com> | 2015-04-10 12:54:57 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2015-04-11 10:25:14 +0000 |
| commit | 8a2645b8f048092aee3e9cfa570171a1dfc58651 (patch) | |
| tree | 69b77618be033ee6dfffcaccaa37faaeeb2b472c /src/tools/qdoc/tree.cpp | |
| parent | 02a13a86fab1f928d5dd40069d121ded549366f1 (diff) | |
qdoc: More data member name changes
In preparation for refactoring the Node class hierarchy,
the names of a few enum types and the functions that set
and get them are changed so that they will not be confused
with other uses of the word Type.
Change-Id: I0496b46e5d7adffccadcb464aedb2806728e781d
Task-number: QTBUG-45450
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/tree.cpp')
| -rw-r--r-- | src/tools/qdoc/tree.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp index 957d72c24b..41382be3f1 100644 --- a/src/tools/qdoc/tree.cpp +++ b/src/tools/qdoc/tree.cpp @@ -301,8 +301,8 @@ static const NodeTypeList& relatesTypes() { if (t.isEmpty()) { t.reserve(3); - t.append(NodeTypePair(Node::Class, Node::NoSubType)); - t.append(NodeTypePair(Node::Namespace, Node::NoSubType)); + t.append(NodeTypePair(Node::Class, Node::NoSubtype)); + t.append(NodeTypePair(Node::Namespace, Node::NoSubtype)); t.append(NodeTypePair(Node::Document, Node::HeaderFile)); } return t; @@ -586,7 +586,7 @@ NodeList Tree::allBaseClasses(const ClassNode* classNode) const search at the tree root. \a subtype is not used unless \a type is \c{Document}. */ -Node* Tree::findNodeByNameAndType(const QStringList& path, Node::Type type) const +Node* Tree::findNodeByNameAndType(const QStringList& path, Node::NodeType type) const { return findNodeRecursive(path, 0, root(), type); } @@ -610,7 +610,7 @@ Node* Tree::findNodeByNameAndType(const QStringList& path, Node::Type type) cons Node* Tree::findNodeRecursive(const QStringList& path, int pathIndex, const Node* start, - Node::Type type) const + Node::NodeType type) const { if (!start || path.isEmpty()) return 0; // no place to start, or nothing to search for. @@ -979,7 +979,7 @@ QString Tree::getRef(const QString& target, const Node* node) const */ void Tree::insertTarget(const QString& name, const QString& title, - TargetRec::Type type, + TargetRec::TargetType type, Node* node, int priority) { @@ -1004,7 +1004,7 @@ void Tree::resolveTargets(InnerNode* root) bool alreadyThere = false; if (!nodes.empty()) { for (int i=0; i< nodes.size(); ++i) { - if (nodes[i]->subType() == Node::ExternalPage) { + if (nodes[i]->docSubtype() == Node::ExternalPage) { if (node->name() == nodes[i]->name()) { alreadyThere = true; break; @@ -1251,7 +1251,7 @@ CollectionNode* Tree::findCollection(const QString& name, Node::Genus genus) CNMap::const_iterator i = m->find(name); if (i != m->end()) return i.value(); - Node::Type t = Node::NoType; + Node::NodeType t = Node::NoType; switch (genus) { case Node::DOC: t = Node::Group; |