summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/cppcodeparser.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2015-01-21 10:18:50 +0100
committerMartin Smith <martin.smith@digia.com>2015-01-22 07:45:49 +0100
commitfdbf3bec3009343362448141faa42734ec31b1c3 (patch)
tree5b1e41287a98e92540675e3db151e711ae404445 /src/tools/qdoc/cppcodeparser.cpp
parentbe6c50a2511fc95b165b702cae1f54a9e06fa67c (diff)
qdoc: Change name of node type
QmlClassNode is renamed to QmlTypeNode. This is done in preparation for implementing qdoc support for documenting javascript code. Next, QmlTypeNode will be renamed to JsTypeNode, and a new QmlTypeNode will be declared that will inherit JsTypeNode. Change-Id: Ia5d0c367d06c26cb43f887927bbcb096afcb7301 Task-number: QTBUG-43715 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/cppcodeparser.cpp')
-rw-r--r--src/tools/qdoc/cppcodeparser.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp
index 22aae609ae..f05615972c 100644
--- a/src/tools/qdoc/cppcodeparser.cpp
+++ b/src/tools/qdoc/cppcodeparser.cpp
@@ -544,7 +544,7 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
tr("Also used here: %1").arg(other));
}
#endif
- QmlClassNode* qcn = new QmlClassNode(qdb_->primaryTreeRoot(), names[0]);
+ QmlTypeNode* qcn = new QmlTypeNode(qdb_->primaryTreeRoot(), names[0]);
qcn->setClassNode(classNode);
qcn->setLocation(doc.startLocation());
return qcn;
@@ -562,7 +562,7 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
QString qmlType;
QString type;
if (splitQmlMethodArg(arg.first,type,module,qmlType)) {
- QmlClassNode* qmlClass = qdb_->findQmlType(module,qmlType);
+ QmlTypeNode* qmlClass = qdb_->findQmlType(module,qmlType);
if (qmlClass) {
bool attached = false;
Node::Type nodeType = Node::QmlMethod;
@@ -740,7 +740,7 @@ void CppCodeParser::processQmlProperties(const Doc& doc, NodeList& nodes, DocLis
QString qmlType;
QString property;
QmlPropertyNode* qpn = 0;
- QmlClassNode* qmlClass = 0;
+ QmlTypeNode* qmlClass = 0;
QmlPropertyGroupNode* qpgn = 0;
Topic qmlPropertyGroupTopic;
@@ -932,9 +932,9 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
if (node->name() == arg)
doc.location().warning(tr("%1 tries to inherit itself").arg(arg));
else if (node->isQmlType()) {
- QmlClassNode *qmlClass = static_cast<QmlClassNode*>(node);
+ QmlTypeNode *qmlClass = static_cast<QmlTypeNode*>(node);
qmlClass->setQmlBaseName(arg);
- QmlClassNode::addInheritedBy(arg,node);
+ QmlTypeNode::addInheritedBy(arg,node);
}
}
else if (command == COMMAND_QMLINSTANTIATES) {