API updatesHEADmaster

This project was developed before the release of Qt 5.0, so some
of the APIs had to be updated in order to build again.

Change-Id: I579d7170ea0d80bd33aee29ec807461af603b0d3
Reviewed-by: Anselmo L. S. Melo <[email protected]>

1 files changed, 12 insertions, 10 deletions

diff --git a/src/models/uiproxyqmlmodel.cpp b/src/models/uiproxyqmlmodel.cpp
index 47f079c..37e6f55 100644
--- a/src/models/uiproxyqmlmodel.cpp
+++ b/src/models/uiproxyqmlmodel.cpp
@@ -42,7 +42,8 @@
 #ifndef QT_NO_PROXYQMLMODEL
 
 #include "uiproxyqmlmodel.h"
-#include <QtQml/private/qquicklistmodel_p.h>
+#include <QtQml/qqmlprivate.h>
+#include <QtQml/private/qqmllistmodel_p.h>
 
 QT_BEGIN_NAMESPACE_UIHELPERS
 
@@ -58,7 +59,7 @@ UiProxyQmlModel::ListType UiProxyQmlModel::updateSource(const QVariant &sourceMo
     if (sourceModel.type() == QVariant::List) {
         createFromList(sourceModel.toList());
         return ArrayList;
-    } else if (QQuickListModel *list = qvariant_cast<QQuickListModel*>(sourceModel)) {
+    } else if (QQmlListModel *list = qvariant_cast<QQmlListModel*>(sourceModel)) {
         createFromQuickList(list);
         return QuickList;
     }
@@ -66,13 +67,16 @@ UiProxyQmlModel::ListType UiProxyQmlModel::updateSource(const QVariant &sourceMo
     return InvalidList;
 }
 
-void UiProxyQmlModel::createFromList(const QVariantList &list)
-{
-    QHash<int, QByteArray> roleNames;
 
-    roleNames[Qt::DisplayRole] = "display";
-    setRoleNames(roleNames);
+QHash<int, QByteArray> UiProxyQmlModel::roleNames()
+{
+    QHash<int, QByteArray> roles;
+    roles.insert(Qt::DisplayRole, "display");
+    return roles;
+}
 
+void UiProxyQmlModel::createFromList(const QVariantList &list)
+{
     foreach (const QVariant& var, list) {
         QStandardItem *item = new QStandardItem();
         item->setData(var, Qt::DisplayRole);
@@ -81,10 +85,8 @@ void UiProxyQmlModel::createFromList(const QVariantList &list)
     }
 }
 
-void UiProxyQmlModel::createFromQuickList(QQuickListModel *list)
+void UiProxyQmlModel::createFromQuickList(QQmlListModel *list)
 {
-    setRoleNames(list->roleNames());
-
     for (int i = 0; i < list->count(); i++) {
         QStandardItem *item = new QStandardItem();