1 files changed, 8 insertions, 8 deletions

diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp
index 4c1e84fe3c..43ba29faa0 100644
--- a/src/tools/qdoc/cppcodemarker.cpp
+++ b/src/tools/qdoc/cppcodemarker.cpp
@@ -103,7 +103,7 @@ bool CppCodeMarker::recognizeLanguage(const QString &lang)
 /*!
   Returns the type of atom used to represent C++ code in the documentation.
 */
-Atom::Type CppCodeMarker::atomType() const
+Atom::AtomType CppCodeMarker::atomType() const
 {
     return Atom::Code;
 }
@@ -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())