diff options
-rw-r--r-- | src/qdoc/htmlgenerator.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/main.cpp | 32 | ||||
-rw-r--r-- | 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<QString,QString> headers; - QMultiMap<QString,QString> headerFileNames; - for (int i=0; i<headerList.size(); ++i) { + headerList = config.getAllFiles(CONFIG_HEADERS,CONFIG_HEADERDIRS, excludedDirs, excludedFiles); + QMap<QString, QString> headers; + QMultiMap<QString, QString> 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<QString,QString> sources; - QMultiMap<QString,QString> sourceFileNames; - for (int i=0; i<sourceList.size(); ++i) { + sourceList = config.getAllFiles(CONFIG_SOURCES,CONFIG_SOURCEDIRS, excludedDirs, excludedFiles); + QMap<QString, QString> sources; + QMultiMap<QString, QString> 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<exampleQdocList.size(); ++i) { + for (int i = 0; i < exampleQdocList.size(); ++i) { if (!sources.contains(exampleQdocList[i])) { - sources.insert(exampleQdocList[i],exampleQdocList[i]); - QString t = exampleQdocList[i].mid(exampleQdocList[i].lastIndexOf('/')+1); - sourceFileNames.insert(t,t); + sources.insert(exampleQdocList[i], exampleQdocList[i]); + QString t = exampleQdocList[i].mid(exampleQdocList[i].lastIndexOf('/') + 1); + sourceFileNames.insert(t, t); } } /* diff --git a/src/qdoc/qdocdatabase.cpp b/src/qdoc/qdocdatabase.cpp index 36491fc8f..5c4acdbf1 100644 --- a/src/qdoc/qdocdatabase.cpp +++ b/src/qdoc/qdocdatabase.cpp @@ -175,9 +175,9 @@ void QDocForest::setSearchOrder(const QStringList &t) return; /* Allocate space for the search order. */ - searchOrder_.reserve(forest_.size()+1); + searchOrder_.reserve(forest_.size() + 1); searchOrder_.clear(); - moduleNames_.reserve(forest_.size()+1); + moduleNames_.reserve(forest_.size() + 1); moduleNames_.clear(); /* The primary tree is always first in the search order. */ |