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

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 #include <akntransitionutils.h>
 #include <akntranseffect.h>
 #endif
 #include <AknTasHook.h> // for testability hooks
-#include "akntrace.h"
 /**
 *  CAknQueryDialogExtension
 */
 NONSHARABLE_CLASS(CAknQueryDialogExtension) : public CBase, public MCoeCaptionRetrieverForFep
 {
 // Destructor
 // ---------------------------------------------------------------------------
 //
 CAknQueryDialogExtension::~CAknQueryDialogExtension()
 {
-_AKNTRACE( "[%s][%s] do nothing", "CAknQueryDialogExtension", "~CAknQueryDialogExtension" );
 }
 // ---------------------------------------------------------------------------
 // Constructor
 // ---------------------------------------------------------------------------
 //
 CAknQueryDialogExtension::CAknQueryDialogExtension
 (CAknQueryDialog* aQueryDialog) : iParent(aQueryDialog)
 {
-_AKNTRACE( "[%s][%s] do nothing", "CAknQueryDialogExtension", "CAknQueryDialogExtension" );
 }
 // ---------------------------------------------------------------------------
 // GetCaptionForFep
 // Overrides MCoeCaptionRetrieverForFep::GetCaptionForFep
 // Responsible for retrieving the caption from query dialog to FEP
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CAknQueryDialogExtension::GetCaptionForFep(TDes& aCaption) const
 {
-_AKNTRACE( "[%s][%s] enter aCaption:%s", "CAknQueryDialogExtension", "GetCaptionForFep" , &aCaption);
 aCaption = KNullDesC;
 CAknQueryControl* control = iParent->QueryControl();
 if ( control )
 {
 aCaption= headTitle;
 }
 }
 }
 }
-_AKNTRACE( "[%s][%s] exit aCaption:%s", "CAknQueryDialogExtension", "GetCaptionForFep" , &aCaption);
 }
 /**
 *  CAknMultilineQueryDialogExtension
 // Destructor
 // ---------------------------------------------------------------------------
 //
 CAknMultilineQueryDialogExtension::~CAknMultilineQueryDialogExtension()
 {
-_AKNTRACE( "[%s][%s] do nothing", "CAknMultilineQueryDialogExtension", "~CAknMultilineQueryDialogExtension" );
 }
 // ---------------------------------------------------------------------------
 // Constructor
 // ---------------------------------------------------------------------------
 //
 CAknMultilineQueryDialogExtension::CAknMultilineQueryDialogExtension
 (CAknQueryDialog* aQueryDialog, TInt aQueryType):CAknQueryDialogExtension(aQueryDialog),iQueryType(aQueryType)
 {
-_AKNTRACE( "[%s][%s] do nothing", "CAknMultilineQueryDialogExtension", "CAknMultilineQueryDialogExtension" );
 }
 // ---------------------------------------------------------------------------
 // GetCaptionForFep
 // Overrides MCoeCaptionRetrieverForFep::GetCaptionForFep
 * In future might use MAknQueryData mixin in the base class, hence requiring
 * second phase construction.
 */
 EXPORT_C CAknQueryDialog* CAknQueryDialog::NewL(const TTone& aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryDialog* self = new (ELeave) CAknQueryDialog(aTone);
 AKNTASHOOK_ADDL( self, "CAknQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 /**
 * Return pointer to CAknTextQueryDialog
 	return NULL;
 	}
 EXPORT_C CAknQueryDialog::CAknQueryDialog(const TTone& aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS
 GfxTransEffect::Register( this, KGfxQueryControlUid );
 #endif
 iTone = aTone;
 if (iEikonEnv->AppUi())
 {
 iSoundSystem = iAvkonAppUiBase->KeySounds();
 }
-_AKNTRACE( "[%s][%s] iTone: %d", "CAknQueryDialog", __FUNCTION__, iTone );
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * deprecated
 */
 TRAP_IGNORE(SetPromptL(aPrompt));
 }
 EXPORT_C CAknQueryDialog::~CAknQueryDialog()
 {
-_AKNTRACE( "[%s][%s] Enter", "CAknQueryDialog", "~CAknQueryDialog" );
 AKNTASHOOK_REMOVE();
 delete iPrompt;
 delete iExtension;
 #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS
 CAknTransitionUtils::RemoveData( ( TInt )this );
 #endif
-_AKNTRACE( "[%s][%s] Exit", "CAknQueryDialog", "~CAknQueryDialog" );
 }
 EXPORT_C TInt CAknQueryDialog::RunLD()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknDialog::ConstructL( R_AVKON_MENUPANE_EMPTY) ;
 ReportUserActivity();
 PlayTone();
 CAknKeySoundSystem* soundSystem = NULL;
 if (iSoundSystem)
 soundSystem = iSoundSystem;
 }
 CAknsFrameBackgroundControlContext* cc = (CAknsFrameBackgroundControlContext*)AknsDrawUtils::ControlContext( this );
 cc->SetCenter(KAknsIIDQsnFrPopupCenterQuery);
-// Check Query is wait of not.
-TBool isWaitDialog( ( DialogFlags() & EEikDialogFlagWait ) != 0 );
 SetGloballyCapturing(ETrue);
 TInt ret = CAknDialog::RunLD();
-_AKNTRACE( "[%s][%s] ret: %d", "CAknQueryDialog", __FUNCTION__, ret );
 if (soundSystem)
 {
 soundSystem->PopContext();
 }
-// If wait QueryDialog, instance will be deleted right after RunLD via CBA
+SetGloballyCapturing(EFalse);
-if ( !isWaitDialog )
-{
-SetGloballyCapturing(EFalse);
-}
-_AKNTRACE_FUNC_EXIT;
 return ret;
 }
 /**
 * deprecated
 * compiler will complain if this is not implemented in
 * derived class as well
 */
 EXPORT_C TInt CAknQueryDialog::ExecuteLD(TInt aResourceId)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aResourceId: %d", "CAknQueryDialog", __FUNCTION__, aResourceId );
 PrepareLC(aResourceId);
-TInt ret = RunLD();
+return(RunLD());
-_AKNTRACE( "[%s][%s] ret:%d", "CAknQueryDialog", __FUNCTION__,ret );
-_AKNTRACE_FUNC_EXIT;
-return ret;
 }
 /**
 * Call PrepareLC, set the prompt and display dialog.
 */
 EXPORT_C TInt CAknQueryDialog::ExecuteLD(TInt aResourceId,const TDesC& aPrompt)
 {
-_AKNTRACE_FUNC_ENTER;
 PrepareLC(aResourceId);
 SetPromptL(aPrompt);
-_AKNTRACE( "[%s][%s] aResourceId: %d", "CAknQueryDialog", __FUNCTION__, aResourceId );
+return(RunLD());
-TInt ret= RunLD();
-_AKNTRACE( "[%s][%s] ret:%d", "CAknQueryDialog", __FUNCTION__,ret );
-_AKNTRACE_FUNC_EXIT;
-return ret;
 }
 /**
 * Get layout information from the control and use this layout
 * information to do layout. If there is a heading, add the
 * heading height to the height returned by the control layout
 * Therefore use iAvkonAppUi->ApplicationRect() minus the height
 * of the control pane (KAknSoftkeyPaneHeight) instead of ClientRect().
 */
 EXPORT_C void CAknQueryDialog::SetSizeAndPosition( const TSize& /*aSize*/ )
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryControl* control = QueryControl();
 CAknPopupHeadingPane* controlHeading = QueryHeading();
 if(control)
 {
 		control->MopGetObject( dialog );
 		if ( dialog && ( dialog->DialogFlags() & EEikDialogFlagVirtualInput ) )
 			{
 			TAknWindowLineLayout lay = AknLayoutScalable_Avkon::application_window(0);
 			TRect re(0, 0, lay.iW, lay.iH);
-			_AKNTRACE( "[%s][%s] Rect: x[%d],y[%d],w[%d],h[%d]", "CAknQueryDialog", __FUNCTION__,
-							re.iTl.iX, re.iTl.iY, re.Width(),re.Height());
 		SetRect(re);
-		_AKNTRACE_FUNC_EXIT;
 		return;
 			}
 }
 #endif
 TAknWindowLineLayout windowLineLayoutScreen = AknLayoutScalable_Avkon::Screen().LayoutLine();
 TRect rectZero = TRect(0,0,0,0);
 TAknLayoutRect layoutRect;
 layoutRect.LayoutRect( rectZero, windowLineLayoutScreen );
 TRect rectScreen( layoutRect.Rect() );
 	TSize maxSize = rectScreen.Size();
-	_AKNTRACE( "[%s][%s] maxSize: w[%d],h[%d]", "CAknQueryDialog", __FUNCTION__,
-			maxSize.iWidth,maxSize.iHeight);
 if ( AknLayoutUtils::PenEnabled() )
 {
-TSize preferredSize = PreferredSize( maxSize );
+CAknDialog::SetSizeAndPosition( PreferredSize( maxSize ) );
-_AKNTRACE( "[%s][%s] call CAknDialog::SetSizeAndPosition( PreferredSize( w[%d],h[%d] ) )", "CAknQueryDialog",
-		__FUNCTION__, preferredSize.iWidth, preferredSize.iHeight);
-CAknDialog::SetSizeAndPosition( preferredSize );
 }
 else
 {
 TAknWindowLineLayout layout;
 control->WindowLayout( layout );
 TAknLayoutRect headingLayoutRect;
 headingLayoutRect.LayoutRect(mainPane,
 AknLayoutScalable_Avkon::heading_pane(0));
 winRect.iTl.iY -= headingLayoutRect.Rect().Height();
 }
-_AKNTRACE( "[%s][%s] Rect: x[%d],y[%d],w[%d],h[%d]", "CAknQueryDialog", __FUNCTION__,
-		winRect.iTl.iX, winRect.iTl.iY, winRect.Width(),winRect.Height());
 SetRect(winRect);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 *
 */
 EXPORT_C void CAknQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 SetBorder( TGulBorder::ENone );
 SetEditableL( ETrue ) ;
 DoSetPromptL();
 CAknQueryControl* control = QueryControl();
 // Create CaptionRetriever for FEP
 delete iExtension;
 iExtension = NULL;
 iExtension = new(ELeave) CAknQueryDialogExtension(this);
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 *
 */
 EXPORT_C void CAknQueryDialog::PostLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryControl* control = QueryControl();
 if (control)
 control->StartAnimationL();
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 *
 */
 EXPORT_C TKeyResponse CAknQueryDialog::OfferKeyEventL(const TKeyEvent& aKeyEvent,
 TEventCode aType)
 {
-_AKNTRACE( "[%s][%s] aKeyEvent.iCode[%d],aType[%d]", "CAknQueryDialog", __FUNCTION__,aKeyEvent.iCode, aType);
 if( NeedToDismissQueryL(aKeyEvent) )
-	{
+return EKeyWasConsumed;
-	_AKNTRACE( "[%s][%s] Need Dismiss Query, return EKeyWasConsumed", "CAknQueryDialog", __FUNCTION__);
-	return EKeyWasConsumed;
-	}
 	if (aType == EEventKey && aKeyEvent.iCode == EKeyOK)
 		{
 		CAknQueryControl* control = QueryControl();
 		if (control)
 			{
 			if (IsLeftSoftkeyVisible())
 				{
 				TryExitL(EEikBidOk);
-				_AKNTRACE( "[%s][%s] TryExitL(EEikBidOk) and reutrn EKeyWasConsumed", "CAknQueryDialog", __FUNCTION__);
 				return EKeyWasConsumed;
 				}
 }
 		}
 	else if ( aType == EEventKey && aKeyEvent.iCode == EKeyEnter )
 		if (control)
 			{
 			if (IsLeftSoftkeyVisible())
 				{
 				TryExitL(EEikBidOk);
-				_AKNTRACE( "[%s][%s] TryExitL(EEikBidOk) and reutrn EKeyWasConsumed", "CAknQueryDialog", __FUNCTION__);
 				return EKeyWasConsumed;
 				}
 }
 		}
-	TKeyResponse response = CAknDialog::OfferKeyEventL(aKeyEvent,aType);
-	_AKNTRACE( "[%s][%s] return [%d]", "CAknQueryDialog", __FUNCTION__, response);
-	return response;
+return CAknDialog::OfferKeyEventL(aKeyEvent,aType);
 }
 /**
 * Allows dismissing of queries. Only mandatory requirement is that PIN
 * queries are dismissed by the # key. Clients can
 * override this and implement something different.
 *
 */
 EXPORT_C TBool CAknQueryDialog::NeedToDismissQueryL(const TKeyEvent& aKeyEvent)
 {
-_AKNTRACE( "[%s][%s] aKeyEvent.iScanCode [%d]", "CAknQueryDialog", __FUNCTION__, aKeyEvent.iScanCode);
 if (aKeyEvent.iScanCode == EStdKeyHash)
 {
 CAknQueryControl* control = QueryControl();
 if (control && control->QueryType() == EPinLayout)
 {
-_AKNTRACE( "[%s][%s] EPinLayout, Dismiss Query and return ETrue", "CAknQueryDialog", __FUNCTION__);
 DismissQueryL();
 return ETrue;
 }
 }
-_AKNTRACE( "[%s][%s] return EFalse", "CAknQueryDialog", __FUNCTION__);
 return EFalse;
 }
 /**
 * Dismiss query. Query is accepted if the left softkey is displayed
 * Query is discarded if the left softkey is not displayed.
 * Clients can override this and implement something different.
 */
 EXPORT_C void CAknQueryDialog::DismissQueryL()
 {
-_AKNTRACE_FUNC_ENTER;
 if (IsLeftSoftkeyVisible())
 {
-_AKNTRACE( "[%s][%s] TryExitL(EEikBidOk) ", "CAknQueryDialog", __FUNCTION__);
 TryExitL(EEikBidOk);
 }
 else
 {
-_AKNTRACE( "[%s][%s] TryExitL(EEikBidCancel) ", "CAknQueryDialog", __FUNCTION__);
 TryExitL(EEikBidCancel);
 }
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 *
 */
 EXPORT_C TBool CAknQueryDialog::OkToExitL(TInt aButtonId)
 {
-_AKNTRACE( "[%s][%s] aButtonId : %d ", "CAknQueryDialog", __FUNCTION__,aButtonId);
 if ( aButtonId == EAknSoftkeyEmergencyCall )
 {
 // ECS number entered and "call" softkey pressed,
 // send a key event to the query control to
 // initiate the call.
 CAknQueryControl* control = QueryControl();
 if ( control )
 {
-_AKNTRACE( "[%s][%s] AttemptEmergencyCall ", "CAknQueryDialog", __FUNCTION__);
 control->AttemptEmergencyCallL();
 }
-_AKNTRACE( "[%s][%s] return ETrue without doing anything", "CAknQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if((IsLeftSoftkeyVisible() &&
 (aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk))
 || aButtonId == GetRightCBAShortKeyPress() )
 {
-_AKNTRACE( "[%s][%s] return ETrue without doing anything ", "CAknQueryDialog", __FUNCTION__);
 return ETrue;
 }
-_AKNTRACE( "[%s][%s] return EFalse without doing anyting ", "CAknQueryDialog", __FUNCTION__);
 return EFalse;
 }
 /**
 * Return pointer to query heading or NULL (use QueryHeading())
 /**
 * Set prompt text for query.
 */
 EXPORT_C void CAknQueryDialog::SetPromptL(const TDesC& aPrompt)
 {
-_AKNTRACE_FUNC_ENTER;
 delete iPrompt;
 iPrompt = NULL;
 iPrompt = aPrompt.AllocL();
 DoSetPromptL();
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknQueryDialog::DoSetPromptL()
 {
 CAknQueryControl* control = QueryControl();
 return 0;
 }
 EXPORT_C void CAknQueryDialog::MakeLeftSoftkeyVisible(TBool aVisible)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aVisible: %d ", "CAknQueryDialog", __FUNCTION__, aVisible);
 CEikButtonGroupContainer& btnGroupContainer = ButtonGroupContainer();
 // left softkey
 TBool isVisible = btnGroupContainer.IsCommandVisibleByPosition(CEikButtonGroupContainer::ELeftSoftkeyPosition);
-_AKNTRACE( "[%s][%s] isVisible: %d ", "CAknQueryDialog", __FUNCTION__, isVisible);
 if ( isVisible != aVisible )
 {
 btnGroupContainer.MakeCommandVisibleByPosition(CEikButtonGroupContainer::ELeftSoftkeyPosition,aVisible);
 }
 if ( isVisible != aVisible )
 {
 btnGroupContainer.MakeCommandVisibleByPosition(CEikButtonGroupContainer::EMiddleSoftkeyPosition,aVisible);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAknQueryDialog::PlayTone()
 {
-_AKNTRACE_FUNC_ENTER;
 if (iTone != 0 && iSoundSystem)
 {
-_AKNTRACE( "[%s][%s] iSoundSystem->PlaySound(iTone)", "CAknQueryDialog", __FUNCTION__);
 iSoundSystem->PlaySound(iTone);
 }
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * Reset timers monitoring user inactivity. Will make applications
 * using these timers react, e.g. if the screen saver is running,
 * this will disactivate it (as from screen saver specs)
 */
 void CAknQueryDialog::ReportUserActivity() const
 {
-_AKNTRACE_FUNC_ENTER;
 #ifdef AVKON_RDEBUG_INFO
 RDebug::Print(_L("Reset user inactivity"));
 #endif
 User::ResetInactivityTime();
-_AKNTRACE_FUNC_EXIT;
 }
 TInt CAknQueryDialog::GetLeftCBAShortKeyPress()
 {
 return TInt16(0xffff & TInt16(ButtonGroupContainer().ButtonGroup()->CommandId(0)));
 return TInt16(0xffff & TInt16(ButtonGroupContainer().ButtonGroup()->CommandId(2)));
 }
 TBool CAknQueryDialog::IsLeftSoftkeyVisible()
 {
-_AKNTRACE_FUNC_ENTER;
+return ButtonGroupContainer().ButtonGroup()->IsCommandVisible(
-TBool visible = ButtonGroupContainer().ButtonGroup()->IsCommandVisible(
+ButtonGroupContainer().ButtonGroup()->CommandId(0));
-ButtonGroupContainer().ButtonGroup()->CommandId(0));
-_AKNTRACE( "[%s][%s] visible: %d", "CAknQueryDialog", __FUNCTION__, visible);
-_AKNTRACE_FUNC_EXIT;
-return visible;
 }
 /**
 * Sets emergency call support enabled. Must be called prior to PreLayoutDynamicInitL
 */
 EXPORT_C void CAknQueryDialog::SetEmergencyCallSupport( TBool aOnOff )
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aOnOff: %d", "CAknQueryDialog", __FUNCTION__, aOnOff);
 iFlags.Assign(CAknQueryControl::EEmergencyCallsEnabledByAPI, aOnOff );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknQueryDialog::SetPredictiveTextInputPermitted( TBool aPermitted )
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aPermitted: %d", "CAknQueryDialog", __FUNCTION__, aPermitted);
 iFlags.Assign( CAknQueryControl::EPredictiveTextEntryPermitted, aPermitted );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknQueryDialog::RemoveEditorIndicator()
 {
-_AKNTRACE_FUNC_ENTER;
 iFlags.Assign(CAknQueryControl::EEditorIndicatorOff,ETrue);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknQueryDialog::SetHeaderTextL(const TDesC& aHeader)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aHeader: %s", "CAknQueryDialog", __FUNCTION__, &aHeader);
 CAknPopupHeadingPane* controlHeading = QueryHeading();
 if (controlHeading)
 controlHeading->SetTextL(aHeader);
 LayoutAndDraw();
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * Show left CBA only if editor text is valid
 */
 CAknQueryControl*       /*aQueryControl*/,
 TQueryControlEvent      aEventType,
 TQueryValidationStatus  /*aStatus*/
 )
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aEventType: %d", "CAknQueryDialog", __FUNCTION__, aEventType);
 if (aEventType == EEmergencyCallAttempted)
 {
-_AKNTRACE( "[%s][%s] TryExitL(EEikBidCancel)", "CAknQueryDialog", __FUNCTION__);
 TryExitL(EEikBidCancel);
 }
 else
 {
 UpdateLeftSoftKeyL();
 }
-_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 EXPORT_C void CAknQueryDialog::SetHeaderImageL(CEikImage* aImage)
 {
 return GetMaxTextLength(aControl,aDataText,aApiValue);
 }
 EXPORT_C void CAknQueryDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
-CAknAppUi *appUi = iAvkonAppUi;
+if ( AknLayoutUtils::PenEnabled() )
-CCoeControl *redirectControl = NULL;
+{
-TRect rectToScreenOfControl;
+CAknTouchPane* touchPane = iAvkonAppUi->TouchPane();
-if (!Rect().Contains(aPointerEvent.iPosition))
-{
+if ( !Rect().Contains( aPointerEvent.iPosition ) && touchPane
-CAknTouchPane* touchPane = appUi->TouchPane();
+&& touchPane->IsVisible() )
-CEikStatusPane *statusPane = appUi->StatusPane();
-if ( touchPane && touchPane->IsVisible() )
 {
 // touchpane is a window-owning control -> Rect() cannot be used
-rectToScreenOfControl.SetRect( touchPane->Position(), touchPane->Size() );
+TRect touchPaneRect( touchPane->Position(), touchPane->Size() );
-redirectControl = touchPane;
-}
+if ( touchPaneRect.Contains( aPointerEvent.iParentPosition ) )
-else if ( statusPane && statusPane->IsVisible() &&
-Layout_Meta_Data::IsLandscapeOrientation() &&
-!IsFocused())
-{
-CCoeControl* cbControl = statusPane->ControlL(TUid::Uid(EEikStatusPaneUidCombined));
-if ( cbControl && !statusPane->IsFaded() )
 {
-rectToScreenOfControl.SetRect( cbControl->PositionRelativeToScreen(), cbControl->Size() );
+TPointerEvent pointerEvent( aPointerEvent );
-redirectControl = cbControl;
+// make event's coordinates touch pane relative
+pointerEvent.iPosition = aPointerEvent.iParentPosition -
+touchPaneRect.iTl;
+static_cast<CCoeControl*>( touchPane )->HandlePointerEventL(
+pointerEvent );
 }
 }
-}
+else
+{
-if ( redirectControl && rectToScreenOfControl.Contains(aPointerEvent.iParentPosition) )
+// Forward also those pointerevents that the dialog rect does not contain
-{
+CAknDialog::HandlePointerEventL( aPointerEvent );
-// make event's coordinates relative to new control.
+}
-TPointerEvent pointerEvent( aPointerEvent );
-pointerEvent.iPosition = aPointerEvent.iParentPosition - rectToScreenOfControl.iTl;
-redirectControl->HandlePointerEventL( pointerEvent );
-}
-else
-{
-// Forward also those pointerevents that the dialog rect does not contain
-CAknDialog::HandlePointerEventL( aPointerEvent );
 }
 }
 EXPORT_C void* CAknQueryDialog::ExtensionInterface( TUid /*aInterface*/ )
 {
 // number is entered to the query.
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CAknQueryDialog::SetEmergencyCallSupportForCBA( TBool aOnOff )
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aOnOff:%d ", "CAknQueryDialog", __FUNCTION__, aOnOff);
 if ( aOnOff )
 {
 // Ensure also that the EEmergencyCallsEnabledByAPI is set.
 iFlags.Assign( CAknQueryControl::EEmergencyCallsEnabledByAPI, aOnOff );
 }
 iFlags.Assign( CAknQueryControl::EEmergencyCallsCBASupport, aOnOff );
-_AKNTRACE_FUNC_EXIT;
 }
 /************************
 * Second phase construction required to align API with multiline queries
 * and because in future MAknQueryData will be used.
 */
 EXPORT_C CAknTextQueryDialog* CAknTextQueryDialog::NewL(TDes& aDataText, const TTone& aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 CAknTextQueryDialog* self = new (ELeave) CAknTextQueryDialog(aDataText, aTone);
 AKNTASHOOK_ADDL( self, "CAknTextQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 EXPORT_C CAknTextQueryDialog::CAknTextQueryDialog
 {
 }
 EXPORT_C CAknTextQueryDialog::~CAknTextQueryDialog()
 {
-	_AKNTRACE( "[%s][%s] ", "CAknTextQueryDialog", "~CAknTextQueryDialog");
 AKNTASHOOK_REMOVE();
 }
 EXPORT_C TBool CAknTextQueryDialog::CheckIfEntryTextOk() const
 {
 return EFalse;
 }
 EXPORT_C void CAknTextQueryDialog::SetDefaultInputMode(TInt aInputMode)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aInputMode:%d ", "CAknTextQueryDialog", __FUNCTION__,aInputMode);
 CAknQueryControl* control = QueryControl();
 if ( control )
 {
 CEikSecretEditor* secretEditor = STATIC_CAST(CEikSecretEditor*, control->ControlByLayoutOrNull( ECodeLayout ));
 if (secretEditor)
 {
 secretEditor->SetDefaultInputMode(aInputMode);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknTextQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryDialog::PreLayoutDynInitL();
 SetControlTextL();
 UpdateLeftSoftKeyL();
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknTextQueryDialog::SetMaxLength(TInt aLength)
 {
 *
 * @see IsLeftSoftkeyVisible
 */
 EXPORT_C TBool CAknTextQueryDialog::OkToExitL( TInt aButtonId )
 {
-_AKNTRACE( "[%s][%s] aButtonId:%d ", "CAknTextQueryDialog", __FUNCTION__,aButtonId);
 if ( aButtonId == EAknSoftkeyEmergencyCall )
 {
 // ECS number entered and "call" softkey pressed,
 // send a key event to the query control to
 // initiate the call.
 CAknQueryControl* control = QueryControl();
 if ( control )
 {
 control->AttemptEmergencyCallL();
 }
-_AKNTRACE( "[%s][%s] return ETrue ", "CAknTextQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if ( ( IsLeftSoftkeyVisible() &&
 ( aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk ) ) )
 {
 if ( control )
 {
 control->GetText( iDataText );
 }
-_AKNTRACE( "[%s][%s] GetText and return ETrue ", "CAknTextQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if( aButtonId == GetRightCBAShortKeyPress() )
 {
-_AKNTRACE( "[%s][%s] do nothing and return ETrue", "CAknTextQueryDialog", __FUNCTION__);
 return ETrue;
 }
-_AKNTRACE( "[%s][%s] return EFalse ", "CAknTextQueryDialog", __FUNCTION__);
 return EFalse;
 }
 void CAknTextQueryDialog::SetControlTextL()
 {
 * Second phase construction required to align API with multiline queries
 * and because in future MAknQueryData will be used.
 */
 EXPORT_C CAknNumberQueryDialog* CAknNumberQueryDialog::NewL(TInt& aNumber, const TTone& aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 CAknNumberQueryDialog* self = new (ELeave) CAknNumberQueryDialog(aNumber, aTone);
 AKNTASHOOK_ADDL( self, "CAknNumberQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 EXPORT_C CAknNumberQueryDialog::CAknNumberQueryDialog
 AKNTASHOOK_REMOVE();
 }
 EXPORT_C void CAknNumberQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryDialog::PreLayoutDynInitL();
 CAknQueryControl* control = QueryControl();
 if (control)
 control->SetNumberL(iNumber);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknNumberQueryDialog::SetMinimumAndMaximum( TInt aMinimumValue,
 TInt aMaximumValue)
 {
 }
 }
 EXPORT_C TBool CAknNumberQueryDialog::OkToExitL( TInt aButtonId )
 {
-_AKNTRACE( "[%s][%s] aButtonId:%d ", "CAknNumberQueryDialog", __FUNCTION__,aButtonId);
 if ( aButtonId == EAknSoftkeyEmergencyCall )
 {
 // ECS number entered and "call" softkey pressed,
 // send a key event to the query control to
 // initiate the call.
 CAknQueryControl* control = QueryControl();
 if ( control )
 {
 control->AttemptEmergencyCallL();
 }
-_AKNTRACE( "[%s][%s] attempt emergency and return ETrue ", "CAknNumberQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if ( aButtonId == GetRightCBAShortKeyPress() )
 {
-_AKNTRACE( "[%s][%s] do nothing and reutrn ETrue ", "CAknNumberQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if ( ( IsLeftSoftkeyVisible() &&
 ( aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk ) ) )
 {
 if ( control && control->CheckNumber() )
 {
 TRAP( e, control->PrepareForFocusLossL() );
 if ( e != KErrNone )
 {
-_AKNTRACE( "[%s][%s] reutrn EFalse ", "CAknNumberQueryDialog", __FUNCTION__);
 return EFalse;
 }
 iNumber = control->GetNumber();
-_AKNTRACE( "[%s][%s] get number and return ETrue ", "CAknNumberQueryDialog", __FUNCTION__);
 return ETrue;
 }
 }
-_AKNTRACE( "[%s][%s] return EFalse", "CAknNumberQueryDialog", __FUNCTION__);
 return EFalse;
 }
 EXPORT_C void CAknNumberQueryDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
 * Second phase construction required to align API with multiline queries
 * and because in future MAknQueryData will be used.
 */
 EXPORT_C CAknTimeQueryDialog* CAknTimeQueryDialog::NewL(TTime& aTime, const TTone& aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 CAknTimeQueryDialog* self = new (ELeave) CAknTimeQueryDialog(aTime, aTone);
 AKNTASHOOK_ADDL( self, "CAknTimeQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 EXPORT_C CAknTimeQueryDialog::CAknTimeQueryDialog
 (TTime& aTime, const TTone& aTone) : CAknQueryDialog(aTone), iTime(aTime)
 AKNTASHOOK_REMOVE();
 }
 EXPORT_C void CAknTimeQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryDialog::PreLayoutDynInitL();
 CAknQueryControl* control = QueryControl();
 if (control)
 control->SetTime(iTime);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknTimeQueryDialog::SetMinimumAndMaximum( const TTime& aMinimum,
 const TTime& aMaximum)
 {
 }
 }
 EXPORT_C TBool CAknTimeQueryDialog::OkToExitL(TInt aButtonId)
 {
-_AKNTRACE( "[%s][%s] aButtonId:%d ", "CAknTimeQueryDialog", __FUNCTION__,aButtonId);
 if((IsLeftSoftkeyVisible() &&
 (aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk)))
 {
 CAknQueryControl* control = QueryControl();
 if ( control )
 {
 iTime = control->GetTime();
 }
-_AKNTRACE( "[%s][%s] get time and return ETrue ", "CAknTimeQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if(aButtonId == GetRightCBAShortKeyPress())
-	{
+return ETrue;
-	_AKNTRACE( "[%s][%s] do nothing, return ETrue ", "CAknTimeQueryDialog", __FUNCTION__);
-	return ETrue;
-	}
-_AKNTRACE( "[%s][%s] do nothing and return EFalse ", "CAknTimeQueryDialog", __FUNCTION__);
 return EFalse;
 }
 EXPORT_C void CAknTimeQueryDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
 * Second phase construction required to align API with multiline queries
 * and because in future MAknQueryData will be used.
 */
 EXPORT_C CAknDurationQueryDialog* CAknDurationQueryDialog::NewL(TTimeIntervalSeconds& aDuration, const TTone& aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 CAknDurationQueryDialog* self = new (ELeave) CAknDurationQueryDialog(aDuration, aTone);
 AKNTASHOOK_ADDL( self, "CAknDurationQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 EXPORT_C CAknDurationQueryDialog::CAknDurationQueryDialog
 (TTimeIntervalSeconds& aDuration, const TTone& aTone) : CAknQueryDialog(aTone), iDuration(aDuration)
 AKNTASHOOK_REMOVE();
 }
 EXPORT_C void CAknDurationQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryDialog::PreLayoutDynInitL();
 CAknQueryControl* control = QueryControl();
 if (control)
 control->SetDuration(iDuration);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknDurationQueryDialog::SetMinimumAndMaximum( const TTimeIntervalSeconds& aMinimumDuration,
 const TTimeIntervalSeconds& aMaximumDuration)
 {
 }
 }
 EXPORT_C TBool CAknDurationQueryDialog::OkToExitL(TInt aButtonId)
 {
-	_AKNTRACE( "[%s][%s] aButtonId:%d ", "CAknDurationQueryDialog", __FUNCTION__,aButtonId);
 if((IsLeftSoftkeyVisible() &&
 (aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk)))
 {
 CAknQueryControl* control = QueryControl();
 if ( control )
 {
 iDuration = control->GetDuration();
 }
-_AKNTRACE( "[%s][%s] get duration and return ETrue ", "CAknDurationQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if(aButtonId == GetRightCBAShortKeyPress())
 {
-_AKNTRACE( "[%s][%s] do nothing, return ETrue ", "CAknDurationQueryDialog", __FUNCTION__);
 return ETrue;
 }
-_AKNTRACE( "[%s][%s] return ETrue ", "CAknDurationQueryDialog", __FUNCTION__);
 return EFalse;
 }
 EXPORT_C void CAknDurationQueryDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
 AKNTASHOOK_REMOVE();
 }
 EXPORT_C void CAknFloatingPointQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryDialog::PreLayoutDynInitL();
 CAknQueryControl* control = QueryControl();
 if ( control )
 {
 control->SetQueryControlObserver(this);
 control->SetFloatingPointNumberL(&iNumber);
 DoSetPromptL();
 }
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknFloatingPointQueryDialog::SetMinimumAndMaximum( const TReal& aMinimumNumber,
 const TReal& aMaximumNumber)
 {
 }
 }
 EXPORT_C TBool CAknFloatingPointQueryDialog::OkToExitL(TInt aButtonId)
 {
-_AKNTRACE( "[%s][%s] aButtonId :%d ", "CAknFloatingPointQueryDialog", __FUNCTION__,aButtonId);
 if((IsLeftSoftkeyVisible() &&
 (aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk)))
 {
 CAknQueryControl* control = QueryControl();
 if ( control )
 {
 iNumber = control->GetFloatingPointNumberL();
 }
-_AKNTRACE( "[%s][%s] Get Floatingpoint number and return ETrue ", "CAknFloatingPointQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if(aButtonId == GetRightCBAShortKeyPress())
 {
-_AKNTRACE( "[%s][%s] do nothing, return ETrue ", "CAknFloatingPointQueryDialog", __FUNCTION__);
 return ETrue;
 }
-_AKNTRACE( "[%s][%s] return ETrue ", "CAknFloatingPointQueryDialog", __FUNCTION__);
 return EFalse;
 }
 EXPORT_C void CAknFloatingPointQueryDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
 EXPORT_C void CAknMultiLineDataQueryDialog::SetPromptL(const TDesC& aFP, const TDesC& aSP)
 //
 //Store new prompt values
 //
 {
-_AKNTRACE_FUNC_ENTER;
 delete iSecondPrompt;
 iSecondPrompt = NULL;
 iSecondPrompt = aSP.AllocL();
 CAknQueryDialog::SetPromptL(aFP);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknMultiLineDataQueryDialog::DoSetPromptL()
 {
-_AKNTRACE_FUNC_ENTER;
 //
 //Set prompt in query controls, called during layout
 //
 CAknMultilineQueryControl* secondControl = SecondControl();
 if(secondControl && iSecondPrompt && iSecondPrompt->Length())
 secondControl->SetPromptL(*iSecondPrompt);
 CAknQueryDialog::DoSetPromptL();
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * Allows dismissing of queries. Same as base class implementation only take into
 * consideration both controls
 HandleOrientationSwitch();
 UpdateLeftSoftKeyL();
 		return ETrue;
 		}
 return EFalse;
 }
 TBool CAknMultiLineDataQueryDialog::FirstLineEnabled() const
 return -1;
 }
 void CAknMultiLineDataQueryDialog::HandleOrientationSwitch()
 {
-	_AKNTRACE_FUNC_ENTER;
 	TBool firstLineEnabled = FirstLineEnabled();
 	TBool secondLineEnabled = SecondLineEnabled();
 if (!firstLineEnabled && !secondLineEnabled)
 {
 	ctrl1->SetLatentGroupLineFollows(!firstLineEnabled);
 	ctrl2->SetLatentGroupLineFollows(!secondLineEnabled);
 	ctrl1->SetFocusing(firstLineEnabled);
 	ctrl2->SetFocusing(secondLineEnabled);
 	Layout();
-	_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknMultiLineDataQueryDialog::HandleResourceChange(TInt aType)
 {
-	_AKNTRACE_FUNC_ENTER;
 	CAknQueryDialog::HandleResourceChange(aType);
 	if (aType == KEikDynamicLayoutVariantSwitch)
 		{
 if (Layout_Meta_Data::IsLandscapeOrientation())
 {
 SetBorder(AknBorderId::EAknBorderNotePopup);
 }
 		HandleOrientationSwitch();
 		TRAP_IGNORE( UpdateLeftSoftKeyL() );
 		}
-	_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C TBool CAknMultiLineDataQueryDialog::OkToExitL(TInt aButtonId)
 {
-_AKNTRACE( "[%s][%s] aButtonId :%d ", "CAknMultiLineDataQueryDialog", __FUNCTION__, aButtonId);
 if (Layout_Meta_Data::IsLandscapeOrientation())
 	{
 if((IsLeftSoftkeyVisible() &&
 (aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk)))
 {
 				CEikCaptionedControl *ctrl2 = GetLineByLineAndPageIndex(line2, 0);
 				TryChangeFocusToL(ctrl2->iId);
 HandleOrientationSwitch();
 UpdateLeftSoftKeyL();
-_AKNTRACE( "[%s][%s] return EFalse", "CAknMultiLineDataQueryDialog", __FUNCTION__);
-return EFalse;
+		return EFalse;
 		}
 	}
 	}
 if((IsLeftSoftkeyVisible() &&
 (aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk)))
 secondControl->GetText( ptext );
 iSecondText->Copy( *text );
 CleanupStack::PopAndDestroy( text );
 }
 }
-_AKNTRACE( "[%s][%s] return ETrue ", "CAknMultiLineDataQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if(aButtonId == GetRightCBAShortKeyPress())
 {
-_AKNTRACE( "[%s][%s] do nothing,return ETrue  ", "CAknMultiLineDataQueryDialog", __FUNCTION__);
 return ETrue;
 }
-_AKNTRACE( "[%s][%s] do nothing,return EFalse ", "CAknMultiLineDataQueryDialog", __FUNCTION__);
 return EFalse;
 }
 EXPORT_C void CAknMultiLineDataQueryDialog::UpdateLeftSoftKeyL()
 {
 if (Layout_Meta_Data::IsLandscapeOrientation())
 	{
 	    if ( (FirstControl()->EditorContentIsValidL() && FirstControl()->IsFocused()) || (SecondControl()->EditorContentIsValidL() && FirstControl()->EditorContentIsValidL()) )
 	        {
 	        MakeLeftSoftkeyVisible(ETrue);
 TDesC* aPrompt,
 TDesC* aPrompt2,
 const TTone& aTone)
 : CAknQueryDialog(aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 TRAPD(ignore, SetPromptL(DesOrNull(aPrompt), DesOrNull(aPrompt2)));
 TRAP(ignore,SetDataL(*aTime,*aTime2));
 AKNTASHOOK_ADD( this, "CAknMultiLineDataQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknMultiLineDataQueryDialog::CAknMultiLineDataQueryDialog( TDes* aDataText,
 TDes* aDataText2,
 TDesC* aPrompt,
 TDesC* aPrompt2,
 const TTone& aTone)
 : CAknQueryDialog(aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 TRAPD(ignore, SetPromptL(DesOrNull(aPrompt), DesOrNull(aPrompt2)));
 TRAP(ignore,SetDataL(*aDataText,*aDataText2));
 iText = aDataText;
 iSecondText = aDataText2;
 AKNTASHOOK_ADD( this, "CAknMultiLineDataQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknMultiLineDataQueryDialog::CAknMultiLineDataQueryDialog( TDes* aDataText,
 TTime* aTime,
 TDesC* aPrompt,
 TDesC* aPrompt2,
 const TTone& aTone)
 : CAknQueryDialog(aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 TRAPD(ignore, SetPromptL(DesOrNull(aPrompt), DesOrNull(aPrompt2)));
 TRAP(ignore,SetDataL(*aDataText,*aTime));
 iText = aDataText;
 AKNTASHOOK_ADD( this, "CAknMultiLineDataQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknMultiLineDataQueryDialog::CAknMultiLineDataQueryDialog( TDes* aDataText,
 TInt* aNumber,
 TDesC* aPrompt,
 TDesC* aPrompt2,
 const TTone& aTone)
 : CAknQueryDialog(aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 TRAPD(ignore, SetPromptL(DesOrNull(aPrompt), DesOrNull(aPrompt2)));
 TRAP(ignore,SetDataL(*aDataText,*aNumber));
 iText = aDataText;
 AKNTASHOOK_ADD( this, "CAknMultiLineDataQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknMultiLineDataQueryDialog::CAknMultiLineDataQueryDialog( TInt* aNumber,
 TInt* aNumber2,
 TDesC* aPrompt,
 TDesC* aPrompt2,
 const TTone& aTone)
 : CAknQueryDialog(aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 TRAPD(ignore, SetPromptL(DesOrNull(aPrompt), DesOrNull(aPrompt2)));
 TRAP(ignore,SetDataL(*aNumber,*aNumber2));
 AKNTASHOOK_ADD( this, "CAknMultiLineDataQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknMultiLineDataQueryDialog::CAknMultiLineDataQueryDialog( TDes* aDataText,
 TTimeIntervalSeconds* aDuration,
 TDesC* aPrompt,
 TDesC* aPrompt2,
 const TTone& aTone)
 : CAknQueryDialog(aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 TRAPD(ignore, SetPromptL(DesOrNull(aPrompt), DesOrNull(aPrompt2)));
 TRAP(ignore,SetDataL(*aDataText,*aDuration));
 iText = aDataText;
 AKNTASHOOK_ADD( this, "CAknMultiLineDataQueryDialog" );
 TDesC* aPrompt,
 TDesC* aPrompt2,
 const TTone& aTone)
 : CAknQueryDialog(aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 TRAPD(ignore, SetPromptL(DesOrNull(aPrompt), DesOrNull(aPrompt2)));
 TRAP(ignore,SetDataL(*aTime,*aDuration));
 AKNTASHOOK_ADD( this, "CAknMultiLineDataQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknMultiLineDataQueryDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
 CAknQueryDialog::HandlePointerEventL(aPointerEvent);
 * Second phase construction required to align API with multiline queries
 * and because in future MAknQueryData will be used.
 */
 EXPORT_C CAknIpAddressQueryDialog* CAknIpAddressQueryDialog::NewL(TInetAddr& aInetAddr, const TTone& aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 CAknIpAddressQueryDialog* self = new (ELeave) CAknIpAddressQueryDialog(aInetAddr, aTone);
 AKNTASHOOK_ADDL( self, "CAknIpAddressQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 CAknIpAddressQueryDialog::CAknIpAddressQueryDialog
 (TInetAddr& aInetAddr, const TTone& aTone) : CAknQueryDialog(aTone), iInetAddr(aInetAddr)
 {
 }
 EXPORT_C CAknIpAddressQueryDialog::~CAknIpAddressQueryDialog()
 {
-_AKNTRACE_FUNC_ENTER;
 AKNTASHOOK_REMOVE();
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknIpAddressQueryDialog::SetSizeAndPosition(
 const TSize& aSize )
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aSize (W[%d],H[%d]) ", "CAknIpAddressQueryDialog", __FUNCTION__, aSize.iWidth, aSize.iHeight);
 CAknExtQueryControl* control = STATIC_CAST(CAknExtQueryControl*,QueryControl());
 if(control)
 {
 if ( AknLayoutUtils::PenEnabled() )
 {
 layoutHeading.LayoutRect(mainPane, headingL);
 TRect headRect(layoutHeading.Rect());
 winRect.iTl.iY -= headRect.Height();
 }
-_AKNTRACE( "[%s][%s] winRect(x[%d], y[%d], W[%d], H[%d] ) ",
-		"CAknIpAddressQueryDialog", __FUNCTION__, winRect.iTl.iX, winRect.iTl.iY,
-		winRect.Width(), winRect.Height());
 SetRect(winRect);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknQueryControl* CAknIpAddressQueryDialog::QueryControl() const
 {
 CCoeControl* controlPtr = FindControlOnAnyPageWithControlType(EAknExtCtQuery);
 return 0;
 }
 EXPORT_C void CAknIpAddressQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 #ifndef RD_NO_DIALOG_BORDERS
 SetBorder(AknBorderId::EAknBorderNotePopup);
 #else
 SetBorder(TGulBorder::ENone);
 #endif
 }
 // Create CaptionRetriever for FEP
 delete iExtension;
 iExtension = NULL;
 iExtension = new(ELeave) CAknQueryDialogExtension(this);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknIpAddressQueryDialog::PostLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknExtQueryControl* control = STATIC_CAST(CAknExtQueryControl*,QueryControl());
 if (control)
 control->StartAnimationL();
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C TBool CAknIpAddressQueryDialog::NeedToDismissQueryL(const TKeyEvent& /*aKeyEvent*/)
 {
 return EFalse;
 }
 }
 EXPORT_C TBool CAknIpAddressQueryDialog::OkToExitL(TInt aButtonId)
 {
-_AKNTRACE( "[%s][%s] aButtonId : %d ",
-		"CAknIpAddressQueryDialog", __FUNCTION__, aButtonId);
 if((IsLeftSoftkeyVisible() &&
 (aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk)))
 {
 CAknExtQueryControl* control = STATIC_CAST(CAknExtQueryControl*,QueryControl());
 if ( control )
 {
 iInetAddr = control->GetInetAddress();
 }
-_AKNTRACE( "[%s][%s] get address and return ETrue", "CAknIpAddressQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if(aButtonId == GetRightCBAShortKeyPress())
 {
-_AKNTRACE( "[%s][%s] do nothing, return ETrue", "CAknIpAddressQueryDialog", __FUNCTION__);
 return ETrue;
 }
-_AKNTRACE( "[%s][%s] do nothing, return EFalse", "CAknIpAddressQueryDialog", __FUNCTION__);
 return EFalse;
 }
 EXPORT_C void CAknIpAddressQueryDialog::UpdateLeftSoftKeyL()
 * Second phase construction required to align API with multiline queries
 * and because in future MAknQueryData will be used.
 */
 EXPORT_C CAknFixedPointQueryDialog* CAknFixedPointQueryDialog::NewL(TInt& aNumber, const TTone& aTone)
 {
-_AKNTRACE_FUNC_ENTER;
 CAknFixedPointQueryDialog* self = new (ELeave) CAknFixedPointQueryDialog(aNumber, aTone);
 AKNTASHOOK_ADDL( self, "CAknFixedPointQueryDialog" );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 CAknFixedPointQueryDialog::CAknFixedPointQueryDialog
 (TInt& aNumber, const TTone& aTone) : CAknQueryDialog(aTone), iNumber(aNumber)
 AKNTASHOOK_REMOVE();
 }
 EXPORT_C void CAknFixedPointQueryDialog::SetSizeAndPosition(
 const TSize& aSize )
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s] aSize (W[%d],H[%d]) ", "CAknFixedPointQueryDialog", __FUNCTION__, aSize.iWidth, aSize.iHeight);
 CAknExtQueryControl* control = STATIC_CAST(CAknExtQueryControl*,QueryControl());
 if(control)
 {
 if ( AknLayoutUtils::PenEnabled() )
 {
 layoutHeading.LayoutRect(mainPane, headingL);
 TRect headRect(layoutHeading.Rect());
 winRect.iTl.iY -= headRect.Height();
 }
-_AKNTRACE( "[%s][%s] winRect(x[%d], y[%d], W[%d], H[%d] ) ",
-"CAknFixedPointQueryDialog", __FUNCTION__, winRect.iTl.iX, winRect.iTl.iY,
-winRect.Width(), winRect.Height());
 SetRect(winRect);
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknQueryControl* CAknFixedPointQueryDialog::QueryControl() const
 {
 CCoeControl* controlPtr = FindControlOnAnyPageWithControlType(EAknExtCtQuery);
 return 0;
 }
 EXPORT_C void CAknFixedPointQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 #ifndef RD_NO_DIALOG_BORDERS
 SetBorder(AknBorderId::EAknBorderNotePopup);
 #else
 SetBorder(TGulBorder::ENone);
 #endif
 }
 // Create CaptionRetriever for FEP
 delete iExtension;
 iExtension = NULL;
 iExtension = new(ELeave) CAknQueryDialogExtension(this);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknFixedPointQueryDialog::PostLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 CAknExtQueryControl* control = STATIC_CAST(CAknExtQueryControl*,QueryControl());
 if (control)
 control->StartAnimationL();
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C TBool CAknFixedPointQueryDialog::NeedToDismissQueryL(const TKeyEvent& /*aKeyEvent*/)
 {
 return EFalse;
 }
 }
 EXPORT_C TBool CAknFixedPointQueryDialog::OkToExitL(TInt aButtonId)
 {
-_AKNTRACE( "[%s][%s] aButtonId : %d  ", "CAknFixedPointQueryDialog", __FUNCTION__, aButtonId);
 if((IsLeftSoftkeyVisible() &&
 (aButtonId == GetLeftCBAShortKeyPress() || aButtonId == EEikBidOk)))
 {
 CAknExtQueryControl* control = STATIC_CAST(CAknExtQueryControl*,QueryControl());
 if ( control )
 {
 iNumber = control->GetFixedPointNumber();
 }
-_AKNTRACE( "[%s][%s] get point number and return ETrue ", "CAknFixedPointQueryDialog", __FUNCTION__);
 return ETrue;
 }
 else if(aButtonId == GetRightCBAShortKeyPress())
 {
-_AKNTRACE( "[%s][%s] do nothing and return ETrue ", "CAknFixedPointQueryDialog", __FUNCTION__);
 return ETrue;
 }
-_AKNTRACE( "[%s][%s] return EFalse ", "CAknFixedPointQueryDialog", __FUNCTION__);
 return EFalse;
 }
 EXPORT_C void CAknFixedPointQueryDialog::UpdateLeftSoftKeyL()
 }
 EXPORT_C void CAknMultiLineIpQueryDialog::PreLayoutDynInitL()
 {
-_AKNTRACE_FUNC_ENTER;
 if (Layout_Meta_Data::IsLandscapeOrientation())
 {
 SetBorder( TGulBorder::ENone );
 }
 SetEditableL( ETrue );
 // Create CaptionRetriever for FEP
 delete iExtension;
 iExtension = NULL;
 iExtension = new(ELeave) CAknMultilineQueryDialogExtension(this, CAknMultilineQueryDialogExtension::EMultIPQuery);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknMultiLineIpQueryDialog::SetPromptL(const TDesC& aFP, const TDesC& aSP)
 //
 //Store new prompt values
 return -1;
 }
 void CAknMultiLineIpQueryDialog::HandleOrientationSwitch()
 {
-_AKNTRACE_FUNC_ENTER;
 TBool firstLineEnabled = FirstLineEnabled();
 TBool secondLineEnabled = SecondLineEnabled();
 if (!firstLineEnabled && !secondLineEnabled)
 {
 ctrl1->SetLatentGroupLineFollows(!firstLineEnabled);
 ctrl2->SetLatentGroupLineFollows(!secondLineEnabled);
 ctrl1->SetFocusing(firstLineEnabled);
 ctrl2->SetFocusing(secondLineEnabled);
 Layout();
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknMultiLineIpQueryDialog::HandleResourceChange(TInt aType)
 {
-	_AKNTRACE_FUNC_ENTER;
 CAknQueryDialog::HandleResourceChange(aType);
 if (aType == KEikDynamicLayoutVariantSwitch)
 {
 if (Layout_Meta_Data::IsLandscapeOrientation())
 {
 SetBorder(AknBorderId::EAknBorderNotePopup);
 }
 HandleOrientationSwitch();
 TRAP_IGNORE( UpdateLeftSoftKeyL() );
 }
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C TBool CAknMultiLineIpQueryDialog::OkToExitL(TInt aButtonId)
 {
 if (Layout_Meta_Data::IsLandscapeOrientation())

branch	RCL_3
changeset 55	aecbbf00d063
parent 51	fcdfafb36fe7
child 56	d48ab3b357f1