From 7c0f505a3f86fd78e76018baa01626b043e43d87 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 2 Dec 2019 18:17:57 +0100 Subject: QDoc: Clean up whitespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix minor whitespace issues accodring to style. Change-Id: Ie56e815f23f25ccb1b2ffb03780b9e4c6b9d25eb Reviewed-by: Topi Reiniƶ --- src/qdoc/htmlgenerator.cpp | 2 +- src/qdoc/main.cpp | 32 ++++++++++++++++---------------- src/qdoc/qdocdatabase.cpp | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 67e82f089..ac3a3d041 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -815,7 +815,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark Node *parent = (*member).parent(); pmap = parentmaps.find(parent); if (pmap == parentmaps.end()) - pmap = parentmaps.insert(parent,NodeMultiMap()); + pmap = parentmaps.insert(parent, NodeMultiMap()); pmap->insert(member->name(), member); } for (auto map = parentmaps.begin(); map != parentmaps.end(); ++map) { diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp index 73289986c..e8f03e559 100644 --- a/src/qdoc/main.cpp +++ b/src/qdoc/main.cpp @@ -404,31 +404,31 @@ static void processQdocconfFile(const QString &fileName, Config &config) QStringList sourceList; qCDebug(lcQdoc, "Reading headerdirs"); - headerList = config.getAllFiles(CONFIG_HEADERS,CONFIG_HEADERDIRS,excludedDirs,excludedFiles); - QMap headers; - QMultiMap headerFileNames; - for (int i=0; i headers; + QMultiMap headerFileNames; + for (int i = 0; i < headerList.size(); ++i) { if (headerList[i].contains(QString("doc/snippets"))) continue; if (headers.contains(headerList[i])) continue; headers.insert(headerList[i],headerList[i]); QString t = headerList[i].mid(headerList[i].lastIndexOf('/')+1); - headerFileNames.insert(t,t); + headerFileNames.insert(t, t); } qCDebug(lcQdoc, "Reading sourcedirs"); - sourceList = config.getAllFiles(CONFIG_SOURCES,CONFIG_SOURCEDIRS,excludedDirs,excludedFiles); - QMap sources; - QMultiMap sourceFileNames; - for (int i=0; i sources; + QMultiMap sourceFileNames; + for (int i = 0; i < sourceList.size(); ++i) { if (sourceList[i].contains(QString("doc/snippets"))) continue; if (sources.contains(sourceList[i])) continue; - sources.insert(sourceList[i],sourceList[i]); - QString t = sourceList[i].mid(sourceList[i].lastIndexOf('/')+1); - sourceFileNames.insert(t,t); + sources.insert(sourceList[i], sourceList[i]); + QString t = sourceList[i].mid(sourceList[i].lastIndexOf('/') + 1); + sourceFileNames.insert(t, t); } /* Find all the qdoc files in the example dirs, and add @@ -436,11 +436,11 @@ static void processQdocconfFile(const QString &fileName, Config &config) */ qCDebug(lcQdoc, "Reading exampledirs"); QStringList exampleQdocList = config.getExampleQdocFiles(excludedDirs, excludedFiles); - for (int i=0; i