Remove usage of deprecated API from the declarative plugins

Change-Id: Id2f9f936faf687ed51ab9adfca915711f1e65b9b
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>

1 files changed, 7 insertions, 5 deletions

diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp
index c191f37aa..b1420e0b1 100644
--- a/src/imports/organizer/qdeclarativeorganizermodel.cpp
+++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp
@@ -198,11 +198,6 @@ QDeclarativeOrganizerModel::QDeclarativeOrganizerModel(QObject *parent) :
     QAbstractListModel(parent),
     d_ptr(new QDeclarativeOrganizerModelPrivate)
 {
-    QHash<int, QByteArray> roleNames;
-    roleNames = QAbstractItemModel::roleNames();
-    roleNames.insert(OrganizerItemRole, "item");
-    setRoleNames(roleNames);
-
     d_ptr->m_updateTimer.setSingleShot(true);
     d_ptr->m_updateItemsTimer.setSingleShot(true);
     d_ptr->m_fetchCollectionsTimer.setSingleShot(true);
@@ -227,6 +222,13 @@ QDeclarativeOrganizerModel::~QDeclarativeOrganizerModel()
 {
 }
 
+QHash<int, QByteArray> QDeclarativeOrganizerModel::roleNames() const
+{
+    QHash<int, QByteArray> roleNames = QAbstractItemModel::roleNames();
+    roleNames.insert(OrganizerItemRole, "item");
+    return roleNames;
+}
+
 /*!
   \qmlproperty string OrganizerModel::manager