1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce cost of checking cache for data() and headerData()

Browse Source 
Assume requested row is usually not cached.

Change-Id: I7727b431cc3841528aa6390400b93b1218773e65
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
This commit is contained in:
Mark Brand 2011-07-05 17:27:54 +02:00 committed by Qt by Nokia
parent e5c8927fe8
commit 60f24ec608
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/models/qsqltablemodel.cpp
View File

@ -382,6 +382,8 @@ QVariant QSqlTableModel::data(const QModelIndex &index, int role) const
// and indexInQuery is not virtual (grrr) so any values we pass to QSQM need // and indexInQuery is not virtual (grrr) so any values we pass to QSQM need
// to handle the insertedRows // to handle the insertedRows
QModelIndex item = indexInQuery(index); QModelIndex item = indexInQuery(index);
if (d->cache.contains(index.row())) {
const QSqlTableModelPrivate::ModifiedRow row = d->cache.value(index.row()); const QSqlTableModelPrivate::ModifiedRow row = d->cache.value(index.row());
switch (d->strategy) { switch (d->strategy) {
@ -403,6 +405,7 @@ QVariant QSqlTableModel::data(const QModelIndex &index, int role) const
return row.rec.value(item.column()); return row.rec.value(item.column());
break; break;
} }
}
// We need to handle row mapping here, but not column mapping // We need to handle row mapping here, but not column mapping
return QSqlQueryModel::data(index.sibling(item.row(), index.column()), role); return QSqlQueryModel::data(index.sibling(item.row(), index.column()), role);
@ -415,12 +418,14 @@ QVariant QSqlTableModel::headerData(int section, Qt::Orientation orientation, in
{ {
Q_D(const QSqlTableModel); Q_D(const QSqlTableModel);
if (orientation == Qt::Vertical && role == Qt::DisplayRole) { if (orientation == Qt::Vertical && role == Qt::DisplayRole) {
if (d->cache.contains(section)) {
const QSqlTableModelPrivate::Op op = d->cache.value(section).op; const QSqlTableModelPrivate::Op op = d->cache.value(section).op;
if (op == QSqlTableModelPrivate::Insert) if (op == QSqlTableModelPrivate::Insert)
return QLatin1String("*"); return QLatin1String("*");
else if (op == QSqlTableModelPrivate::Delete) else if (op == QSqlTableModelPrivate::Delete)
return QLatin1String("!"); return QLatin1String("!");
} }
}
return QSqlQueryModel::headerData(section, orientation, role); return QSqlQueryModel::headerData(section, orientation, role);
} }