diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-02-15 13:43:37 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-02-17 16:17:50 +0000 |
| commit | 6f7a5b0ecfa6e0490cd7bed501860ad920c15178 (patch) | |
| tree | 410b99d0f2ceffbe87a62b6d2128439bb674a89a | |
| parent | 88e043a8bd1b49949777c90c75ff36314af7fe0f (diff) | |
QtSql: eradicate remaining Q_FOREACH loops
Change-Id: I86afe7104d506b840130517ae8066588fab2d745
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| -rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.cpp | 3 | ||||
| -rw-r--r-- | src/sql/kernel/qsqlresult.cpp | 4 | ||||
| -rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 1fff427a66..2a45b73d14 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -661,9 +661,8 @@ void QSQLiteDriver::close() { Q_D(QSQLiteDriver); if (isOpen()) { - foreach (QSQLiteResult *result, d->results) { + for (QSQLiteResult *result : qAsConst(d->results)) result->d_func()->finalize(); - } if (sqlite3_close(d->access) != SQLITE_OK) setLastError(qMakeError(d->access, tr("Error closing database"), diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp index 5e4c024480..f79c1c71cd 100644 --- a/src/sql/kernel/qsqlresult.cpp +++ b/src/sql/kernel/qsqlresult.cpp @@ -709,8 +709,8 @@ void QSqlResult::bindValue(const QString& placeholder, const QVariant& val, d->binds = NamedBinding; // if the index has already been set when doing emulated named // bindings - don't reset it - QList<int> indexes = d->indexes.value(placeholder); - foreach (int idx, indexes) { + const QList<int> indexes = d->indexes.value(placeholder); + for (int idx : indexes) { if (d->values.count() <= idx) d->values.resize(idx + 1); d->values[idx] = val; diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index 3612787fca..0bc86494f9 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -736,7 +736,8 @@ bool QSqlTableModel::submitAll() bool success = true; - foreach (int row, d->cache.keys()) { + const auto cachedKeys = d->cache.keys(); + for (int row : cachedKeys) { // be sure cache *still* contains the row since overridden selectRow() could have called select() QSqlTableModelPrivate::CacheMap::iterator it = d->cache.find(row); if (it == d->cache.end()) |