From 1d91d155f28fb178eb4e5a2a33b45bc68be718a4 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Mon, 13 Apr 2015 11:45:03 +0200
Subject: qdoc: Changing InnerNode to Aggregate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/tools/qdoc/cppcodemarker.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/tools/qdoc/cppcodemarker.cpp')

diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp
index 3bba9cc66f3..43ba29faa03 100644
--- a/src/tools/qdoc/cppcodemarker.cpp
+++ b/src/tools/qdoc/cppcodemarker.cpp
@@ -436,7 +436,7 @@ QString CppCodeMarker::functionEndRegExp(const QString& /* funcName */)
     return "^\\}$";
 }
 
-QList<Section> CppCodeMarker::sections(const InnerNode *inner,
+QList<Section> CppCodeMarker::sections(const Aggregate *inner,
                                        SynopsisStyle style,
                                        Status status)
 {
@@ -522,10 +522,10 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner,
                 ++r;
             }
 
-            QStack<const InnerNode *> stack;
+            QStack<const Aggregate *> stack;
             stack.push(inner);
             while (!stack.isEmpty()) {
-                const InnerNode* ancestor = stack.pop();
+                const Aggregate* ancestor = stack.pop();
 
                 NodeList::ConstIterator c = ancestor->childNodes().constBegin();
                 while (c != ancestor->childNodes().constEnd()) {
@@ -701,11 +701,11 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner,
         else {
             FastSection all(inner,QString(),QString(),"member","members");
 
-            QStack<const InnerNode*> stack;
+            QStack<const Aggregate*> stack;
             stack.push(inner);
 
             while (!stack.isEmpty()) {
-                const InnerNode* ancestor = stack.pop();
+                const Aggregate* ancestor = stack.pop();
                 NodeList::ConstIterator c = ancestor->childNodes().constBegin();
                 while (c != ancestor->childNodes().constEnd()) {
                     if ((*c)->access() != Node::Private && (*c)->type() != Node::Property)
@@ -812,8 +812,8 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner,
                 if (!ns->orphans().isEmpty()) {
                     foreach (Node* n, ns->orphans()) {
                         // Use inner as a temporary parent when inserting orphans
-                        InnerNode* p = n->parent();
-                        n->setParent(const_cast<InnerNode*>(inner));
+                        Aggregate* p = n->parent();
+                        n->setParent(const_cast<Aggregate*>(inner));
                         if (n->isClass())
                             insert(classes, n, style, status);
                         else if (n->isNamespace())
-- 
cgit v1.2.3