diff options
author | Kimmo Kotajärvi <kimmo.kotajarvi@nomovok.com> | 2010-08-05 16:04:47 (GMT) |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2010-10-29 13:43:25 (GMT) |
commit | 3a34507e5d693d0b92cb50637a9ffb7fb20e6665 (patch) | |
tree | 9784d132620a00f21b5d314a662e5077d524eaa2 | |
parent | af14368e0b259b1ac5a068a90695a6038af667e6 (diff) | |
download | Qt-3a34507e5d693d0b92cb50637a9ffb7fb20e6665.zip Qt-3a34507e5d693d0b92cb50637a9ffb7fb20e6665.tar.gz Qt-3a34507e5d693d0b92cb50637a9ffb7fb20e6665.tar.bz2 |
Fixed a shadow warning when including QtSql.
Merge-request: 766
Reviewed-by: Frederik
-rw-r--r-- | src/sql/models/qsqlrelationaldelegate.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index 7600e52..96760e1 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -59,23 +59,23 @@ class QSqlRelationalDelegate: public QItemDelegate { public: -explicit QSqlRelationalDelegate(QObject *parent = 0) - : QItemDelegate(parent) +explicit QSqlRelationalDelegate(QObject *aParent = 0) + : QItemDelegate(aParent) {} ~QSqlRelationalDelegate() {} -QWidget *createEditor(QWidget *parent, +QWidget *createEditor(QWidget *aParent, const QStyleOptionViewItem &option, const QModelIndex &index) const { const QSqlRelationalTableModel *sqlModel = qobject_cast<const QSqlRelationalTableModel *>(index.model()); QSqlTableModel *childModel = sqlModel ? sqlModel->relationModel(index.column()) : 0; if (!childModel) - return QItemDelegate::createEditor(parent, option, index); + return QItemDelegate::createEditor(aParent, option, index); - QComboBox *combo = new QComboBox(parent); + QComboBox *combo = new QComboBox(aParent); combo->setModel(childModel); combo->setModelColumn(childModel->fieldIndex(sqlModel->relation(index.column()).displayColumn())); combo->installEventFilter(const_cast<QSqlRelationalDelegate *>(this)); |