diff options
Diffstat (limited to 'src/tools/qdoc/node.cpp')
| -rw-r--r-- | src/tools/qdoc/node.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp index 66e0455074..75896e2718 100644 --- a/src/tools/qdoc/node.cpp +++ b/src/tools/qdoc/node.cpp @@ -130,8 +130,8 @@ QString Node::fullName(const Node* relative) const if (type() == Node::Document) { const DocNode* dn = static_cast<const DocNode*>(this); // Only print modulename::type on collision pages. - if (!dn->qmlModuleIdentifier().isEmpty() && relative != 0 && relative->isCollisionNode()) - return dn->qmlModuleIdentifier() + "::" + dn->title(); + if (!dn->qmlModuleName().isEmpty() && relative != 0 && relative->isCollisionNode()) + return dn->qmlModuleName() + "::" + dn->title(); return dn->title(); } else if (type() == Node::Class) { @@ -625,7 +625,7 @@ ClassNode* Node::declarativeCppNode() } /*! - Returns true if the node's status is Internal, or if its + Returns \c true if the node's status is Internal, or if its parent is a class with internal status. */ bool Node::isInternal() const @@ -654,7 +654,7 @@ InnerNode::~InnerNode() } /*! - Returns true if this node's members coolection is not empty. + Returns \c true if this node's members coolection is not empty. */ bool InnerNode::hasMembers() const { @@ -672,7 +672,7 @@ void InnerNode::addMember(Node* node) } /*! - Returns true if this node's members collection contains at + Returns \c true if this node's members collection contains at least one namespace node. */ bool InnerNode::hasNamespaces() const @@ -689,7 +689,7 @@ bool InnerNode::hasNamespaces() const } /*! - Returns true if this node's members collection contains at + Returns \c true if this node's members collection contains at least one class node. */ bool InnerNode::hasClasses() const @@ -816,8 +816,8 @@ void InnerNode::findNodes(const QString& name, QList<Node*>& n) not a recearsive search. If \a qml is true, only match a node for which node->isQmlNode() - returns true. If \a qml is false, only match a node for which - node->isQmlNode() returns false. + returns \c true. If \a qml is false, only match a node for which + node->isQmlNode() returns \c false. */ Node* InnerNode::findChildNodeByName(const QString& name, bool qml) { @@ -1078,11 +1078,11 @@ void InnerNode::deleteChildren() } /*! \fn bool InnerNode::isInnerNode() const - Returns true because this is an inner node. + Returns \c true because this is an inner node. */ /*! - Returns true if the node is a class node or a QML type node + Returns \c true if the node is a class node or a QML type node that is marked as being a wrapper class or QML type, or if it is a member of a wrapper class or type. */ @@ -1101,8 +1101,8 @@ const Node *InnerNode::findChildNodeByName(const QString& name) const /*! If \a qml is true, only match a node for which node->isQmlNode() - returns true. If \a qml is false, only match a node for which - node->isQmlNode() returns false. + returns \c true. If \a qml is false, only match a node for which + node->isQmlNode() returns \c false. */ const Node* InnerNode::findChildNodeByName(const QString& name, bool qml) const { @@ -1395,7 +1395,7 @@ QmlPropertyNode* InnerNode::hasQmlProperty(const QString& n) const */ /*! \fn bool LeafNode::isInnerNode() const - Returns false because this is a LeafNode. + Returns \c false because this is a LeafNode. */ /*! @@ -2204,7 +2204,7 @@ QString QmlClassNode::qmlFullBaseName() const { QString result; if (baseNode_) { - result = baseNode_->qmlModuleIdentifier() + "::" + baseNode_->name(); + result = baseNode_->qmlModuleName() + "::" + baseNode_->name(); } return result; } @@ -2329,7 +2329,7 @@ QmlPropertyNode::QmlPropertyNode(InnerNode* parent, } /*! - Returns true if a QML property or attached property is + Returns \c true if a QML property or attached property is not read-only. The algorithm for figuring this out is long amd tedious and almost certainly will break. It currently doesn't work for the qmlproperty: @@ -2356,13 +2356,13 @@ bool QmlPropertyNode::isWritable(QDocDatabase* qdb) location().warning(tr("No Q_PROPERTY for QML property %1::%2::%3 " "in C++ class documented as QML type: " "(property not found in the C++ class or its base classes)") - .arg(qmlModuleIdentifier()).arg(qmlTypeName()).arg(name())); + .arg(qmlModuleName()).arg(qmlTypeName()).arg(name())); } else location().warning(tr("No Q_PROPERTY for QML property %1::%2::%3 " "in C++ class documented as QML type: " "(C++ class not specified or not found).") - .arg(qmlModuleIdentifier()).arg(qmlTypeName()).arg(name())); + .arg(qmlModuleName()).arg(qmlTypeName()).arg(name())); } } return true; @@ -2474,7 +2474,7 @@ NameCollisionNode::~NameCollisionNode() */ /*! - Returns true if this collision node's current node is a QML node. + Returns \c true if this collision node's current node is a QML node. */ bool NameCollisionNode::isQmlNode() const { @@ -2505,18 +2505,18 @@ InnerNode* NameCollisionNode::findAny(Node::Type t, Node::SubType st) /*! This node is a name collision node. Find a child of this node - such that the child's QML module identifier matches origin's - QML module identifier. Return the matching node, or return this - node if there is no matching node. + such that the child's QML module name matches origin's QML module + Name. Return the matching node, or return this node if there is + no matching node. */ -const Node* NameCollisionNode::applyModuleIdentifier(const Node* origin) const +const Node* NameCollisionNode::applyModuleName(const Node* origin) const { - if (origin && !origin->qmlModuleIdentifier().isEmpty()) { + if (origin && !origin->qmlModuleName().isEmpty()) { const NodeList& cn = childNodes(); NodeList::ConstIterator i = cn.constBegin(); while (i != cn.constEnd()) { if ((*i)->type() == Node::Document && (*i)->subType() == Node::QmlClass) { - if (origin->qmlModuleIdentifier() == (*i)->qmlModuleIdentifier()) + if (origin->qmlModuleName() == (*i)->qmlModuleName()) return (*i); } ++i; |