alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make work both VariantMaps and QVariantHash

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1190034
This commit is contained in:
Marco Martin 2010-10-26 17:32:08 +00:00
parent 7ec308a228
commit a780189547
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
declarativeimports/core/datamodel.cpp
View File

@ -105,9 +105,17 @@ void DataModel::setItems(const QVariantList &list)
if (!list.isEmpty()) { if (!list.isEmpty()) {
int role = Qt::UserRole; int role = Qt::UserRole;
m_roleNames.clear(); m_roleNames.clear();
foreach (QString roleName, list.first().value<QVariantMap>().keys()) {
++role; if (list.first().canConvert<QVariantHash>()) {
m_roleNames[role] = roleName.toLatin1(); foreach (QString roleName, list.first().value<QVariantHash>().keys()) {
++role;
m_roleNames[role] = roleName.toLatin1();
}
} else {
foreach (QString roleName, list.first().value<QVariantMap>().keys()) {
++role;
m_roleNames[role] = roleName.toLatin1();
}
} }
setRoleNames(m_roleNames); setRoleNames(m_roleNames);
} }
@ -124,7 +132,11 @@ QVariant DataModel::data(const QModelIndex &index, int role) const
return QVariant(); return QVariant();
} }
return m_items.value(index.row()).value<QVariantMap>().value(m_roleNames.value(role)); if (m_items.value(index.row()).canConvert<QVariantHash>()) {
return m_items.value(index.row()).value<QVariantHash>().value(m_roleNames.value(role));
} else {
return m_items.value(index.row()).value<QVariantMap>().value(m_roleNames.value(role));
}
} }
QVariant DataModel::headerData(int section, Qt::Orientation orientation, int role) const QVariant DataModel::headerData(int section, Qt::Orientation orientation, int role) const