diff options
author | Paul Wicking <paul.wicking@qt.io> | 2019-12-09 15:41:21 +0100 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2019-12-10 20:00:19 +0100 |
commit | 88b135fb74689484dfa60ee0efd378d85a9f0a75 (patch) | |
tree | 930407fc75bfd899ccdbfcdcc25b766da52f4eac | |
parent | 824eae53c83f3e7eb13c589571d493675d6d0594 (diff) | |
download | qttools-88b135fb74689484dfa60ee0efd378d85a9f0a75.tar.gz |
QDoc: Get rid of out-parameter
Change-Id: Ifbd739510abd5bec4cc2b4fbac9b6667d9ae9281
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r-- | src/qdoc/generator.cpp | 3 | ||||
-rw-r--r-- | src/qdoc/parameters.cpp | 4 | ||||
-rw-r--r-- | src/qdoc/parameters.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index f68fcf394..82d7c0127 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -918,8 +918,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker) } } else if (node->isFunction()) { const FunctionNode *fn = static_cast<const FunctionNode *>(node); - QSet<QString> declaredNames; - fn->parameters().getNames(declaredNames); + const QSet<QString> declaredNames = fn->parameters().getNames(); QSet<QString> documentedNames = fn->doc().parameterNames(); if (declaredNames != documentedNames) { QSet<QString>::const_iterator i = declaredNames.constBegin(); diff --git a/src/qdoc/parameters.cpp b/src/qdoc/parameters.cpp index 6ed5e8250..96a591a2a 100644 --- a/src/qdoc/parameters.cpp +++ b/src/qdoc/parameters.cpp @@ -507,13 +507,15 @@ void Parameters::set(const QString &signature) /*! Insert all the parameter names into names. */ -void Parameters::getNames(QSet<QString> &names) const +QSet<QString> Parameters::getNames() const { + QSet<QString> names; const auto params = parameters_; for (const auto ¶meter : params) { if (!parameter.name().isEmpty()) names.insert(parameter.name()); } + return names; } /*! diff --git a/src/qdoc/parameters.h b/src/qdoc/parameters.h index 9ab3db5e2..7e72d1689 100644 --- a/src/qdoc/parameters.h +++ b/src/qdoc/parameters.h @@ -97,7 +97,7 @@ public: QString signature(bool includeValues = false) const; QString rawSignature(bool names = false, bool values = false) const; void set(const QString &signature); - void getNames(QSet<QString> &names) const; + QSet<QString> getNames() const; QString generateTypeList() const; QString generateTypeAndNameList() const; bool match(const Parameters ¶meters) const; |