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/yyindent.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/yyindent.cpp')
| -rw-r--r-- | src/tools/qdoc/yyindent.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdoc/yyindent.cpp b/src/tools/qdoc/yyindent.cpp index 3f21ca41779..b3bfa34ed99 100644 --- a/src/tools/qdoc/yyindent.cpp +++ b/src/tools/qdoc/yyindent.cpp @@ -340,7 +340,7 @@ static bool readLine() ( firstNonWhiteSpace(yyLinizerState->line) == QChar('{') ); do { - if ( yyLinizerState->iter == yyProgram->begin() ) { + if ( yyLinizerState->iter == yyProgram->constBegin() ) { yyLinizerState->line.clear(); return false; } @@ -449,7 +449,7 @@ static void startLinizer() yyBraceDepth = &yyLinizerState->braceDepth; yyLeftBraceFollows = &yyLinizerState->leftBraceFollows; - yyLinizerState->iter = yyProgram->end(); + yyLinizerState->iter = yyProgram->constEnd(); --yyLinizerState->iter; yyLinizerState->line = *yyLinizerState->iter; readLine(); @@ -469,11 +469,11 @@ static bool bottomLineStartsInCComment() We could use the linizer here, but that would slow us down terribly. We are better to trim only the code lines we need. */ - QStringList::ConstIterator p = yyProgram->end(); + QStringList::ConstIterator p = yyProgram->constEnd(); --p; // skip bottom line for ( int i = 0; i < BigRoof; i++ ) { - if ( p == yyProgram->begin() ) + if ( p == yyProgram->constBegin() ) return false; --p; @@ -1162,8 +1162,8 @@ int main( int argc, char **argv ) while ( !program.isEmpty() && program.last().trimmed().isEmpty() ) program.remove( program.fromLast() ); - QStringList::ConstIterator line = program.begin(); - while ( line != program.end() ) { + QStringList::ConstIterator line = program.constBegin(); + while ( line != program.constEnd() ) { p.push_back( *line ); QChar typedIn = firstNonWhiteSpace( *line ); if ( p.last().endsWith(QLatin1Char(':')) ) |