80c6878 · unity8 · git.iko.soy

git.iko.soy/unity8

Custom roles start from Qt::UserRole. Support Qt::DisplayRole.

commit80c68787453a721f5eb23ba9573c0d932dbab88c authorPawel Stolowski <pawel.stolowski@canonical.com> dateMon 12 Aug 2013, 17:53 (13 years ago) parent066af94

4 files changed+4−2

compare with xenial

unifiedsplit

plugins/Unity/filters.cpp+1 plugins/Unity/filters.h+1−1 plugins/Unity/genericoptionsmodel.cpp+1 plugins/Unity/genericoptionsmodel.h+1−1

plugins/Unity/filters.cpp+1

@@ -77,6 +77,7 @@ QVariant Filters::data(const QModelIndex& index, int role) const

7777 case Filters::RoleId:

7878 return filter->id();

7979 case Filters::RoleName:

80+ case Qt::DisplayRole:

8081 return filter->name();

8182 case Filters::RoleIconHint:

8283 return filter->iconHint();

plugins/Unity/filters.h+1−1

@@ -42,7 +42,7 @@ public:

4242 ~Filters();

4343

4444 enum Roles {

45− RoleId,

45+ RoleId = Qt::UserRole,

4646 RoleName,

4747 RoleIconHint,

4848 RoleRendererName,

plugins/Unity/genericoptionsmodel.cpp+1

@@ -62,6 +62,7 @@ QVariant GenericOptionsModel::data(const QModelIndex& index, int role) const

6262 case GenericOptionsModel::RoleId:

6363 return filterOption->id();

6464 case GenericOptionsModel::RoleName:

65+ case Qt::DisplayRole:

6566 return filterOption->name();

6667 case GenericOptionsModel::RoleIconHint:

6768 return filterOption->iconHint();

plugins/Unity/genericoptionsmodel.h+1−1