diff -r 84c6623982f6 -r ed07dcc72692 apengine/apsettingshandlerui/src/ApSettingsCommons.cpp --- a/apengine/apsettingshandlerui/src/ApSettingsCommons.cpp Fri Sep 17 08:32:43 2010 +0300 +++ b/apengine/apsettingshandlerui/src/ApSettingsCommons.cpp Mon Oct 04 00:43:42 2010 +0300 @@ -49,25 +49,7 @@ // TInt AskQueryL( TInt aResId, TDesC* aVar ) { - APSETUILOGGER_ENTERFN( EOther,"Commons::AskQueryL") - - HBufC* temp; - if ( aVar ) - { - temp = StringLoader::LoadL( aResId, *aVar ); - CleanupStack::PushL( temp ); - } - else - { - temp = CEikonEnv::Static()->AllocReadResourceLC( aResId ); - } - CAknQueryDialog* qd = - CAknQueryDialog::NewL( CAknQueryDialog::EConfirmationTone ); - TInt retval = qd->ExecuteLD( R_CONFIRMATION_QUERY, *temp ); - CleanupStack::PopAndDestroy(); // temp - - APSETUILOGGER_LEAVEFN( EOther,"Commons::AskQueryL") - return retval; + return 0; } @@ -78,73 +60,14 @@ // TInt ShowNoteL( TInt aResId, TDesC* aVar ) { - APSETUILOGGER_ENTERFN( EOther,"Commons::ShowNoteL") - - HBufC* temp; - if ( aVar ) - { - temp = StringLoader::LoadL( aResId, *aVar ); - CleanupStack::PushL( temp ); - } - else - { - temp = CEikonEnv::Static()->AllocReadResourceLC( aResId ); - } - CAknNoteDialog* dlg = - new ( ELeave ) CAknNoteDialog - ( - REINTERPRET_CAST( CEikDialog**, &dlg ), - CAknNoteDialog::ENoTone, - CAknNoteDialog::EShortTimeout - ); - dlg->PrepareLC( R_GENERAL_NOTE ); - dlg->SetTextL( *temp ); - TInt retval = dlg->RunLD(); - CleanupStack::PopAndDestroy(); // temp - - APSETUILOGGER_LEAVEFN( EOther,"Commons::ShowNoteL") - return retval; + return 0; } #ifdef __TEST_OOMDEBUG TInt GetTestStateL() { - APSETUILOGGER_ENTERFN( EOther,"Commons::GetTestStateL") - - TInt retval( 0 ); - RFs fs; - User::LeaveIfError( fs.Connect() ); - CleanupClosePushL( fs ); - TUint att; - if ( fs.Att( KTestFileName, att ) == KErrNone ) - { - RFile file; - TInt err = file.Open( fs, KTestFileName, - EFileShareAny | EFileStreamText | - EFileRead - ); - if ( err == KErrNone ) - { - TBuf8<256> buf; - err = file.Read( buf ); - if ( err == KErrNone ) - { - TInt val; - TLex8 lex( buf ); - err = lex.Val( val ); - if ( err == KErrNone ) - { - retval = val; - } - } - } - file.Close(); - } - CleanupStack::PopAndDestroy(); // fs, will also close it - - APSETUILOGGER_LEAVEFN( EOther,"Commons::GetTestStateL") - return retval; + return 0; } #endif // __TEST_OOMDEBUG