commondrm/drmutility/src/DrmUtilityGlobalNoteWrapper.cpp
branchRCL_3
changeset 71 1221b68b8a5f
parent 32 457cd4423b8c
child 72 1481bf457703
--- a/commondrm/drmutility/src/DrmUtilityGlobalNoteWrapper.cpp	Thu Aug 19 10:12:10 2010 +0300
+++ b/commondrm/drmutility/src/DrmUtilityGlobalNoteWrapper.cpp	Tue Aug 31 15:29:38 2010 +0300
@@ -21,7 +21,6 @@
 #include <StringLoader.h>
 #include <AknGlobalConfirmationQuery.h>
 #include <AknGlobalListQuery.h>
-#include <AknGlobalMsgQuery.h>
 #include <badesca.h>
 #include <avkon.hrh> // EAknSoftkeyNo
 #include <drmutility.rsg>
@@ -90,7 +89,6 @@
 DRM::CDrmUtilityGlobalNoteWrapper::~CDrmUtilityGlobalNoteWrapper()
     {
     Cancel(); // Cancel active object
-    delete iGlobalMsgQuery;	
     }
 
 // -----------------------------------------------------------------------------
@@ -184,32 +182,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CDrmUtilityGlobalNoteWrapper::ShowNoteL
-// -----------------------------------------------------------------------------
-//
-void DRM::CDrmUtilityGlobalNoteWrapper::ShowMessageQueryL(
-    TInt aMessageResourceId,
-    TInt aHeaderResourceId,
-    const TDesC& aString)
-    {
-    TBuf<KDRMNoteBufferMaxSize> messageBuffer(
-        iResourceReader->ReadResourceString( aMessageResourceId ) );
-
-    StringLoader::Format( iFinalMessageBuffer, messageBuffer, -1, aString );
-    
-    iHeaderBuffer = iResourceReader->ReadResourceString( aHeaderResourceId );
-    
-    CAknGlobalMsgQuery* iGlobalMsgQuery = CAknGlobalMsgQuery::NewL();
-    
-    iStatus = KRequestPending;
-    iGlobalMsgQuery->ShowMsgQueryL(iStatus, iFinalMessageBuffer, 
-          R_AVKON_SOFTKEYS_OK_EMPTY, iHeaderBuffer, KNullDesC);
-          
-    SetActive();
-    iWait.Start();
-    }
-
-// -----------------------------------------------------------------------------
 // CDrmUtilityGlobalNoteWrapper::ShowPreviewListQueryL
 // -----------------------------------------------------------------------------
 //
@@ -333,10 +305,6 @@
 void DRM::CDrmUtilityGlobalNoteWrapper::RunL()
     {
     iWait.AsyncStop();
-    if(iGlobalMsgQuery)
-    		{
-    		iGlobalMsgQuery->CancelMsgQuery();
-    		}
     }
 
 // -----------------------------------------------------------------------------