diff options
author | Paul Wicking <paul.wicking@qt.io> | 2019-10-01 10:00:24 +0200 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2019-10-03 09:16:25 +0200 |
commit | a7fc802e9fcdad21377a8c4967a70ffc4c050014 (patch) | |
tree | c07b695cf2556ef72da3e51a857b0e8f8a6f2608 | |
parent | be238aae25d2a8a9eed9da382f8ba769beb87be5 (diff) |
QDoc: minor cleanup in Generator and Node
Generator:
* Don't sort container of QMap's keys as they're already sorted. The
container can thus be made const.
Node:
* Make getter const
* Remove qAsConst used in a ranged for loop in a const method.
Both:
* Remove qAsConst rendered superfluous.
Change-Id: I8f65f87c0ed372573cdd17f96e95cd2732effdd7
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r-- | src/qdoc/generator.cpp | 12 | ||||
-rw-r--r-- | src/qdoc/node.cpp | 6 | ||||
-rw-r--r-- | src/qdoc/node.h | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index 9f7e65205..e7088c610 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -205,10 +205,8 @@ int Generator::appendSortedNames(Text &text, const ClassNode *cn, const QList<Re ++r; } - QStringList classNames = classMap.keys(); - classNames.sort(); - - for (const auto &className : qAsConst(classNames)) { + const QStringList classNames = classMap.keys(); + for (const auto &className : classNames) { text << classMap[className]; text << comma(index++, classNames.count()); } @@ -229,10 +227,8 @@ int Generator::appendSortedQmlNames(Text &text, const Node *base, const NodeList } } - QStringList names = classMap.keys(); - names.sort(); - - for (const auto &name : qAsConst(names)) { + const QStringList names = classMap.keys(); + for (const auto &name : names) { text << classMap[name]; text << comma(index++, names.count()); } diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index f4bfcbc18..06f2d6bd6 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -2291,7 +2291,7 @@ const NodeList &Aggregate::nonfunctionList() */ const EnumNode *Aggregate::findEnumNodeForValue(const QString &enumValue) const { - for (const auto *node : qAsConst(enumChildren_)) { + for (const auto *node : enumChildren_) { const EnumNode *en = static_cast<const EnumNode *>(node); if (en->hasItem(enumValue)) return en; @@ -2699,9 +2699,9 @@ void Aggregate::findAllNamespaces(NodeMultiMap &namespaces) Returns true if this aggregate contains at least one child that is marked obsolete. Otherwise returns false. */ -bool Aggregate::hasObsoleteMembers() +bool Aggregate::hasObsoleteMembers() const { - for (const auto *node : qAsConst(children_)) { + for (const auto *node : children_) { if (!node->isPrivate() && node->isObsolete()) { if (node->isFunction() || node->isProperty() || node->isEnumType() || node->isTypedef() || node->isTypeAlias() || node->isVariable() || diff --git a/src/qdoc/node.h b/src/qdoc/node.h index 5530e1088..71a603146 100644 --- a/src/qdoc/node.h +++ b/src/qdoc/node.h @@ -485,7 +485,7 @@ public: void findAllFunctions(NodeMapMap &functionIndex); void findAllNamespaces(NodeMultiMap &namespaces); void findAllAttributions(NodeMultiMap &attributions); - bool hasObsoleteMembers(); + bool hasObsoleteMembers() const; void findAllObsoleteThings(); void findAllClasses(); void findAllSince(); |