FCL/sf/mw/classicui: comparison uifw/AvKon/src/akndiscreetpopupserverhandler.cpp

equal deleted inserted replaced

-:aecbbf00d063
+:d48ab3b357f1
 #include <eikcmobs.h>
 #include <avkon.hrh>
 #include "akndiscreetpopupserverhandler.h"
 #include "akndiscreetpopupdata.h"
+#include "akntrace.h"
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupServerHandler::NewL
 // CAknDiscreetPopupServerHandler::~CAknDiscreetPopupServerHandler
 // ---------------------------------------------------------------------------
 //
 CAknDiscreetPopupServerHandler::~CAknDiscreetPopupServerHandler()
 {
+_AKNTRACE_FUNC_ENTER;
 iLaunchers.ResetAndDestroy();
 iUiServer.Close();
+_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupServerHandler::LaunchGlobalPopup
 aCommandObserver,
 aCommandId,
 aPopupId,
 aAppUid,
 aViewUid );
+CleanupStack::PushL( launcher );
 launcher->SetData(
 aTitle,
 aText,
 aSkinId,
 aBitmapFile,
 aBitmapId,
 aMaskId,
 aFlags );
 iLaunchers.AppendL( launcher );
+CleanupStack::Pop( launcher );
 launcher->LaunchDiscreetPopup();
 }
 // ---------------------------------------------------------------------------
 aCommandObserver,
 aCommandId,
 aPopupId,
 aAppUid,
 aViewUid );
+CleanupStack::PushL( launcher );
 launcher->SetData(
 aResourceId,
 aResourceFile );
 iLaunchers.AppendL( launcher );
+CleanupStack::Pop( launcher );
 launcher->LaunchDiscreetPopup();
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupServerHandler::ConstructL
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupServerHandler::ConstructL()
 {
+_AKNTRACE_FUNC_ENTER;
 User::LeaveIfError( iUiServer.Connect() );
+_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupServerHandler::PopupIdInUse
 // CAknDiscreetPopupGlobalLauncher::~CAknDiscreetPopupGlobalLauncher
 // ---------------------------------------------------------------------------
 //
 CAknDiscreetPopupGlobalLauncher::~CAknDiscreetPopupGlobalLauncher()
 {
+_AKNTRACE( "[%s][%s] Enter ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
 if ( IsActive() && iHandler )
 {
 // Cancel request using status handle
 TAknDiscreetPopupCancelRequestData cancelData;
 cancelData.SetStatusHandle( ( TUint ) &iStatus );
 iHandler->UiServer()->DoDiscreetPopupAction( &cancelData );
 }
 Cancel();
+_AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupGlobalLauncher::LaunchDiscreetPopup
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupGlobalLauncher::LaunchDiscreetPopup()
 {
+_AKNTRACE( "[%s][%s] Enter ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
 if ( IsActive() )
 {
+_AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
 return;
 }
 RenewRequest();
+_AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupGlobalLauncher::RunL
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupGlobalLauncher::RunL()
 {
+_AKNTRACE( "[%s][%s] Enter,  iStatus : %d",
+		"CAknDiscreetPopupGlobalLauncher", __FUNCTION__, iStatus.Int() );
 if ( iStatus.Int() != KRequestPending )
 {
 if( iCommandObserver )
 	{
 	if( iStatus.Int() == KErrCompletion && iCommandId )
 }
 else
 {
 RenewRequest();
 }
+_AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalLauncher", __FUNCTION__ );
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupGlobalLauncher::DoCancel
 //
 void CAknDiscreetPopupGlobalLauncher::RenewRequest()
 {
 if ( iHandler )
 {
+_AKNTRACE( "CAknDiscreetPopupGlobalLauncher::RenewRequest, issue request." );
 iHandler->UiServer()->DoDiscreetPopupAction( PopupData(), &iStatus );
 }
 SetActive();
 }
 const TInt& aCommandId,
 const TInt& aPopupId,
 const TUid& aAppUid,
 const TUid& aViewUid )
 {
+_AKNTRACE( "[%s][%s] Enter ", "CAknDiscreetPopupGlobalParamLauncher", __FUNCTION__ );
 CAknDiscreetPopupGlobalParamLauncher* self =
 new ( ELeave ) CAknDiscreetPopupGlobalParamLauncher(
 aHandler, aObserver, aCommandId, aPopupId, aAppUid, aViewUid );
 CleanupStack::PushL( self );
 self->ConstructL();
 CleanupStack::Pop( self );
+_AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalParamLauncher", __FUNCTION__ );
 return self;
 }
 // ---------------------------------------------------------------------------
 const TInt& aCommandId,
 const TInt& aPopupId,
 const TUid& aAppUid,
 const TUid& aViewUid )
 {
+_AKNTRACE( "[%s][%s] Enter ", "CAknDiscreetPopupGlobalResourceLauncher", __FUNCTION__ );
 CAknDiscreetPopupGlobalResourceLauncher* self =
 new ( ELeave ) CAknDiscreetPopupGlobalResourceLauncher(
 aHandler, aObserver, aCommandId, aPopupId, aAppUid, aViewUid );
 CleanupStack::PushL( self );
 self->ConstructL();
 CleanupStack::Pop( self );
+_AKNTRACE( "[%s][%s] Exit ", "CAknDiscreetPopupGlobalResourceLauncher", __FUNCTION__ );
 return self;
 }
 // ---------------------------------------------------------------------------

branch	RCL_3
changeset 56	d48ab3b357f1
parent 55	aecbbf00d063