diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-03 15:04:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-07 06:42:19 +0200 |
| commit | c3f9f982c2bdecf742e1aeae273755e0e95ad39d (patch) | |
| tree | 7d24fbf8f039f031acc6d0ac0053d5abff483e4e /examples | |
| parent | bac91185a71c2109e28ada138031890fc15e1105 (diff) | |
QAbstractItemModel::setRoleNames is not necessary.
We have a proper virtual in Qt 5 now, so use it.
Change-Id: Ieff72a7cb6feb17282f600d8d21e3f4fbe1914a4
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/modelviews/abstractitemmodel/model.cpp | 12 | ||||
| -rw-r--r-- | examples/declarative/modelviews/abstractitemmodel/model.h | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/examples/declarative/modelviews/abstractitemmodel/model.cpp b/examples/declarative/modelviews/abstractitemmodel/model.cpp index dd103d26..0684ff63 100644 --- a/examples/declarative/modelviews/abstractitemmodel/model.cpp +++ b/examples/declarative/modelviews/abstractitemmodel/model.cpp @@ -58,10 +58,6 @@ QString Animal::size() const AnimalModel::AnimalModel(QObject *parent) : QAbstractListModel(parent) { - QHash<int, QByteArray> roles; - roles[TypeRole] = "type"; - roles[SizeRole] = "size"; - setRoleNames(roles); } //![0] @@ -88,3 +84,11 @@ QVariant AnimalModel::data(const QModelIndex & index, int role) const { return QVariant(); } +QHash<int, QByteArray> AnimalModel::roleNames() const +{ + QHash<int, QByteArray> roles; + roles[TypeRole] = "type"; + roles[SizeRole] = "size"; + return roles; +} + diff --git a/examples/declarative/modelviews/abstractitemmodel/model.h b/examples/declarative/modelviews/abstractitemmodel/model.h index 1378c448..82c1c651 100644 --- a/examples/declarative/modelviews/abstractitemmodel/model.h +++ b/examples/declarative/modelviews/abstractitemmodel/model.h @@ -74,6 +74,8 @@ public: QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const; + QHash<int,QByteArray> roleNames() const; + private: QList<Animal> m_animals; //![2] |