QAbstractItemModel::setRoleNames is not necessary.

We have a proper virtual in Qt 5 now, so use it.

Change-Id: Ieff72a7cb6feb17282f600d8d21e3f4fbe1914a4
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

3 files changed, 11 insertions, 7 deletions

diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
index 6f5ddee6..a5d1907a 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
@@ -155,11 +155,6 @@ public:
 QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    QHash<int, QByteArray> roles;
-    roles[FileNameRole] = "fileName";
-    roles[FilePathRole] = "filePath";
-    setRoleNames(roles);
-
     d = new QDeclarativeFolderListModelPrivate;
     d->model.setFilter(QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot);
     connect(&d->model, SIGNAL(rowsInserted(const QModelIndex&,int,int))
@@ -190,6 +185,14 @@ QVariant QDeclarativeFolderListModel::data(const QModelIndex &index, int role) c
     return rv;
 }
 
+QHash<int, QByteArray> QDeclarativeFolderListModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[FileNameRole] = "fileName";
+    roles[FilePathRole] = "filePath";
+    return roles;
+}
+
 /*!
     \qmlproperty int FolderListModel::count
 
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
index e15d717b..79a3d387 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
@@ -88,6 +88,7 @@ public:
 
     int rowCount(const QModelIndex &parent) const;
     QVariant data(const QModelIndex &index, int role) const;
+    QHash<int,QByteArray> roleNames() const;
 //![abslistmodel]
 
 //![count]
diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp
index ae44b312..140b576d 100644
--- a/src/imports/shaders/shadereffectitem.cpp
+++ b/src/imports/shaders/shadereffectitem.cpp
@@ -733,12 +733,12 @@ void ShaderEffectItem::setSource(const QVariant &var, int index)
     source.item = 0;
     if (var.isNull()) {
         return;
-    } else if (!qVariantCanConvert<QObject *>(var)) {
+    } else if (!var.canConvert<QObject *>()) {
         qWarning("Could not assign source of type '%s' to property '%s'.", var.typeName(), source.name.constData());
         return;
     }
 
-    QObject *obj = qVariantValue<QObject *>(var);
+    QObject *obj = var.value<QObject *>();
 
     source.source = qobject_cast<ShaderEffectSource *>(obj);
     source.item = qobject_cast<QDeclarativeItem *>(obj);