diff --git a/src/declarativeimports/calendar/daysmodel.h b/src/declarativeimports/calendar/daysmodel.h --- a/src/declarativeimports/calendar/daysmodel.h +++ b/src/declarativeimports/calendar/daysmodel.h @@ -54,6 +54,8 @@ Q_INVOKABLE QList eventsForDate(const QDate &date); + QHash roleNames() const Q_DECL_OVERRIDE; + Q_SIGNALS: void agendaUpdated(const QDate &updatedDate); diff --git a/src/declarativeimports/calendar/daysmodel.cpp b/src/declarativeimports/calendar/daysmodel.cpp --- a/src/declarativeimports/calendar/daysmodel.cpp +++ b/src/declarativeimports/calendar/daysmodel.cpp @@ -33,15 +33,7 @@ m_lastRequestedEventsStartDate(QDate()), m_agendaNeedsUpdate(false) { - QHash roleNames; - roleNames.insert(isCurrent, "isCurrent"); - roleNames.insert(containsEventItems, "containsEventItems"); - roleNames.insert(dayNumber, "dayNumber"); - roleNames.insert(monthNumber, "monthNumber"); - roleNames.insert(yearNumber, "yearNumber"); - - setRoleNames(roleNames); } DaysModel::~DaysModel() @@ -244,3 +236,14 @@ QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection); } + +QHash DaysModel::roleNames() const +{ + return { + {isCurrent, "isCurrent"}, + {containsEventItems, "containsEventItems"}, + {dayNumber, "dayNumber"}, + {monthNumber, "monthNumber"}, + {yearNumber, "yearNumber"} + }; +} diff --git a/src/plasmaquick/configmodel.h b/src/plasmaquick/configmodel.h --- a/src/plasmaquick/configmodel.h +++ b/src/plasmaquick/configmodel.h @@ -100,6 +100,7 @@ } int rowCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex &, int) const Q_DECL_OVERRIDE; + QHash roleNames() const Q_DECL_OVERRIDE; /** * @param row the row for which the data will be returned diff --git a/src/plasmaquick/configmodel.cpp b/src/plasmaquick/configmodel.cpp --- a/src/plasmaquick/configmodel.cpp +++ b/src/plasmaquick/configmodel.cpp @@ -175,15 +175,7 @@ : QAbstractListModel(parent), d(new ConfigModelPrivate(this)) { - QHash roleNames; - roleNames[NameRole] = "name"; - roleNames[IconRole] = "icon"; - roleNames[SourceRole] = "source"; - roleNames[PluginNameRole] = "pluginName"; - roleNames[VisibleRole] = "visible"; - roleNames[KCMRole] = "kcm"; - - setRoleNames(roleNames); + } ConfigModel::~ConfigModel() @@ -255,6 +247,18 @@ } } +QHash ConfigModel::roleNames() const +{ + return { + {NameRole, "name"}, + {IconRole, "icon"}, + {SourceRole, "source"}, + {PluginNameRole, "pluginName"}, + {VisibleRole, "visible"}, + {KCMRole, "kcm"}, + }; +} + QVariant ConfigModel::get(int row) const { return d->get(row);