Remove use of IconRole and TextRole for now. Use the enums in the Qt namespace instead.

1 files changed, 10 insertions, 10 deletions

diff --git a/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp b/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
index b7d53ca..daf7bdc 100644
--- a/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
+++ b/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
@@ -137,24 +137,24 @@ void tst_QtListModelAdaptor::checkGetData()
 
     QHash<int, QVariant> answer;
     QList<int> roles;
-    roles << QtListModelInterface::TextRole;
+    roles << Qt::DisplayRole;
     answer = model->data(4, roles);
     QCOMPARE(answer.count(), 1);
-    QVERIFY(answer.contains(QtListModelInterface::TextRole));
-    QCOMPARE(answer.value(QtListModelInterface::TextRole).toString(), data[4]);
+    QVERIFY(answer.contains(Qt::DisplayRole));
+    QCOMPARE(answer.value(Qt::DisplayRole).toString(), data[4]);
     answer = model->data(5, roles);
     QCOMPARE(answer.count(), 1);
-    QVERIFY(answer.contains(QtListModelInterface::TextRole));
-    QVERIFY(!answer.value(QtListModelInterface::TextRole).isValid());
+    QVERIFY(answer.contains(Qt::DisplayRole));
+    QVERIFY(!answer.value(Qt::DisplayRole).isValid());
 
-    roles << QtListModelInterface::IconRole;
+    roles << Qt::DecorationRole;
 
     answer = model->data(2, roles);
     QCOMPARE(answer.count(), 2);
-    QVERIFY(answer.contains(QtListModelInterface::TextRole));
-    QVERIFY(answer.contains(QtListModelInterface::IconRole));
-    QCOMPARE(answer.value(QtListModelInterface::TextRole).toString(), data[2]);
-    QVERIFY(!answer.value(QtListModelInterface::IconRole).isValid());
+    QVERIFY(answer.contains(Qt::DisplayRole));
+    QVERIFY(answer.contains(Qt::DecorationRole));
+    QCOMPARE(answer.value(Qt::DisplayRole).toString(), data[2]);
+    QVERIFY(!answer.value(Qt::DecorationRole).isValid());
 }
 
 QTEST_MAIN(tst_QtListModelAdaptor)