summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-04-22 14:57:45 +0200
committerPaul Wicking <paul.wicking@qt.io>2020-05-04 14:42:28 +0200
commit386c392ac0e0692946ba00c3f61ef3d191188d6c (patch)
treef32eacf28c330fd57430811f03b29a8a1608773c /src
parent33a846a4d36ec339f8ddea08641ec02f2723a202 (diff)
downloadqttools-386c392ac0e0692946ba00c3f61ef3d191188d6c.tar.gz
QDoc: Cleanup in htmlgenerator (refactoring)
Remove duplicate public keyword from header. Prefer ranged for loop. Task-number: QTBUG-71176 Pick-to: 5.15 Change-Id: Ic223dd36bf510272d94cda80338dd39e835b9f15 Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qdoc/htmlgenerator.cpp8
-rw-r--r--src/qdoc/htmlgenerator.h1
2 files changed, 4 insertions, 5 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index a10784ed8..ce0c91da5 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -3771,8 +3771,8 @@ void HtmlGenerator::generateManifestFile(const QString &manifest, const QString
QString fullName = project + QLatin1Char('/') + en->title();
QSet<QString> tags;
- for (int idx = 0; idx < manifestMetaContent.size(); ++idx) {
- const auto names = manifestMetaContent[idx].names;
+ for (const auto &index : manifestMetaContent) {
+ const auto &names = index.names;
for (const QString &name : names) {
bool match = false;
int wildcard = name.indexOf(QChar('*'));
@@ -3787,8 +3787,8 @@ void HtmlGenerator::generateManifestFile(const QString &manifest, const QString
match = fullName.startsWith(name.left(wildcard));
}
if (match) {
- tags += manifestMetaContent[idx].tags;
- const auto attributes = manifestMetaContent[idx].attributes;
+ tags += index.tags;
+ const auto attributes = index.attributes;
for (const QString &attr : attributes) {
QLatin1Char div(':');
QStringList attrList = attr.split(div);
diff --git a/src/qdoc/htmlgenerator.h b/src/qdoc/htmlgenerator.h
index b533ec13f..045def00d 100644
--- a/src/qdoc/htmlgenerator.h
+++ b/src/qdoc/htmlgenerator.h
@@ -50,7 +50,6 @@ class HtmlGenerator : public XmlGenerator
Q_DECLARE_TR_FUNCTIONS(QDoc::HtmlGenerator)
public:
-public:
HtmlGenerator();
~HtmlGenerator() override;