diff options
author | Martin Smith <martin.smith@digia.com> | 2015-04-10 12:54:57 +0200 |
---|---|---|
committer | Martin Smith <martin.smith@digia.com> | 2015-04-11 10:25:14 +0000 |
commit | 8a2645b8f048092aee3e9cfa570171a1dfc58651 (patch) | |
tree | 69b77618be033ee6dfffcaccaa37faaeeb2b472c /src/tools/qdoc/qdocindexfiles.cpp | |
parent | 02a13a86fab1f928d5dd40069d121ded549366f1 (diff) |
qdoc: More data member name changes
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ƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/qdocindexfiles.cpp')
-rw-r--r-- | src/tools/qdoc/qdocindexfiles.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index 44d6a40aac..b921d0947d 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -342,7 +342,7 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, else if ((element.nodeName() == "qmlmethod") || (element.nodeName() == "qmlsignal") || (element.nodeName() == "qmlsignalhandler")) { - Node::Type t = Node::QmlMethod; + Node::NodeType t = Node::QmlMethod; if (element.nodeName() == "qmlsignal") t = Node::QmlSignal; else if (element.nodeName() == "qmlsignalhandler") @@ -354,7 +354,7 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, else if ((element.nodeName() == "jsmethod") || (element.nodeName() == "jssignal") || (element.nodeName() == "jssignalhandler")) { - Node::Type t = Node::QmlMethod; + Node::NodeType t = Node::QmlMethod; if (element.nodeName() == "jssignal") t = Node::QmlSignal; else if (element.nodeName() == "jssignalhandler") @@ -405,7 +405,7 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, node = cn; } else if (element.nodeName() == "page") { - Node::SubType subtype; + Node::DocSubtype subtype; Node::PageType ptype = Node::NoPageType; QString attr = element.attribute("subtype"); if (attr == "example") { @@ -726,7 +726,7 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer, /* Don't include index nodes in a new index file. Or DITA map nodes. */ - if (node->isIndexNode() || node->subType() == Node::DitaMap) + if (node->isIndexNode() || node->docSubtype() == Node::DitaMap) return false; QString nodeName; @@ -1019,7 +1019,7 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer, */ bool writeModuleName = false; const DocumentNode* docNode = static_cast<const DocumentNode*>(node); - switch (docNode->subType()) { + switch (docNode->docSubtype()) { case Node::Example: writer.writeAttribute("subtype", "example"); writeModuleName = true; @@ -1316,7 +1316,7 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer, bool external = false; if (node->type() == Node::Document) { const DocumentNode* docNode = static_cast<const DocumentNode*>(node); - if (docNode->subType() == Node::ExternalPage) + if (docNode->docSubtype() == Node::ExternalPage) external = true; } foreach (const Atom* target, node->doc().targets()) { |