diff -r fb3763350a08 -r 4d54b72983ae menufw/hierarchynavigator/hnpresentationmodel/src/hnmenuitemmodel.cpp --- a/menufw/hierarchynavigator/hnpresentationmodel/src/hnmenuitemmodel.cpp Fri Jan 22 09:35:14 2010 +0200 +++ b/menufw/hierarchynavigator/hnpresentationmodel/src/hnmenuitemmodel.cpp Tue Jan 26 11:48:23 2010 +0200 @@ -83,7 +83,7 @@ { Reset(); } - else if ( iChildren[iNextMenu]->IsItemSpecific() ) + else if ( iChildren[iNextMenu]->MenuItemType() == EItemSpecific ) { hasNext = ETrue; } @@ -102,7 +102,7 @@ EXPORT_C CHnMenuItemModel* CHnMenuItemModel::GetNextSpecific() { ASSERT( iNextMenu < iChildren.Count() ); - ASSERT( iChildren[iNextMenu]->IsItemSpecific() ); + ASSERT( iChildren[iNextMenu]->MenuItemType() == EItemSpecific ); CHnMenuItemModel* nextSpecific = iChildren[ iNextMenu ]; iNextMenu++; return nextSpecific; @@ -143,7 +143,7 @@ void CHnMenuItemModel::ConstructL( const TDesC& aName ) { ASSERT( aName.Length() ); - iItemSpecific = EFalse; + iMenuItemType = EItemApplication; iName.CreateL( aName ); } @@ -196,18 +196,18 @@ // // --------------------------------------------------------------------------- // -EXPORT_C void CHnMenuItemModel::SetItemSpecific( TBool aItemSpecific ) +EXPORT_C void CHnMenuItemModel::SetMenuItemType( THnMenuItemType aMenuItemType ) { - iItemSpecific = aItemSpecific; + iMenuItemType = aMenuItemType; } // --------------------------------------------------------------------------- // // --------------------------------------------------------------------------- // -EXPORT_C TBool CHnMenuItemModel::IsItemSpecific() +EXPORT_C CHnMenuItemModel::THnMenuItemType CHnMenuItemModel::MenuItemType() { - return iItemSpecific; + return iMenuItemType; } // ---------------------------------------------------------------------------