--- a/uifw/AknGlobalUI/AknCapServer/src/akncapserverdiscreetpopuphandler.cpp Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AknGlobalUI/AknCapServer/src/akncapserverdiscreetpopuphandler.cpp Tue Aug 31 15:28:30 2010 +0300
@@ -23,7 +23,6 @@
#include "akncapserverdiscreetpopuphandler.h"
#include "akndiscreetpopupcontrol.h"
#include "akndiscreetpopupdata.h"
-#include "akntrace.h"
const TUid KAknCapServerDiscreetPopupHandler = { 0x2001FDF8 };
@@ -35,7 +34,6 @@
//
CAknCapServerDiscreetPopupHandler::~CAknCapServerDiscreetPopupHandler()
{
- _AKNTRACE_FUNC_ENTER;
for ( TInt i = 0; i < iPopupDataArray.Count(); i++ )
{
if ( iPopupDataArray[ i ].iPopupControl )
@@ -45,7 +43,6 @@
}
}
iPopupDataArray.Close();
- _AKNTRACE_FUNC_EXIT;
}
@@ -56,14 +53,12 @@
void CAknCapServerDiscreetPopupHandler::HandleDiscreetPopupMessageL(
const RMessage2& aMessage )
{
- _AKNTRACE_FUNC_ENTER;
CAknCapServerDiscreetPopupHandler* instance
= CAknCapServerDiscreetPopupHandler::InstanceL();
if ( instance )
{
instance->DoHandleDiscreetPopupMessageL( aMessage );
}
- _AKNTRACE_FUNC_EXIT;
}
@@ -73,10 +68,8 @@
//
void CAknCapServerDiscreetPopupHandler::CreateDiscreetPopupHandlerL()
{
- _AKNTRACE_FUNC_ENTER;
CAknCapServerDiscreetPopupHandler* instance
= CAknCapServerDiscreetPopupHandler::InstanceL();
- _AKNTRACE_FUNC_EXIT;
}
@@ -128,7 +121,6 @@
void CAknCapServerDiscreetPopupHandler::DoHandleDiscreetPopupMessageL(
const RMessage2& aMessage )
{
- _AKNTRACE_FUNC_ENTER;
TAknDiscreetPopupData dataType;
TPckg<TAknDiscreetPopupData> pkgType( dataType );
aMessage.ReadL( 0, pkgType );
@@ -151,7 +143,7 @@
}
case ( TAknDiscreetPopupData::EAknPopupTypeQueryInUseRect ):
{
- HandleQueryInUseRectL( aMessage );
+ HandleQueryInUseRect( aMessage );
break;
}
default:
@@ -159,7 +151,6 @@
break;
}
}
- _AKNTRACE_FUNC_EXIT;
}
@@ -170,7 +161,6 @@
void CAknCapServerDiscreetPopupHandler::LaunchFromResourceL(
const RMessage2& aMessage )
{
- _AKNTRACE_FUNC_ENTER;
TAknDiscreetPopupResourceData data;
TPckg<TAknDiscreetPopupResourceData> pkg( data );
aMessage.ReadL( 0, pkg );
@@ -198,7 +188,6 @@
data.ViewUid(),
aMessage );
CleanupStack::Pop( popup );
- _AKNTRACE_FUNC_EXIT;
}
@@ -209,7 +198,6 @@
void CAknCapServerDiscreetPopupHandler::LaunchWithParamsL(
const RMessage2& aMessage )
{
- _AKNTRACE_FUNC_ENTER;
TAknDiscreetPopupParamData data;
TPckg<TAknDiscreetPopupParamData> pkg( data );
aMessage.ReadL( 0, pkg );
@@ -243,7 +231,6 @@
data.ViewUid(),
aMessage );
CleanupStack::Pop( popup );
- _AKNTRACE_FUNC_EXIT;
}
@@ -254,7 +241,6 @@
void CAknCapServerDiscreetPopupHandler::HandleRequestCancellationL(
const RMessage2& aMessage )
{
- _AKNTRACE_FUNC_ENTER;
TAknDiscreetPopupCancelRequestData data;
TPckg<TAknDiscreetPopupCancelRequestData> pkg( data );
aMessage.ReadL( 0, pkg );
@@ -277,17 +263,15 @@
}
}
aMessage.Complete( KErrNone );
- _AKNTRACE_FUNC_EXIT;
}
// ---------------------------------------------------------------------------
-// CAknCapServerDiscreetPopupHandler::HandleQueryInUseRectL
+// CAknCapServerDiscreetPopupHandler::HandleQueryInUseRect
// ---------------------------------------------------------------------------
//
-void CAknCapServerDiscreetPopupHandler::HandleQueryInUseRectL(
+void CAknCapServerDiscreetPopupHandler::HandleQueryInUseRect(
const RMessage2& aMessage )
{
- _AKNTRACE_FUNC_ENTER;
TRect rect(TRect::EUninitialized);
if( iPopupDataArray.Count() != 0 )
{
@@ -298,7 +282,6 @@
TPckg<TAknDiscreetPopupRectData> pkg( data );
aMessage.WriteL( 0, pkg );
aMessage.Complete( KErrNone );
- _AKNTRACE_FUNC_EXIT;
}
// ---------------------------------------------------------------------------
@@ -312,7 +295,6 @@
const TUid& aViewUid,
const RMessage2& aMessage )
{
- _AKNTRACE_FUNC_ENTER;
aPopup->SetObserver( this );
// Inform other popups that new popup is launched
@@ -334,7 +316,6 @@
popupData.iMessage = aMessage;
iPopupDataArray.AppendL( popupData );
NotifyRunningGlobalDiscreetPopupChanged();
- _AKNTRACE_FUNC_EXIT;
}
@@ -369,7 +350,6 @@
//
void CAknCapServerDiscreetPopupHandler::NotifyRunningGlobalDiscreetPopupChanged()
{
- _AKNTRACE_FUNC_ENTER;
_LIT_SECURITY_POLICY_S0( writePolicy, RProcess().SecureId() );
_LIT_SECURITY_POLICY_PASS( readPolicy );
@@ -383,7 +363,6 @@
{
RProperty::Set( KPSUidAvkonDomain, KAknGlobalDiscreetPopupNumChanged, 0 );
}
- _AKNTRACE_FUNC_EXIT;
}
// ---------------------------------------------------------------------------
@@ -392,7 +371,6 @@
//
void CAknCapServerDiscreetPopupHandler::ProcessCommandL( TInt aCommandId )
{
- _AKNTRACE_FUNC_ENTER;
TAknCapServerDiscreetPopupData* popupData( NULL );
for ( TInt i = 0; i < iPopupDataArray.Count(); i++ )
{
@@ -427,7 +405,6 @@
{
popupData->iMessage.Complete( KErrCompletion );
}
- _AKNTRACE_FUNC_EXIT;
}
@@ -438,7 +415,6 @@
void CAknCapServerDiscreetPopupHandler::HandleControlEventL(
CCoeControl* aControl, TCoeEvent aEventType )
{
- _AKNTRACE( "CAknCapServerDiscreetPopupHandler::HandleControlEventL, aEventType : %d", aEventType );
// Popup has been closed or cancelled - remove from array
if ( aEventType == EEventRequestExit || aEventType == EEventRequestCancel )
{