diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-24 16:43:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-25 21:46:55 +0200 |
| commit | 7c1e0fef8e35ecd8487c41dc39e7ce46537f3040 (patch) | |
| tree | 18107ad0061b0d19360f07e79bf19551e404c523 /src/gui/text | |
| parent | 57f243594e83708f2daa8147901cbea965e5c295 (diff) | |
Gestures & events: compile with QT_STRICT_ITERATORS.
There are a few mixed up iterators that needed cleaning up. We're
missing a constUpperBound and constLowerBound function, though...
This commit sneaks in one change to qtextformat related to
QT_STRICT_ITERATORS but not to gestures and events.
Change-Id: I8c7c840fb5f46c790adbf52952c6009c5b5f2f43
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextformat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 6d9eeab660..9995110c1d 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -3296,8 +3296,8 @@ QTextFormatCollection::~QTextFormatCollection() int QTextFormatCollection::indexForFormat(const QTextFormat &format) { uint hash = getHash(format.d, format.format_type); - QMultiHash<uint, int>::const_iterator i = hashes.find(hash); - while (i != hashes.end() && i.key() == hash) { + QMultiHash<uint, int>::const_iterator i = hashes.constFind(hash); + while (i != hashes.constEnd() && i.key() == hash) { if (formats.value(i.value()) == format) { return i.value(); } |