diff -r 1b207dd38b72 -r ace62b58f4b2 menucontentsrv/srvsrc/menusrveng.cpp --- a/menucontentsrv/srvsrc/menusrveng.cpp Tue May 25 13:01:39 2010 +0300 +++ b/menucontentsrv/srvsrc/menusrveng.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -34,7 +34,6 @@ #include "mcsrunningappshandler.h" #include "mcsgetlisthandler.h" #include "menusrvobjectfilter.h" -#include "mcssuitehandler.h" #include #include @@ -107,7 +106,6 @@ delete iFolderNotifier; delete iMcsSatMonitor; delete iRunningAppsHandler; - delete iSuiteHandler; delete iEng; iMenuSrv.EngineDeleted(); } @@ -156,7 +154,6 @@ *this, *iCMenuSrvEngUtils, *iCacheHandler ); iChildrenHandler = CMcsChildrenHandler::NewL( *this, *iCacheHandler); - iSuiteHandler = CMcsSuiteHandler::NewL(*iEng, iContentName); iTimedClose->Cancel(); iTimedClose->After( TTimeIntervalMicroSeconds32( KMenuSrvExitDelay ) ); @@ -265,7 +262,6 @@ delete iRunningAppsHandler; iRunningAppsHandler = NULL; delete iAppScanner; iAppScanner = NULL; delete iFolderNotifier; iFolderNotifier = NULL; - delete iSuiteHandler; iSuiteHandler = NULL; delete iEng; iEng = NULL; iContentName.Close(); @@ -339,26 +335,6 @@ } // --------------------------------------------------------- -// CMenuSrvEng::InstalledSuiteExist -// --------------------------------------------------------- -// -TBool CMenuSrvEng::InstalledSuiteExist(const TDesC& aSuiteName) - { - return iSuiteHandler->HaveSuite(aSuiteName); - } - -// --------------------------------------------------------- -// CMenuSrvEng::GetSuiteAttributeL -// --------------------------------------------------------- -// -void CMenuSrvEng::GetSuiteAttribute( const TDesC& aSuiteName, const TDesC& aAttrName, - TBool& aAttrExists, TDes& aAttrVal ) - { - iSuiteHandler->GetAttribute(aSuiteName, aAttrName, - aAttrExists, aAttrVal); - } - -// --------------------------------------------------------- // CMenuSrvEng::GetRunningAppsL() // --------------------------------------------------------- //