diff -r 8bda91a87a00 -r 8ee96d21d9bf profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp --- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Thu Aug 19 10:12:30 2010 +0300 +++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Tue Aug 31 15:29:50 2010 +0300 @@ -19,23 +19,16 @@ // INCLUDE FILES #include "CProfileChangeEvent.h" +#include "ProfileEnginePrivateCRKeys.h" +#include "ProfilesDebug.h" #include #include -#include #include #include -#include -#include -#include -#include -#include - -#include -#include "ProfileEnginePrivateCRKeys.h" +#include #include -#include "ProfilesDebug.h" // CONSTANTS @@ -63,10 +56,6 @@ // void CProfileChangeEvent::ConstructL() { - FeatureManager::InitializeLibL(); - iCoverDisplay = FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ); - - User::LeaveIfError( iFs.Connect() ); // Open/Create mutex TInt error( KErrNotFound ); @@ -81,7 +70,6 @@ } User::LeaveIfError( error ); iProfileEngine = CreateProfileEngineL( &iFs ); - iGlobalNote = CAknGlobalNote::NewL(); ReadResourcesL(); } @@ -117,16 +105,12 @@ // Destructor CProfileChangeEvent::~CProfileChangeEvent() { - delete iNoteText; - delete iGlobalNote; if( iProfileEngine ) { iProfileEngine->Release(); } iFs.Close(); iMutex.Close(); - - FeatureManager::UnInitializeLib(); } @@ -202,15 +186,6 @@ // void CProfileChangeEvent::ShowNoteL() { - PRODEBUG1( " CProfileChangeEvent:ShowNoteL(%S)", iNoteText ); - // Set secondary display data if cover ui is supported - if ( iCoverDisplay ) - { - CAknSDData* sd = CAknSDData::NewL(KCatProfiles, - ECmdShowTimedProfileExpiryNote, KNullDesC8); - iGlobalNote->SetSecondaryDisplayData( sd ); // ownership transferred - } - iGlobalNote->ShowNoteL( EAknGlobalConfirmationNote, *iNoteText ); } // ----------------------------------------------------------------------------- @@ -220,35 +195,6 @@ // void CProfileChangeEvent::ReadResourcesL() { - PRODEBUG( " CProfileChangeEvent:ReadResourcesL" ); - TParse* fp = new ( ELeave ) TParse(); - fp->Set( KProfileScheduleEventResourceDriveAndDir, - &KDC_RESOURCE_FILES_DIR, NULL ); - iResourceFile.Copy( fp->FullName() ); - delete fp; - - PRODEBUG( " CProfileChangeEvent:ReadResourcesL 2" ); - BaflUtils::NearestLanguageFile( iFs, iResourceFile ); - PRODEBUG1( " CProfileChangeEvent:ReadResourcesL 3 iResourceFile=%S", &iResourceFile ); - - RResourceFile resourceFile; - resourceFile.OpenL( iFs, iResourceFile ); - CleanupClosePushL( resourceFile ); - - PRODEBUG( " CProfileChangeEvent:ReadResourcesL 4" ); - resourceFile.ConfirmSignatureL(); - PRODEBUG( " CProfileChangeEvent:ReadResourcesL 5" ); - - HBufC8* dataBuffer = resourceFile.AllocReadLC( R_PROFILES_CONFIRM_TIMED_EXPIRED ); - - PRODEBUG( " CProfileChangeEvent:ReadResourcesL 6" ); - TResourceReader rsReader; - rsReader.SetBuffer( dataBuffer ); - iNoteText = rsReader.ReadHBufCL(); - PRODEBUG( " CProfileChangeEvent:ReadResourcesL 7" ); - - CleanupStack::PopAndDestroy( 2 ); // dataBuffer, resourceFile - PRODEBUG( " CProfileChangeEvent:ReadResourcesL 8" ); } // End of File