git.iko.soy/unity8
on xenial help sign in
Don't keep roles hash, just create it on the fly in roleNames().
commit995ff083601f4100b0ac4e59274c5f1df6dbf465 authorPawel Stolowski <pawel.stolowski@canonical.com> dateWed 14 Aug 2013, 15:54 (13 years ago) parenta532274
2 files changed+9−17
compare with xenial
unifiedsplit
plugins/Unity/genericoptionsmodel.cpp+6−10 plugins/Unity/genericoptionsmodel.h+3−7
plugins/Unity/genericoptionsmodel.cpp+6−10
@@ -26,7 +26,6 @@
2626GenericOptionsModel::GenericOptionsModel(QObject *parent)
2727 : QAbstractListModel(parent)
2828{
29− setupRoles();
3029}
3130
3231GenericOptionsModel::~GenericOptionsModel()
@@ -37,17 +36,14 @@ GenericOptionsModel::~GenericOptionsModel()
3736 }
3837}
3938
40−void GenericOptionsModel::setupRoles()
41−{
42− m_roles[GenericOptionsModel::RoleId] = "id";
43− m_roles[GenericOptionsModel::RoleName] = "name";
44− m_roles[GenericOptionsModel::RoleIconHint] = "iconHint";
45− m_roles[GenericOptionsModel::RoleActive] = "active";
46−}
47−
4839QHash<int, QByteArray> GenericOptionsModel::roleNames() const
4940{
50− return m_roles;
41+ QHash<int, QByteArray> roles;
42+ roles[GenericOptionsModel::RoleId] = "id";
43+ roles[GenericOptionsModel::RoleName] = "name";
44+ roles[GenericOptionsModel::RoleIconHint] = "iconHint";
45+ roles[GenericOptionsModel::RoleActive] = "active";
46+ return roles;
5147}
5248
5349QVariant GenericOptionsModel::data(const QModelIndex& index, int role) const
plugins/Unity/genericoptionsmodel.h+3−7
@@ -34,9 +34,6 @@ class Q_DECL_EXPORT GenericOptionsModel : public QAbstractListModel
3434
3535 Q_ENUMS(Roles)
3636
37−Q_SIGNALS:
38− void activeChanged(AbstractFilterOption *option);
39−
4037public:
4138 GenericOptionsModel(QObject *parent = nullptr);
4239 ~GenericOptionsModel();
@@ -57,6 +54,9 @@ public:
5754public Q_SLOTS:
5855 virtual void ensureTheOnlyActive(AbstractFilterOption *activeOption);
5956
57+Q_SIGNALS:
58+ void activeChanged(AbstractFilterOption *option);
59+
6060protected Q_SLOTS:
6161 void onOptionChanged();
6262 void onActiveChanged();
@@ -67,10 +67,6 @@ protected:
6767 int indexOf(const QString &option_id);
6868
6969 QVector<AbstractFilterOption *> m_options;
70−
71−private:
72− void setupRoles();
73− QHash<int, QByteArray> m_roles;
7470};
7571
7672Q_DECLARE_METATYPE(GenericOptionsModel*)