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, 7 insertions, 4 deletions

diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp
index 4e8ece13..6fd45038 100644
--- a/src/imports/location/qdeclarativegeocodemodel.cpp
+++ b/src/imports/location/qdeclarativegeocodemodel.cpp
@@ -121,10 +121,6 @@ QDeclarativeGeocodeModel::QDeclarativeGeocodeModel(QObject *parent)
       limit_(-1),
       offset_(0)
 {
-    QHash<int, QByteArray> roleNames;
-    roleNames = QAbstractItemModel::roleNames();
-    roleNames.insert(LocationRole, "locationData");
-    setRoleNames(roleNames);
 }
 
 QDeclarativeGeocodeModel::~QDeclarativeGeocodeModel()
@@ -275,6 +271,13 @@ QVariant QDeclarativeGeocodeModel::data(const QModelIndex &index, int role) cons
     return QVariant();
 }
 
+QHash<int, QByteArray> QDeclarativeGeocodeModel::roleNames() const
+{
+    QHash<int, QByteArray> roleNames = QAbstractItemModel::roleNames();
+    roleNames.insert(LocationRole, "locationData");
+    return roleNames;
+}
+
 /*!
     \internal
 */