From c2f26d6d0b70e591c74bf6664e30288a2d63dc9a Mon Sep 17 00:00:00 2001
From: Maks Naumov <maksqwe1@ukr.net>
Date: Sat, 7 Feb 2015 12:10:41 +0200
Subject: Use prefix instead of postfix for iterators

The postfix increment(decrement) creates a temp copy of *this before the
modification and then returns that copy. It's needed only when using the
old iterator and then incrementing it.

Change-Id: I7f6702de78f5f987cec3556047e76049b4ee063a
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/gui/text/qfontdatabase.cpp           | 2 +-
 src/gui/text/qfontengine.cpp             | 2 +-
 src/gui/text/qtextodfwriter.cpp          | 2 +-
 src/network/access/qnetworkcookiejar.cpp | 3 ++-
 src/network/ssl/qsslkey_p.cpp            | 4 ++--
 src/sql/models/qsqltablemodel.cpp        | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 3fc23513d7..8dbd78cd57 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -781,7 +781,7 @@ static QStringList fallbackFamilies(const QString &family, QFont::Style style, Q
         }
         if (!contains) {
             i = retList.erase(i);
-            i--;
+            --i;
         }
     }
     return retList;
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index e686c9fe81..98ab78f0dc 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -2084,7 +2084,7 @@ QFontEngine *QFontEngineMulti::createMultiFontEngine(QFontEngine *fe, int script
             fc->updateHitCountAndTimeStamp(it.value());
             break;
         }
-        it++;
+        ++it;
     }
     if (!engine) {
         engine = QGuiApplicationPrivate::instance()->platformIntegration()->fontDatabase()->fontEngineMulti(fe, QChar::Script(script));
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 2c61d2cfd4..25e9bf1a56 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -278,7 +278,7 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
     writer.writeStartElement(textNS, QString::fromLatin1("p"));
     writer.writeAttribute(textNS, QString::fromLatin1("style-name"), QString::fromLatin1("p%1")
         .arg(block.blockFormatIndex()));
-    for (QTextBlock::Iterator frag= block.begin(); !frag.atEnd(); frag++) {
+    for (QTextBlock::Iterator frag = block.begin(); !frag.atEnd(); ++frag) {
         writer.writeCharacters(QString()); // Trick to make sure that the span gets no linefeed in front of it.
         writer.writeStartElement(textNS, QString::fromLatin1("span"));
 
diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp
index d3e6f7b1c8..96f6006c09 100644
--- a/src/network/access/qnetworkcookiejar.cpp
+++ b/src/network/access/qnetworkcookiejar.cpp
@@ -307,11 +307,12 @@ bool QNetworkCookieJar::deleteCookie(const QNetworkCookie &cookie)
 {
     Q_D(QNetworkCookieJar);
     QList<QNetworkCookie>::Iterator it;
-    for (it = d->allCookies.begin(); it != d->allCookies.end(); it++)
+    for (it = d->allCookies.begin(); it != d->allCookies.end(); ++it) {
         if (it->hasSameIdentifier(cookie)) {
             d->allCookies.erase(it);
             return true;
         }
+    }
     return false;
 }
 
diff --git a/src/network/ssl/qsslkey_p.cpp b/src/network/ssl/qsslkey_p.cpp
index 99d502e8f9..350a7f2efc 100644
--- a/src/network/ssl/qsslkey_p.cpp
+++ b/src/network/ssl/qsslkey_p.cpp
@@ -153,8 +153,8 @@ QByteArray QSslKeyPrivate::pemFromDer(const QByteArray &der, const QMap<QByteArr
     if (!headers.isEmpty()) {
         QMap<QByteArray, QByteArray>::const_iterator it = headers.constEnd();
         do {
-            it--;
-                extra += it.key() + ": " + it.value() + '\n';
+            --it;
+            extra += it.key() + ": " + it.value() + '\n';
         } while (it != headers.constBegin());
         extra += '\n';
     }
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index e0e700cd01..faecad3771 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -501,9 +501,10 @@ bool QSqlTableModel::isDirty() const
     Q_D(const QSqlTableModel);
     QSqlTableModelPrivate::CacheMap::ConstIterator i = d->cache.constBegin();
     const QSqlTableModelPrivate::CacheMap::ConstIterator e = d->cache.constEnd();
-    for (; i != e; i++)
+    for (; i != e; ++i) {
         if (!i.value().submitted())
             return true;
+    }
     return false;
 }
 
-- 
cgit v1.2.3