summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/tree.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2015-04-13 11:45:03 +0200
committerMartin Smith <martin.smith@digia.com>2015-04-13 12:28:00 +0000
commit1d91d155f28fb178eb4e5a2a33b45bc68be718a4 (patch)
tree2c13fd6e34dedc32a013d6f9fbee5a481c3ffc07 /src/tools/qdoc/tree.h
parent16c32710bc8a5ecefc833352159361be564f3fe4 (diff)
qdoc: Changing InnerNode to Aggregate
An Aggregate node is a tree node that is not a leaf. Change-Id: I4a3964865fb653a217ee75d0b21e563f7f990a1c Task-number: QTBUG-45450 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/tree.h')
-rw-r--r--src/tools/qdoc/tree.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/qdoc/tree.h b/src/tools/qdoc/tree.h
index 28832cc0387..0f41c221b61 100644
--- a/src/tools/qdoc/tree.h
+++ b/src/tools/qdoc/tree.h
@@ -135,21 +135,21 @@ class Tree
QmlTypeNode* findQmlTypeNode(const QStringList& path);
Node* findNodeByNameAndType(const QStringList& path, Node::NodeType type) const;
- InnerNode* findRelatesNode(const QStringList& path);
+ Aggregate* findRelatesNode(const QStringList& path);
QString getRef(const QString& target, const Node* node) const;
void insertTarget(const QString& name,
const QString& title,
TargetRec::TargetType type,
Node* node,
int priority);
- void resolveTargets(InnerNode* root);
+ void resolveTargets(Aggregate* root);
const Node* findUnambiguousTarget(const QString& target, QString& ref) const;
const DocumentNode* findDocumentNodeByTitle(const QString& title) const;
void addPropertyFunction(PropertyNode *property,
const QString &funcName,
PropertyNode::FunctionRole funcRole);
- void resolveInheritance(InnerNode* n = 0);
+ void resolveInheritance(Aggregate* n = 0);
void resolveInheritanceHelper(int pass, ClassNode* cn);
void resolveProperties();
void resolveCppToQmlLinks();