summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2010-02-05 12:13:49 (GMT)
committerZeno Albisser <zeno.albisser@nokia.com>2010-02-05 12:15:58 (GMT)
commit906f77bcfd4358f35155075b6d5fd8a383adadba (patch)
tree21c0fdd2db4d2772cfbfc840dd99bf5dfe284c4b
parentfcb431bfe807997b475b8b315e07fc7bd898ef61 (diff)
downloadQt-906f77bcfd4358f35155075b6d5fd8a383adadba.zip
Qt-906f77bcfd4358f35155075b6d5fd8a383adadba.tar.gz
Qt-906f77bcfd4358f35155075b6d5fd8a383adadba.tar.bz2
A fix for accidently reused variable names in nested iterations.
Reviewed-by: Peter Hartmann
-rw-r--r--src/corelib/codecs/qtextcodec.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 698ca9e..b63a82e 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -958,8 +958,8 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name)
if (nameMatch(cursor->name(), name))
return cursor;
QList<QByteArray> aliases = cursor->aliases();
- for (int i = 0; i < aliases.size(); ++i)
- if (nameMatch(aliases.at(i), name))
+ for (int y = 0; y < aliases.size(); ++y)
+ if (nameMatch(aliases.at(y), name))
return cursor;
}