1 files changed, 18 insertions, 17 deletions

diff --git a/src/tools/qdoc/cppcodeparser.h b/src/tools/qdoc/cppcodeparser.h
index f9ddcab88c..31964699a2 100644
--- a/src/tools/qdoc/cppcodeparser.h
+++ b/src/tools/qdoc/cppcodeparser.h
@@ -44,7 +44,7 @@ class ClassNode;
 class CodeChunk;
 class CppCodeParserPrivate;
 class FunctionNode;
-class InnerNode;
+class Aggregate;
 class Tokenizer;
 
 class CppCodeParser : public CodeParser
@@ -52,12 +52,12 @@ class CppCodeParser : public CodeParser
     Q_DECLARE_TR_FUNCTIONS(QDoc::CppCodeParser)
 
     struct ExtraFuncData {
-        InnerNode* root; // Used as the parent.
-        Node::Type type; // The node type: Function, etc.
+        Aggregate* root; // Used as the parent.
+        Node::NodeType type; // The node type: Function, etc.
         bool isAttached; // If true, the method is attached.
         bool isMacro;    // If true, we are parsing a macro signature.
         ExtraFuncData() : root(0), type(Node::Function), isAttached(false), isMacro(false) { }
-        ExtraFuncData(InnerNode* r, Node::Type t, bool a)
+        ExtraFuncData(Aggregate* r, Node::NodeType t, bool a)
           : root(r), type(t), isAttached(a), isMacro(false) { }
     };
 
@@ -117,22 +117,22 @@ protected:
     bool matchTemplateHeader();
     bool matchDataType(CodeChunk *type, QString *var = 0);
     bool matchParameter(FunctionNode *func);
-    bool matchFunctionDecl(InnerNode *parent,
+    bool matchFunctionDecl(Aggregate *parent,
                            QStringList *parentPathPtr,
                            FunctionNode **funcPtr,
                            const QString &templateStuff,
                            ExtraFuncData& extra);
     bool matchBaseSpecifier(ClassNode *classe, bool isClass);
     bool matchBaseList(ClassNode *classe, bool isClass);
-    bool matchClassDecl(InnerNode *parent,
+    bool matchClassDecl(Aggregate *parent,
                         const QString &templateStuff = QString());
-    bool matchNamespaceDecl(InnerNode *parent);
-    bool matchUsingDecl(InnerNode* parent);
-    bool matchEnumItem(InnerNode *parent, EnumNode *enume);
-    bool matchEnumDecl(InnerNode *parent);
-    bool matchTypedefDecl(InnerNode *parent);
-    bool matchProperty(InnerNode *parent);
-    bool matchDeclList(InnerNode *parent);
+    bool matchNamespaceDecl(Aggregate *parent);
+    bool matchUsingDecl(Aggregate* parent);
+    bool matchEnumItem(Aggregate *parent, EnumNode *enume);
+    bool matchEnumDecl(Aggregate *parent);
+    bool matchTypedefDecl(Aggregate *parent);
+    bool matchProperty(Aggregate *parent);
+    bool matchDeclList(Aggregate *parent);
     bool matchDocsAndStuff();
     bool makeFunctionNode(const QString &synopsis,
                           QStringList *parentPathPtr,
@@ -140,8 +140,8 @@ protected:
                           ExtraFuncData& params);
     FunctionNode* makeFunctionNode(const Doc& doc,
                                    const QString& sig,
-                                   InnerNode* parent,
-                                   Node::Type type,
+                                   Aggregate* parent,
+                                   Node::NodeType type,
                                    bool attached,
                                    QString qdoctag);
     void parseQiteratorDotH(const Location &location, const QString &filePath);
@@ -151,11 +151,11 @@ protected:
     void createExampleFileNodes(DocumentNode *dn);
 
  protected:
-    QMap<QString, Node::Type> nodeTypeMap;
+    QMap<QString, Node::NodeType> nodeTypeMap;
     Tokenizer *tokenizer;
     int tok;
     Node::Access access;
-    FunctionNode::Metaness metaness;
+    FunctionNode::Metaness metaness_;
     QString physicalModuleName;
     QStringList lastPath_;
     QRegExp varComment;
@@ -177,6 +177,7 @@ protected:
     QString exampleImageFilter;
 };
 
+#define COMMAND_ABSTRACT                Doc::alias("abstract")
 #define COMMAND_CLASS                   Doc::alias("class")
 #define COMMAND_CONTENTSPAGE            Doc::alias("contentspage")
 #define COMMAND_DITAMAP                 Doc::alias("ditamap")