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

dataengine based models set their roles when setting the data, so respond to that

Browse Source 
syncRoleNames is fast (and faster now that we check that the role names actually changed)
but it may be nicer to find a more efficient way in future than checking the role names
on all / any data changes. in fact, the documentation for QAbstractItemModel::setRoleNames says:

"This function must be called before the model is used.
 Modifying the role names after the model has been set may result in undefined behaviour."

BUG:308101
This commit is contained in:
Aaron Seigo 2012-10-09 11:17:03 +02:00
parent a518f3bb6e
commit 19a7d82ed9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
declarativeimports/core/datamodel.cpp
View File

@ -38,6 +38,7 @@ SortFilterModel::SortFilterModel(QObject* parent)
this, SIGNAL(countChanged()));
connect(this, SIGNAL(modelReset()),
this, SIGNAL(countChanged()));
connect(this, SIGNAL(countChanged()), this, SLOT(syncRoleNames()));
}
SortFilterModel::~SortFilterModel()
@ -46,6 +47,10 @@ SortFilterModel::~SortFilterModel()
void SortFilterModel::syncRoleNames()
{
if (!sourceModel() || sourceModel()->roleNames() == roleNames()) {
return;
}
m_roleIds.clear();
setRoleNames(sourceModel()->roleNames());
@ -85,9 +90,6 @@ void SortFilterModel::setModel(QAbstractItemModel* model)
emit sourceModelChanged(model);
}
void SortFilterModel::setFilterRegExp(const QString &exp)
{
if (exp == filterRegExp()) {
@ -366,8 +368,6 @@ void DataModel::setItems(const QString &sourceName, const QVariantList &list)
}
}
}
setRoleNames(m_roleNames);
}
setRoleNames(m_roleNames);