diff options
| author | Martin Smith <martin.smith@digia.com> | 2015-04-08 12:47:41 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2015-04-08 11:23:49 +0000 |
| commit | 0b17d2328592c03503c41af7d594e58233255ff5 (patch) | |
| tree | e35a70616e6b7aac9c8d048e321ace2f12bd7265 /src/tools/qdoc/qdocindexfiles.cpp | |
| parent | e18111c1a3908bf3d04a094344280d3f5ace5a3a (diff) | |
qdoc: Data member name changes
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>
Diffstat (limited to 'src/tools/qdoc/qdocindexfiles.cpp')
| -rw-r--r-- | src/tools/qdoc/qdocindexfiles.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index 8961ff71ad0..44d6a40aac1 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -486,8 +486,8 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, QString t = element.attribute("virtual"); if (t == "non") virt = FunctionNode::NonVirtual; - else if (t == "impure") - virt = FunctionNode::ImpureVirtual; + else if (t == "virtual") + virt = FunctionNode::NormalVirtual; else if (t == "pure") virt = FunctionNode::PureVirtual; else @@ -613,12 +613,12 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, node->setStatus(Node::Obsolete); else if (status == "preliminary") node->setStatus(Node::Preliminary); - else if (status == "commendable") - node->setStatus(Node::Commendable); + else if (status == "active") + node->setStatus(Node::Active); else if (status == "internal") node->setStatus(Node::Internal); else - node->setStatus(Node::Commendable); + node->setStatus(Node::Active); QString physicalModuleName = element.attribute("module"); if (!physicalModuleName.isEmpty()) @@ -885,8 +885,8 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer, case Node::Preliminary: status = "preliminary"; break; - case Node::Commendable: - status = "commendable"; + case Node::Active: + status = "active"; break; case Node::Internal: status = "internal"; @@ -1139,8 +1139,8 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer, case FunctionNode::NonVirtual: writer.writeAttribute("virtual", "non"); break; - case FunctionNode::ImpureVirtual: - writer.writeAttribute("virtual", "impure"); + case FunctionNode::NormalVirtual: + writer.writeAttribute("virtual", "virtual"); break; case FunctionNode::PureVirtual: writer.writeAttribute("virtual", "pure"); |