--- a/uifw/AvKon/src/akndiscreetpopup.cpp Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/AvKon/src/akndiscreetpopup.cpp Fri Feb 19 23:04:46 2010 +0200
@@ -22,6 +22,7 @@
#include "akndiscreetpopupcontrol.h"
#include "akndiscreetpopupserverhandler.h"
+#include "akntrace.h"
const TUid KDiscreetPopupSingleton = { 537001156 };
const TInt KInitialPopupId( 1 );
@@ -34,6 +35,7 @@
//
CAknDiscreetPopup::~CAknDiscreetPopup()
{
+ _AKNTRACE_FUNC_ENTER;
if ( iUseCoeEnv )
{
AKNTASHOOK_REMOVE();
@@ -47,6 +49,7 @@
}
iLocalPopups.Close();
delete iServerHandler;
+ _AKNTRACE_FUNC_EXIT;
}
@@ -66,6 +69,7 @@
const TInt aCommand,
MEikCommandObserver* aCommandObserver )
{
+ _AKNTRACE( "CAknDiscreetPopup::ShowLocalPopupL, Created by given parameters" );
__ASSERT_ALWAYS( CCoeEnv::Static(), Panic( EAknPanicNotSupported ) );
TInt popupId = 0;
CAknDiscreetPopup* instance = InstanceL();
@@ -95,6 +99,7 @@
const TInt aCommand,
MEikCommandObserver* aCommandObserver )
{
+ _AKNTRACE( "CAknDiscreetPopup::ShowLocalPopupL, Created by given resource" );
__ASSERT_ALWAYS( CCoeEnv::Static(), Panic( EAknPanicNotSupported ) );
TInt popupId = 0;
CAknDiscreetPopup* instance = InstanceL();
@@ -123,6 +128,7 @@
const TUid& aAppUid,
const TUid& aViewUid )
{
+ _AKNTRACE( "CAknDiscreetPopup::ShowGlobalPopupL, Created by given parameters" );
TInt popupId = 0;
CAknDiscreetPopup* instance = InstanceL();
if ( instance )
@@ -147,6 +153,7 @@
const TUid& aAppUid,
const TUid& aViewUid )
{
+ _AKNTRACE( "CAknDiscreetPopup::ShowGlobalPopupL, Created by given resource" );
TInt popupId = 0;
CAknDiscreetPopup* instance = InstanceL();
if( instance )
@@ -168,6 +175,7 @@
//
EXPORT_C void CAknDiscreetPopup::InitL()
{
+ _AKNTRACE_FUNC_ENTER;
__ASSERT_ALWAYS( !CCoeEnv::Static(), Panic( EAknPanicNotSupported ) );
// Create popup instance and store it to TLS
@@ -179,6 +187,7 @@
User::LeaveIfError( Dll::SetTls( instance ) );
CleanupStack::Pop( instance );
}
+ _AKNTRACE_FUNC_EXIT;
}
@@ -188,6 +197,7 @@
//
EXPORT_C void CAknDiscreetPopup::Release()
{
+ _AKNTRACE_FUNC_ENTER;
__ASSERT_ALWAYS( !CCoeEnv::Static(), Panic( EAknPanicNotSupported ) );
// Delete popup instance from TLS
@@ -199,6 +209,7 @@
instance = NULL;
Dll::SetTls( NULL );
}
+ _AKNTRACE_FUNC_EXIT;
}
@@ -392,8 +403,10 @@
//
void CAknDiscreetPopup::ShowPopupL( CAknDiscreetPopupControl* aControl )
{
+ _AKNTRACE_FUNC_ENTER;
if ( !aControl )
{
+ _AKNTRACE( "CAknDiscreetPopup::ShowPopupL, return (aControl is NULL)" );
return;
}
@@ -408,6 +421,7 @@
aControl->HandleDiscreetPopupActionL(
CAknDiscreetPopupControl::EAknDiscreetPopupShow );
iLocalPopups.AppendL( aControl );
+ _AKNTRACE_FUNC_EXIT;
}
@@ -417,8 +431,10 @@
//
void CAknDiscreetPopup::DeletePopup( CAknDiscreetPopupControl* aControl )
{
+ _AKNTRACE_FUNC_ENTER;
if ( !aControl )
{
+ _AKNTRACE( "CAknDiscreetPopup::DeletePopup, return (aControl is NULL)" );
return;
}
@@ -426,6 +442,7 @@
iLocalPopups.Remove( index );
delete aControl;
aControl = NULL;
+ _AKNTRACE_FUNC_EXIT;
}
@@ -472,6 +489,7 @@
void CAknDiscreetPopup::HandleControlEventL(
CCoeControl* aControl, TCoeEvent aEventType )
{
+ _AKNTRACE( "CAknDiscreetPopup::HandleControlEventL, aEventType : %d", aEventType );
if ( aEventType == EEventRequestExit || aEventType == EEventRequestCancel )
{
DeletePopup( static_cast<CAknDiscreetPopupControl*>( aControl ) );