diff -r 15e4dd19031c -r a0713522ab97 idlefw/src/framework/aistatemanager.cpp --- a/idlefw/src/framework/aistatemanager.cpp Wed Mar 31 22:04:35 2010 +0300 +++ b/idlefw/src/framework/aistatemanager.cpp Wed Apr 14 16:16:44 2010 +0300 @@ -30,12 +30,6 @@ #include "aistatemanager.h" -#include - -_LIT( KResourceDrive, "Z:" ); -_LIT( KResourceFile, "homescreen.rsc" ); -_LIT( KResourcePath, "\\resource\\apps\\" ); - // ======== LOCAL FUNCTIONS ======== // ---------------------------------------------------------------------------- // StartReason @@ -120,10 +114,6 @@ // CAiStateManager::~CAiStateManager() { - if( iWaitDialog ) - { - delete iWaitDialog; - } delete iCommandBuffer; iReloadPlugins.Close(); } @@ -442,15 +432,6 @@ iHalt = aStart; - if ( aStart ) - { - TRAP_IGNORE( StartWaitDialogL() ); - } - else - { - TRAP_IGNORE( StopWaitDialogL() ); - } - RPointerArray< CHsContentPublisher >& plugins( iFactory.Publishers() ); for( TInt i = 0; i < plugins.Count(); i++ ) @@ -649,59 +630,4 @@ __PRINTS( "CAiStateManager::NotifyReleasePlugins: return void" ); } -// ---------------------------------------------------------------------------- -// CAiStateManager::StartWaitDialogL() -// -// ---------------------------------------------------------------------------- -// -void CAiStateManager::StartWaitDialogL() - { - RConeResourceLoader resourceLoader( *CCoeEnv::Static() ); - TFullName fileName( KResourceDrive ); - fileName.Append( KResourcePath ); - fileName.Append( KResourceFile ); - - // Get language of resource file. - BaflUtils::NearestLanguageFile( CCoeEnv::Static()->FsSession(), fileName ); - - // Open resource file. - resourceLoader.OpenL( fileName ); - - if( iWaitDialog ) - { - delete iWaitDialog; - iWaitDialog = NULL; - } - - // For the wait dialog - iWaitDialog = new (ELeave) CAknWaitDialog( - REINTERPRET_CAST( CEikDialog**, &iWaitDialog ) ); - iWaitDialog->SetCallback( this ); - iWaitDialog->ExecuteLD( R_HOMESCREEN_WAIT_DIALOG ); - resourceLoader.Close(); - } - -// ---------------------------------------------------------------------------- -// CAiStateManager::StopWaitDialogL() -// -// ---------------------------------------------------------------------------- -// -void CAiStateManager::StopWaitDialogL() - { - if( iWaitDialog ) - { - iWaitDialog->ProcessFinishedL(); - } - } - -// ---------------------------------------------------------------------------- -// CAiStateManager::DialogDismissedL() -// -// ---------------------------------------------------------------------------- -// -void CAiStateManager::DialogDismissedL(TInt /*aButtonId*/) - { - // No implementation required. - } - // End of file