git.iko.soy/unity8
on xenial help sign in
Don't store roles in Filters.
96ff3d1Pawel Stolowski
plugins/Unity/filters.cpp+9−10
compare with xenial
unifiedsplit
@@ -30,15 +30,6 @@
30Filters::Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent) :
30Filters::Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent) :
31 QAbstractListModel(parent), m_unityFilters(unityFilters)
31 QAbstractListModel(parent), m_unityFilters(unityFilters)
32{
32{
33− // setup roles
34− m_roles[Filters::RoleId] = "id";
35− m_roles[Filters::RoleName] = "name";
36− m_roles[Filters::RoleIconHint] = "iconHint";
37− m_roles[Filters::RoleRendererName] = "rendererName";
38− m_roles[Filters::RoleVisible] = "visible";
39− m_roles[Filters::RoleCollapsed] = "collapsed";
40− m_roles[Filters::RoleFiltering] = "filtering";
41−
42 for (unsigned int i=0; i<m_unityFilters->count(); i++) {
33 for (unsigned int i=0; i<m_unityFilters->count(); i++) {
43 unity::dash::Filter::Ptr unityFilter = m_unityFilters->FilterAtIndex(i);
34 unity::dash::Filter::Ptr unityFilter = m_unityFilters->FilterAtIndex(i);
44 addFilter(unityFilter, i);
35 addFilter(unityFilter, i);
@@ -94,7 +85,15 @@ QVariant Filters::data(const QModelIndex& index, int role) const
94
85
95QHash<int, QByteArray> Filters::roleNames() const
86QHash<int, QByteArray> Filters::roleNames() const
96{
87{
88+ QHash<int, QByteArray> roles;
89+ roles[Filters::RoleId] = "id";
90+ roles[Filters::RoleName] = "name";
91+ roles[Filters::RoleIconHint] = "iconHint";
92+ roles[Filters::RoleRendererName] = "rendererName";
93+ roles[Filters::RoleVisible] = "visible";
94+ roles[Filters::RoleCollapsed] = "collapsed";
95+ roles[Filters::RoleFiltering] = "filtering";
97− return m_roles;
96+ return roles;
98}
97}
99
98
100Filter* Filters::getFilter(const QString& id) const
99Filter* Filters::getFilter(const QString& id) const
plugins/Unity/filters.h−1
@@ -69,7 +69,6 @@ private:
69
69
70 unity::dash::Filters::Ptr m_unityFilters;
70 unity::dash::Filters::Ptr m_unityFilters;
71 QList<Filter*> m_filters;
71 QList<Filter*> m_filters;
72− QHash<int, QByteArray> m_roles;
73};
72};
74
73
75Q_DECLARE_METATYPE(Filters*)
74Q_DECLARE_METATYPE(Filters*)