From 0b17d2328592c03503c41af7d594e58233255ff5 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Wed, 8 Apr 2015 12:47:41 +0200
Subject: qdoc: 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,
several data member names and some getter and setter names
in the Node hierarchy have been changed to make them more
readable.

Change-Id: Id76ce21c960e4033673f5cf0684aa70e701957b1
Task-number: QTBUG-45450
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
---
 src/tools/qdoc/cppcodeparser.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp
index 4fbe20b09e..e94135301e 100644
--- a/src/tools/qdoc/cppcodeparser.cpp
+++ b/src/tools/qdoc/cppcodeparser.cpp
@@ -928,7 +928,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
                                               "because its base function is private "
                                               "or internal").arg(COMMAND_REIMP).arg(node->name()));
                 }
-                func->setReimp(true);
+                func->setReimplemented(true);
             }
             else {
                 doc.location().warning(tr("Ignored '\\%1' in %2")
@@ -1051,7 +1051,7 @@ void CppCodeParser::reset()
     tokenizer = 0;
     tok = 0;
     access = Node::Public;
-    metaness = FunctionNode::Plain;
+    metaness_ = FunctionNode::Plain;
     lastPath_.clear();
     physicalModuleName.clear();
 }
@@ -1373,7 +1373,7 @@ bool CppCodeParser::matchFunctionDecl(InnerNode *parent,
     }
     FunctionNode::Virtualness vir = FunctionNode::NonVirtual;
     if (match(Tok_virtual)) {
-        vir = FunctionNode::ImpureVirtual;
+        vir = FunctionNode::NormalVirtual;
         if (matchCompat())
             compat = true;
     }
@@ -1511,7 +1511,7 @@ bool CppCodeParser::matchFunctionDecl(InnerNode *parent,
     if (compat)
         func->setStatus(Node::Compat);
 
-    func->setMetaness(metaness);
+    func->setMetaness(metaness_);
     if (parent) {
         if (name == parent->name()) {
             func->setMetaness(FunctionNode::Ctor);
@@ -1658,13 +1658,13 @@ bool CppCodeParser::matchClassDecl(InnerNode *parent,
 
     Node::Access outerAccess = access;
     access = isClass ? Node::Private : Node::Public;
-    FunctionNode::Metaness outerMetaness = metaness;
-    metaness = FunctionNode::Plain;
+    FunctionNode::Metaness outerMetaness = metaness_;
+    metaness_ = FunctionNode::Plain;
 
     bool matches = (matchDeclList(classe) && match(Tok_RightBrace) &&
                     match(Tok_Semicolon));
     access = outerAccess;
-    metaness = outerMetaness;
+    metaness_ = outerMetaness;
     return matches;
 }
 
@@ -2025,28 +2025,28 @@ bool CppCodeParser::matchDeclList(InnerNode *parent)
         case Tok_private:
             readToken();
             access = Node::Private;
-            metaness = FunctionNode::Plain;
+            metaness_ = FunctionNode::Plain;
             break;
         case Tok_protected:
             readToken();
             access = Node::Protected;
-            metaness = FunctionNode::Plain;
+            metaness_ = FunctionNode::Plain;
             break;
         case Tok_public:
             readToken();
             access = Node::Public;
-            metaness = FunctionNode::Plain;
+            metaness_ = FunctionNode::Plain;
             break;
         case Tok_signals:
         case Tok_Q_SIGNALS:
             readToken();
             access = Node::Public;
-            metaness = FunctionNode::Signal;
+            metaness_ = FunctionNode::Signal;
             break;
         case Tok_slots:
         case Tok_Q_SLOTS:
             readToken();
-            metaness = FunctionNode::Slot;
+            metaness_ = FunctionNode::Slot;
             break;
         case Tok_Q_OBJECT:
             readToken();
-- 
cgit v1.2.3