From 8a2645b8f048092aee3e9cfa570171a1dfc58651 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 10 Apr 2015 12:54:57 +0200 Subject: qdoc: More data member name changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation for refactoring the Node class hierarchy, the names of a few enum types and the functions that set and get them are changed so that they will not be confused with other uses of the word Type. Change-Id: I0496b46e5d7adffccadcb464aedb2806728e781d Task-number: QTBUG-45450 Reviewed-by: Topi Reiniö --- src/tools/qdoc/cppcodeparser.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tools/qdoc/cppcodeparser.h') diff --git a/src/tools/qdoc/cppcodeparser.h b/src/tools/qdoc/cppcodeparser.h index 308d14f0421..4f364c4feb9 100644 --- a/src/tools/qdoc/cppcodeparser.h +++ b/src/tools/qdoc/cppcodeparser.h @@ -53,11 +53,11 @@ class CppCodeParser : public CodeParser struct ExtraFuncData { InnerNode* root; // Used as the parent. - Node::Type type; // The node type: Function, etc. + 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(InnerNode* r, Node::NodeType t, bool a) : root(r), type(t), isAttached(a), isMacro(false) { } }; @@ -141,7 +141,7 @@ protected: FunctionNode* makeFunctionNode(const Doc& doc, const QString& sig, InnerNode* parent, - Node::Type type, + Node::NodeType type, bool attached, QString qdoctag); void parseQiteratorDotH(const Location &location, const QString &filePath); @@ -151,7 +151,7 @@ protected: void createExampleFileNodes(DocumentNode *dn); protected: - QMap nodeTypeMap; + QMap nodeTypeMap; Tokenizer *tokenizer; int tok; Node::Access access; -- cgit v1.2.3