From 3d763dc83adce6fc270c17933fd66ae5c539517c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 15 Feb 2012 01:31:07 +0100 Subject: QSqlTableModel: rename parameter to avoid name clash with method Change-Id: Ib8fa6b0ca71ffdd9f1f8416c448b5c830988ed08 Reviewed-by: Robin Burchell --- src/sql/models/qsqltablemodel.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index 0cb7c3921b..c895c39212 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -1221,7 +1221,7 @@ Qt::ItemFlags QSqlTableModel::flags(const QModelIndex &index) const \sa record(), editStrategy() */ -bool QSqlTableModel::setRecord(int row, const QSqlRecord &record) +bool QSqlTableModel::setRecord(int row, const QSqlRecord &values) { Q_D(QSqlTableModel); Q_ASSERT_X(row >= 0, "QSqlTableModel::setRecord()", "Cannot set a record to a row less than 0"); @@ -1239,9 +1239,9 @@ bool QSqlTableModel::setRecord(int row, const QSqlRecord &record) // Check field names and remember mapping typedef QMap Map; Map map; - for (int i = 0; i < record.count(); ++i) { - if (record.isGenerated(i)) { - int idx = d->nameToIndex(record.fieldName(i)); + for (int i = 0; i < values.count(); ++i) { + if (values.isGenerated(i)) { + int idx = d->nameToIndex(values.fieldName(i)); if (idx == -1) return false; map[i] = idx; @@ -1256,7 +1256,7 @@ bool QSqlTableModel::setRecord(int row, const QSqlRecord &record) Map::const_iterator i = map.constBegin(); const Map::const_iterator e = map.constEnd(); for ( ; i != e; ++i) - mrow.setValue(i.value(), record.value(i.key())); + mrow.setValue(i.value(), values.value(i.key())); if (columnCount()) emit dataChanged(createIndex(row, 0), createIndex(row, columnCount() - 1)); -- cgit v1.2.3