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

actually sync the roles and only sort when we have an actual model already

Browse Source
This commit is contained in:
Aaron Seigo 2012-10-08 14:15:53 +02:00
parent cbd6bc5758
commit 4e78f327bb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
declarativeimports/core/datamodel.cpp
View File

@ -78,6 +78,7 @@ void SortFilterModel::setModel(QAbstractItemModel* model)
connect(model, SIGNAL(modelReset()), this, SLOT(syncRoleNames())); connect(model, SIGNAL(modelReset()), this, SLOT(syncRoleNames()));
} }
QSortFilterProxyModel::setSourceModel(model); QSortFilterProxyModel::setSourceModel(model);
syncRoleNames();
sourceModelChanged(model); sourceModelChanged(model);
} }
@ -114,7 +115,7 @@ void SortFilterModel::setSortRole(const QString &role)
m_sortRole = role; m_sortRole = role;
if (role.isEmpty()) { if (role.isEmpty()) {
sort(-1, Qt::AscendingOrder); sort(-1, Qt::AscendingOrder);
} else { } else if (sourceModel()) {
QSortFilterProxyModel::setSortRole(roleNameToId(role)); QSortFilterProxyModel::setSortRole(roleNameToId(role));
sort(0, sortOrder()); sort(0, sortOrder());
} }