summaryrefslogtreecommitdiff
path: root/src/qdoc/tree.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qdoc/tree.h')
-rw-r--r--src/qdoc/tree.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qdoc/tree.h b/src/qdoc/tree.h
index 2586f5c01..a70d0f5d2 100644
--- a/src/qdoc/tree.h
+++ b/src/qdoc/tree.h
@@ -168,12 +168,13 @@ class Tree
void addPropertyFunction(PropertyNode *property,
const QString &funcName,
PropertyNode::FunctionRole funcRole);
- void resolveInheritance(Aggregate *n);
- void resolveInheritanceHelper(int pass, ClassNode* cn);
+ void resolveBaseClasses(Aggregate *n);
+ void resolveBaseClassesHelper(int pass, ClassNode* cn);
+ void resolvePropertyOverriddenFromPtrs(Aggregate *n);
void resolveProperties();
void resolveCppToQmlLinks();
void resolveUsingClauses();
- void fixInheritance(NamespaceNode *rootNode);
+ void removePrivateAndInternalBases(NamespaceNode *rootNode);
NamespaceNode *root() { return &root_; }
const NamespaceNode *root() const { return &root_; }