QAbstractItemModel::setRoleNames is deprecated in favour of a virtual.

Based on https://codereview.qt-project.org/25219.

Change-Id: I31f51bb5e532e57fd29a42e2ee6520e5f28d4cb1
Reviewed-by: abcd <amos.choy@nokia.com>

1 files changed, 12 insertions, 8 deletions

diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
index 10f668d5..0f794edc 100644
--- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
@@ -141,14 +141,6 @@ QT_BEGIN_NAMESPACE
 QDeclarativeReviewModel::QDeclarativeReviewModel(QObject *parent)
 :   QDeclarativePlaceContentModel(QPlaceContent::ReviewType, parent)
 {
-    QHash<int, QByteArray> roles = roleNames();
-    roles.insert(DateTimeRole, "dateTime");
-    roles.insert(TextRole, "text");
-    roles.insert(LanguageRole, "language");
-    roles.insert(RatingRole, "rating");
-    roles.insert(ReviewIdRole, "reviewId");
-    roles.insert(TitleRole, "title");
-    setRoleNames(roles);
 }
 
 QDeclarativeReviewModel::~QDeclarativeReviewModel()
@@ -187,4 +179,16 @@ QVariant QDeclarativeReviewModel::data(const QModelIndex &index, int role) const
     return QDeclarativePlaceContentModel::data(index, role);
 }
 
+QHash<int, QByteArray> QDeclarativeReviewModel::roleNames() const
+{
+    QHash<int, QByteArray> roles = QDeclarativePlaceContentModel::roleNames();
+    roles.insert(DateTimeRole, "dateTime");
+    roles.insert(TextRole, "text");
+    roles.insert(LanguageRole, "language");
+    roles.insert(RatingRole, "rating");
+    roles.insert(ReviewIdRole, "reviewId");
+    roles.insert(TitleRole, "title");
+    return roles;
+}
+
 QT_END_NAMESPACE