diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-24 16:08:54 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-29 11:35:21 +0200 |
commit | 395f7579c004927f3ac3ac8a5e28817634bfc881 (patch) | |
tree | 1831813f6041abefd9807e08a0ba9a3f998ae31e /src/tools/qdoc/main.cpp | |
parent | 779e2f38eac4ef76ae8bcee9a990a534350625f1 (diff) |
Make qdoc compile with QT_STRICT_ITERATORS
Change-Id: I2923315678d1aef516b35a8c83fe734367723a28
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/main.cpp')
-rw-r--r-- | src/tools/qdoc/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index bb0aa7e811..34ef2135a2 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -209,8 +209,8 @@ static void processQdocconfFile(const QString &fileName) Load the language translators, if the configuration specifies any. */ QStringList fileNames = config.getStringList(CONFIG_TRANSLATORS); - QStringList::Iterator fn = fileNames.begin(); - while (fn != fileNames.end()) { + QStringList::Iterator fn = fileNames.constBegin(); + while (fn != fileNames.constEnd()) { QTranslator *translator = new QTranslator(0); if (!translator->load(*fn)) config.lastLocation().error(tr("Cannot load translator '%1'") @@ -331,8 +331,8 @@ static void processQdocconfFile(const QString &fileName) */ QSet<CodeParser *> usedParsers; - QSet<QString>::ConstIterator h = headers.begin(); - while (h != headers.end()) { + QSet<QString>::ConstIterator h = headers.constBegin(); + while (h != headers.constEnd()) { CodeParser *codeParser = CodeParser::parserForHeaderFile(*h); if (codeParser) { codeParser->parseHeaderFile(config.location(), *h, tree); @@ -349,8 +349,8 @@ static void processQdocconfFile(const QString &fileName) Parse each source text file in the set using the appropriate parser and add it to the big tree. */ - QSet<QString>::ConstIterator s = sources.begin(); - while (s != sources.end()) { + QSet<QString>::ConstIterator s = sources.constBegin(); + while (s != sources.constEnd()) { CodeParser *codeParser = CodeParser::parserForSourceFile(*s); if (codeParser) { codeParser->parseSourceFile(config.location(), *s, tree); @@ -378,8 +378,8 @@ static void processQdocconfFile(const QString &fileName) documentation output. More than one output format can be requested. The tree is traversed for each one. */ - QSet<QString>::ConstIterator of = outputFormats.begin(); - while (of != outputFormats.end()) { + QSet<QString>::ConstIterator of = outputFormats.constBegin(); + while (of != outputFormats.constEnd()) { Generator* generator = Generator::generatorForFormat(*of); if (generator == 0) outputFormatsLocation.fatal(tr("Unknown output format '%1'").arg(*of)); |