on xenial help sign in
Don't store roles in Filters.
commit96ff3d1dbe0941d1aa9b84192741c82068eb1018 authorPawel Stolowski <pawel.stolowski@canonical.com> dateWed 14 Aug 2013, 16:23 (13 years ago) parent0431d60
2 files changed+9−11
plugins/Unity/filters.cpp+9−10 plugins/Unity/filters.h−1
plugins/Unity/filters.cpp+9−10
@@ -30,15 +30,6 @@
3030Filters::Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent) :
3131 QAbstractListModel(parent), m_unityFilters(unityFilters)
3232{
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−
4233 for (unsigned int i=0; i<m_unityFilters->count(); i++) {
4334 unity::dash::Filter::Ptr unityFilter = m_unityFilters->FilterAtIndex(i);
4435 addFilter(unityFilter, i);
@@ -94,7 +85,15 @@ QVariant Filters::data(const QModelIndex& index, int role) const
9485
9586QHash<int, QByteArray> Filters::roleNames() const
9687{
97− return m_roles;
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";
96+ return roles;
9897}
9998
10099Filter* Filters::getFilter(const QString& id) const
plugins/Unity/filters.h−1
@@ -69,7 +69,6 @@ private:
6969
7070 unity::dash::Filters::Ptr m_unityFilters;
7171 QList<Filter*> m_filters;
72− QHash<int, QByteArray> m_roles;
7372};
7473
7574Q_DECLARE_METATYPE(Filters*)