diff -r 66b5fe3c07fd -r e6f74eb7f69f homescreenapp/stateplugins/hsapplibrarystateplugin/tsrc/t_menuviewbuilder/src/t_menuviewbuilder.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/tsrc/t_menuviewbuilder/src/t_menuviewbuilder.cpp Wed Oct 06 16:06:24 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/tsrc/t_menuviewbuilder/src/t_menuviewbuilder.cpp Mon Oct 18 10:20:15 2010 +0300 @@ -149,7 +149,7 @@ builder.setStateContext(HsAllAppsContext); builder.setOperationalContext(HsItemViewContext); - const HbAbstractItemView *const itemView = builder.currentListView(); + const HbAbstractItemView *const itemView = builder.currentAbstractItemView(); QVERIFY(itemView); QVERIFY(itemView->inherits("HbListView")); @@ -353,7 +353,6 @@ #endif//UT_MEMORY_CHECK #endif//Q_OS_SYMBIAN { - QFAIL("! Due to bug in hb wk36 we are forced to skip this test !"); QScopedPointer window(new HbMainWindow); HsScene::setInstance( new HsScene(window.data()) ); @@ -380,18 +379,18 @@ const int expectedRow(0); - QVERIFY(allAppsState->mMenuView->listView() != NULL); - QVERIFY(allAppsState->mMenuView->listView()->visibleItems().count() >= 1); + QVERIFY(allAppsState->mMenuView->itemView() != NULL); + QVERIFY(allAppsState->mMenuView->itemView()->visibleItems().count() >= 1); int actualRow = - allAppsState->mMenuView->listView()->visibleItems().at(0)->modelIndex().row(); + allAppsState->mMenuView->itemView()->visibleItems().at(0)->modelIndex().row(); QCOMPARE(actualRow, expectedRow); allAppsState->mMenuView->scrollToRow(rowCount -1); actualRow = - allAppsState->mMenuView->listView()->visibleItems().at(0)->modelIndex().row(); + allAppsState->mMenuView->itemView()->visibleItems().at(0)->modelIndex().row(); QVERIFY(actualRow != expectedRow); qApp->processEvents(); @@ -399,7 +398,7 @@ allAppsState->mMenuView->scrollToRow(expectedRow); actualRow = - allAppsState->mMenuView->listView()->visibleItems().at(0)->modelIndex().row(); + allAppsState->mMenuView->itemView()->visibleItems().at(0)->modelIndex().row(); QCOMPARE(actualRow, expectedRow); qApp->processEvents();