diff options
author | Martin Smith <martin.smith@qt.io> | 2019-01-17 16:52:59 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-01-22 15:13:29 +0000 |
commit | 8ff03236c50ae73b7e4d362b5271317fd6f4d26e (patch) | |
tree | d3ccfae0443d38c8d1d582b14ad7d1717a16a652 | |
parent | 92a961934dbf51305235f24f213d75eeb7a39d1b (diff) | |
download | qttools-8ff03236c50ae73b7e4d362b5271317fd6f4d26e.tar.gz |
Replace nodeType() comparisons to Node:X with isX() tests
Change-Id: I62692b4b667a32fe77ee9dc51be15114aae9387b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r-- | src/qdoc/cppcodemarker.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/cppcodeparser.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/generator.cpp | 15 | ||||
-rw-r--r-- | src/qdoc/helpprojectwriter.cpp | 4 | ||||
-rw-r--r-- | src/qdoc/htmlgenerator.cpp | 40 | ||||
-rw-r--r-- | src/qdoc/node.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/qdoctagfiles.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/qmlvisitor.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/tree.cpp | 13 | ||||
-rw-r--r-- | src/qdoc/webxmlgenerator.cpp | 6 |
10 files changed, 42 insertions, 46 deletions
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp index 38dc3e66c..adeb2db1c 100644 --- a/src/qdoc/cppcodemarker.cpp +++ b/src/qdoc/cppcodemarker.cpp @@ -405,7 +405,7 @@ QString CppCodeMarker::markedUpFullName(const Node *node, const Node *relative) QString CppCodeMarker::markedUpEnumValue(const QString &enumValue, const Node *relative) { - if (relative->nodeType() != Node::Enum) + if (!relative->isEnumType()) return enumValue; const Node *node = relative->parent(); diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 55b4e8ce9..83b989033 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -604,7 +604,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, } else if (command == COMMAND_REIMP) { if (node != 0 && node->parent() && !node->parent()->isInternal()) { - if (node->nodeType() == Node::Function) { + if (node->isFunction()) { FunctionNode *func = (FunctionNode *) node; if (func->reimplementedFrom().isEmpty() && isWorthWarningAbout(doc)) { doc.location().warning(tr("Cannot find base function for '\\%1' in %2()") diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index 7c77f8337..b58469ec0 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -369,7 +369,7 @@ QString Generator::fileBase(const Node *node) const node = node->relates(); else if (!node->isPageNode() && !node->isCollectionNode()) node = node->parent(); - if (node->nodeType() == Node::QmlPropertyGroup) + if (node->isQmlPropertyGroup()) node = node->parent(); if (node->hasFileNameBase()) @@ -802,7 +802,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker) Test for special function, like a destructor or copy constructor, that has no documentation. */ - if (node->nodeType() == Node::Function) { + if (node->isFunction()) { const FunctionNode* func = static_cast<const FunctionNode*>(node); if (func->isDtor()) { Text text; @@ -864,7 +864,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker) } } else if (!node->isSharingComment()) { - if (node->nodeType() == Node::Function) { + if (node->isFunction()) { const FunctionNode *func = static_cast<const FunctionNode *>(node); if (!func->reimplementedFrom().isEmpty()) generateReimplementedFrom(func, marker); @@ -875,7 +875,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker) return; } - if (node->nodeType() == Node::Enum) { + if (node->isEnumType()) { const EnumNode *enume = (const EnumNode *) node; QSet<QString> definedItems; @@ -907,8 +907,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker) ++a; } } - } - else if (node->nodeType() == Node::Function) { + } else if (node->isFunction()) { const FunctionNode *func = static_cast<const FunctionNode *>(node); QSet<QString> definedParams; QVector<Parameter>::ConstIterator p = func->parameters().constBegin(); @@ -1310,7 +1309,7 @@ void Generator::generateSince(const Node *node, CodeMarker *marker) text << Atom::ParaLeft << "This " << typeString(node); - if (node->nodeType() == Node::Enum) + if (node->isEnumType()) text << " was introduced or modified in "; else text << " was introduced in "; @@ -1605,7 +1604,7 @@ void Generator::generateThreadSafeness(const Node *node, CodeMarker *marker) */ void Generator::generateOverloadedSignal(const Node* node, CodeMarker* marker) { - if (node->nodeType() != Node::Function) + if (!node->isFunction()) return; const FunctionNode *func = static_cast<const FunctionNode *>(node); if (!func->isSignal()) diff --git a/src/qdoc/helpprojectwriter.cpp b/src/qdoc/helpprojectwriter.cpp index e1bc95e18..568624842 100644 --- a/src/qdoc/helpprojectwriter.cpp +++ b/src/qdoc/helpprojectwriter.cpp @@ -208,7 +208,7 @@ QStringList HelpProjectWriter::keywordDetails(const Node *node) const if (node->parent() && !node->parent()->name().isEmpty()) { // "name" - if (node->nodeType() == Node::Enum || node->nodeType() == Node::Typedef) + if (node->isEnumType() || node->isTypedef()) details << node->parent()->name()+"::"+node->name(); else details << node->name(); @@ -574,7 +574,7 @@ void HelpProjectWriter::addMembers(HelpProject &project, QXmlStreamWriter &write return; bool derivedClass = false; - if (node->nodeType() == Node::Class) + if (node->isClass()) derivedClass = !(static_cast<const ClassNode *>(node)->baseClasses().isEmpty()); // Do not generate a 'List of all members' for namespaces or header files, diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 38373d7a8..a70ffabb9 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -535,8 +535,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark break; } out() << "<p>"; - if (relative->nodeType() == Node::Property || - relative->nodeType() == Node::Variable) { + if (relative->isProperty() || relative->isVariable()) { atom = atom->next(); if (atom != nullptr && atom->type() == Atom::String) { QString firstWord = atom->string().toLower().section(' ', 0, 0, QString::SectionSkipEmpty); @@ -546,7 +545,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark || firstWord == QLatin1String("whether") || firstWord == QLatin1String("which")) { QString str = "This "; - if (relative->nodeType() == Node::Property) + if (relative->isProperty()) str += "property holds "; else str += "variable holds "; @@ -1023,7 +1022,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark out() << "<th class=\"tblConst\">Constant</th>"; // If not in \enum topic, skip the value column - if (relative->nodeType() == Node::Enum) + if (relative->isEnumType()) out() << "<th class=\"tblval\">Value</th>"; out() << "<th class=\"tbldscr\">Description</th></tr>\n"; @@ -1085,7 +1084,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark t = protectEnc(plainCode(marker->markedUpEnumValue(t, relative))); out() << "<tr><td class=\"topAlign\"><code>" << t << "</code>"; - if (relative->nodeType() == Node::Enum) { + if (relative->isEnumType()) { out() << "</td><td class=\"topAlign tblval\">"; const EnumNode *enume = static_cast<const EnumNode *>(relative); QString itemValue = enume->itemValue(atom->next()->string()); @@ -1504,7 +1503,7 @@ void HtmlGenerator::generateCppReferencePage(Node* node, CodeMarker* marker) out() << "<h2>" << protectEnc(s->title()) << "</h2>\n"; headerGenerated = true; } - if ((*m)->nodeType() != Node::Class) + if (!(*m)->isClass()) generateDetailedMember(*m, aggregate, marker); else { out() << "<h3> class "; @@ -1515,11 +1514,11 @@ void HtmlGenerator::generateCppReferencePage(Node* node, CodeMarker* marker) QStringList names; names << (*m)->name(); - if ((*m)->nodeType() == Node::Function) { + if ((*m)->isFunction()) { const FunctionNode *func = reinterpret_cast<const FunctionNode *>(*m); if (func->isSomeCtor() || func->isDtor() || func->overloadNumber() != 0) names.clear(); - } else if ((*m)->nodeType() == Node::Property) { + } else if ((*m)->isProperty()) { const PropertyNode *prop = reinterpret_cast<const PropertyNode *>(*m); if (!prop->getters().isEmpty() && !names.contains(prop->getters().first()->name())) @@ -1530,7 +1529,7 @@ void HtmlGenerator::generateCppReferencePage(Node* node, CodeMarker* marker) names << prop->resetters().first()->name(); if (!prop->notifiers().isEmpty()) names << prop->notifiers().first()->name(); - } else if ((*m)->nodeType() == Node::Enum) { + } else if ((*m)->isEnumType()) { const EnumNode *enume = reinterpret_cast<const EnumNode*>(*m); if (enume->flagsType()) names << enume->flagsType()->name(); @@ -2152,7 +2151,7 @@ void HtmlGenerator::generateRequisites(Aggregate *aggregate, CodeMarker *marker) requisites.insert(sinceText, text); } - if (aggregate->nodeType() == Node::Class || aggregate->nodeType() == Node::Namespace) { + if (aggregate->isClass() || aggregate->isNamespace()) { //add the QT variable to the map if (!aggregate->physicalModuleName().isEmpty()) { const CollectionNode* cn = qdb_->getCollectionNode(aggregate->physicalModuleName(), Node::Module); @@ -2164,7 +2163,7 @@ void HtmlGenerator::generateRequisites(Aggregate *aggregate, CodeMarker *marker) } } - if (aggregate->nodeType() == Node::Class) { + if (aggregate->isClass()) { ClassNode* classe = static_cast<ClassNode*>(aggregate); if (classe->qmlElement() != nullptr && classe->status() != Node::Internal) { text.clear(); @@ -3196,7 +3195,7 @@ void HtmlGenerator::generateSection(const NodeVector& nv, const Node *relative, bool alignNames = true; if (!nv.isEmpty()) { bool twoColumn = false; - if (nv.first()->nodeType() == Node::Property) { + if (nv.first()->isProperty()) { twoColumn = (nv.count() >= 5); alignNames = false; } @@ -3259,8 +3258,7 @@ void HtmlGenerator::generateSectionList(const Section& section, if (section.style() == Section::AllMembers) { alignNames = false; twoColumn = (members.count() >= 16); - } - else if (members.first()->nodeType() == Node::Property) { + } else if (members.first()->isProperty()) { twoColumn = (members.count() >= 5); alignNames = false; } @@ -4009,7 +4007,7 @@ const QPair<QString,QString> HtmlGenerator::anchorForNode(const Node *node) QPair<QString,QString> anchorPair; anchorPair.first = Generator::fileName(node); - if (node->nodeType() == Node::Page) { + if (node->isPageNode()) { const PageNode *pn = static_cast<const PageNode*>(node); anchorPair.second = pn->title(); } @@ -4096,13 +4094,13 @@ void HtmlGenerator::generateQmlSummary(const Section& section, while (m != section.members().constEnd()) { out() << "<li class=\"fn\">"; generateQmlItem(*m,relative,marker,true); - if ((*m)->nodeType() == Node::QmlPropertyGroup) { + if ((*m)->isQmlPropertyGroup()) { const QmlPropertyGroupNode* qpgn = static_cast<const QmlPropertyGroupNode*>(*m); if (!qpgn->childNodes().isEmpty()) { NodeList::ConstIterator p = qpgn->childNodes().constBegin(); out() << "<ul>\n"; while (p != qpgn->childNodes().constEnd()) { - if ((*p)->nodeType() == Node::QmlProperty) { + if ((*p)->isQmlProperty()) { out() << "<li class=\"fn\">"; generateQmlItem(*p, relative, marker, true); out() << "</li>\n"; @@ -4320,24 +4318,24 @@ void HtmlGenerator::generateExtractionMark(const Node *node, ExtractionMarkType if (markType != EndMark) { out() << "<!-- $$$" + node->name(); if (markType == MemberMark) { - if (node->nodeType() == Node::Function) { + if (node->isFunction()) { const FunctionNode *func = static_cast<const FunctionNode *>(node); if (!func->hasAssociatedProperties()) { if (func->overloadNumber() == 0) out() << "[overload1]"; out() << "$$$" + func->name() + func->rawParameters().remove(' '); } - } else if (node->nodeType() == Node::Property) { + } else if (node->isProperty()) { out() << "-prop"; const PropertyNode *prop = static_cast<const PropertyNode *>(node); const NodeList &list = prop->functions(); foreach (const Node *propFuncNode, list) { - if (propFuncNode->nodeType() == Node::Function) { + if (propFuncNode->isFunction()) { const FunctionNode *func = static_cast<const FunctionNode *>(propFuncNode); out() << "$$$" + func->name() + func->rawParameters().remove(' '); } } - } else if (node->nodeType() == Node::Enum) { + } else if (node->isEnumType()) { const EnumNode *enumNode = static_cast<const EnumNode *>(node); foreach (const EnumItem &item, enumNode->items()) out() << "$$$" + item.name(); diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index 976ee5689..f80a7bac3 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -140,7 +140,7 @@ bool Node::nodeNameLessThan(const Node *n1, const Node *n2) return false; } - if (n1->nodeType() == Node::Function && n2->nodeType() == Node::Function) { + if (n1->isFunction() && n2->isFunction()) { const FunctionNode* f1 = static_cast<const FunctionNode*>(n1); const FunctionNode* f2 = static_cast<const FunctionNode*>(n2); diff --git a/src/qdoc/qdoctagfiles.cpp b/src/qdoc/qdoctagfiles.cpp index 9f7d1dd2e..94e3f4375 100644 --- a/src/qdoc/qdoctagfiles.cpp +++ b/src/qdoc/qdoctagfiles.cpp @@ -141,7 +141,7 @@ void QDocTagFiles::generateTagFileCompounds(QXmlStreamWriter& writer, const Aggr writer.writeStartElement("compound"); writer.writeAttribute("kind", kind); - if (node->nodeType() == Node::Class) { + if (node->isClass()) { writer.writeTextElement("name", node->fullDocumentName()); writer.writeTextElement("filename", gen_->fullDocumentLocation(node, false)); diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp index 55672a049..7cf2afe7e 100644 --- a/src/qdoc/qmlvisitor.cpp +++ b/src/qdoc/qmlvisitor.cpp @@ -551,7 +551,7 @@ bool QmlDocVisitor::visit(QQmlJS::AST::UiObjectDefinition *definition) QString type = getFullyQualifiedId(definition->qualifiedTypeNameId); nestingLevel++; - if (current->nodeType() == Node::Namespace) { + if (current->isNamespace()) { QmlTypeNode *component = new QmlTypeNode(current, name); component->setTitle(name); component->setImportList(importList); diff --git a/src/qdoc/tree.cpp b/src/qdoc/tree.cpp index ad07654e4..d9fe1b0e4 100644 --- a/src/qdoc/tree.cpp +++ b/src/qdoc/tree.cpp @@ -351,11 +351,10 @@ void Tree::resolveInheritance(Aggregate* n) for (int pass = 0; pass < 2; pass++) { NodeList::ConstIterator c = n->childNodes().constBegin(); while (c != n->childNodes().constEnd()) { - if ((*c)->nodeType() == Node::Class) { + if ((*c)->isClass()) { resolveInheritanceHelper(pass, (ClassNode*)*c); resolveInheritance((ClassNode*)*c); - } - else if ((*c)->nodeType() == Node::Namespace) { + } else if ((*c)->isNamespace()) { NamespaceNode* ns = static_cast<NamespaceNode*>(*c); resolveInheritance(ns); } @@ -416,7 +415,7 @@ void Tree::resolveInheritanceHelper(int pass, ClassNode* cn) else { NodeList::ConstIterator c = cn->childNodes().constBegin(); while (c != cn->childNodes().constEnd()) { - if ((*c)->nodeType() == Node::Property) + if ((*c)->isProperty()) cn->fixPropertyUsingBaseClasses(static_cast<PropertyNode*>(*c)); ++c; } @@ -440,7 +439,7 @@ void Tree::resolveProperties() NodeList::ConstIterator c = parent->childNodes().constBegin(); while (c != parent->childNodes().constEnd()) { - if ((*c)->nodeType() == Node::Function) { + if ((*c)->isFunction()) { FunctionNode* function = static_cast<FunctionNode*>(*c); if (function->access() == property->access() && (function->status() == property->status() || @@ -526,9 +525,9 @@ void Tree::fixInheritance(NamespaceNode* rootNode) NodeList::ConstIterator c = rootNode->childNodes().constBegin(); while (c != rootNode->childNodes().constEnd()) { - if ((*c)->nodeType() == Node::Class) + if ((*c)->isClass()) static_cast<ClassNode*>(*c)->fixBaseClasses(); - else if ((*c)->nodeType() == Node::Namespace) { + else if ((*c)->isNamespace()) { NamespaceNode* ns = static_cast<NamespaceNode*>(*c); fixInheritance(ns); } diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp index d7773a2d0..167ba2496 100644 --- a/src/qdoc/webxmlgenerator.cpp +++ b/src/qdoc/webxmlgenerator.cpp @@ -247,7 +247,7 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, default: break; } - if (relative->nodeType() == Node::Property || relative->nodeType() == Node::Variable) { + if (relative->isProperty() || relative->isVariable()) { QString str; const Atom *a = atom->next(); while (a != nullptr && a->type() != Atom::BriefRight) { @@ -273,7 +273,7 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, break; case Atom::BriefRight: - if (relative->nodeType() == Node::Property || relative->nodeType() == Node::Variable) + if (relative->isProperty() || relative->isVariable()) writer.writeCharacters("."); writer.writeEndElement(); // brief @@ -455,7 +455,7 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, else if (atom->string() == ATOM_LIST_TAG) writer.writeAttribute("type", "definition"); else if (atom->string() == ATOM_LIST_VALUE) { - if (relative->nodeType() == Node::Enum) + if (relative->isEnumType()) writer.writeAttribute("type", "enum"); else writer.writeAttribute("type", "definition"); |