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

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 /*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <StringLoader.h>
 #include <AknTasHook.h> // for testability hooks
 #include <tacticon.h>
-#include "akntrace.h"
 const TInt KPinCodeTacticonInterval = 30000000; // 30s
-const TInt KPinCodeMaxTacticons = 5;
+const TInt KPinCodeMaxTacticons = 10;
 /*******
 * CAknQueryControlExtension
 */
 NONSHARABLE_CLASS(CAknQueryControlExtension) : public CBase
 TInt iPinTacticonsPlayed;
 };
 CAknQueryControlExtension::~CAknQueryControlExtension()
 {
-_AKNTRACE_FUNC_ENTER;
 delete iOriginalPrompt;
 delete iBackspaceButton;
 delete iKeypad;
 delete iPinTacticonTimer;
 iPinTacticonTimer = NULL;
-_AKNTRACE_FUNC_EXIT;
 }
 CAknLocationEditor *CAknQueryControl::LocationEd() const
 {
 if (iExtension)
 * CAknQueryExtension
 *****************************/
 void CAknQueryExtension::CreateEditorContextL()
 {
-_AKNTRACE_FUNC_ENTER;
 delete iEditorContext;
 iEditorContext = NULL;
 iEditorContext = CAknsFrameBackgroundControlContext::NewL(
 KAknsIIDQsnFrInput, TRect(0,0,1,1), TRect(0,0,1,1), EFalse );
-_AKNTRACE_FUNC_EXIT;
 }
 CAknsFrameBackgroundControlContext* CAknQueryExtension::EditorContext()
 {
 return iEditorContext;
 }
 void CAknQueryExtension::CreateExtensionL(
 const CAknQueryControl* aQueryControl )
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryExtension* extension = CAknQueryExtension::NewL();
 CleanupStack::PushL( extension );
 AknsPointerStore::StorePointerL(
 static_cast<const CBase*>(aQueryControl), extension );
 CleanupStack::Pop(); // extension
-_AKNTRACE_FUNC_EXIT;
 }
 void CAknQueryExtension::DestroyExtension(
 const CAknQueryControl* aQueryControl )
 {
-_AKNTRACE_FUNC_ENTER;
 delete Instance( aQueryControl );
 AknsPointerStore::RemovePointer(
 static_cast<const CBase*>(aQueryControl) );
-_AKNTRACE_FUNC_EXIT;
 }
 CAknQueryExtension* CAknQueryExtension::NewL()
 {
 return new (ELeave) CAknQueryExtension();
 }
 CAknQueryExtension::~CAknQueryExtension()
 {
 delete iEditorContext;
-_AKNTRACE( "[%s][%s]exit", "CAknQueryExtension", "~CAknQueryExtension" );
 }
 /*****************************
 * TAknQueryEcsObserver
 *****************************/
 EXPORT_C void TAknQueryEcsObserver::HandleEcsEvent( CAknEcsDetector* /*aDetector*/,
 CAknEcsDetector::TState aUpdatedState )
 {
-	_AKNTRACE( "[%s][%s] aUpdatedState: %d", "TAknQueryEcsObserver", __FUNCTION__,aUpdatedState);
+TRAP_IGNORE( iParent->SetEcsCbaVisibleL( aUpdatedState == CAknEcsDetector::ECompleteMatch ) );
-TRAP_IGNORE( iParent->SetEcsCbaVisibleL( aUpdatedState == CAknEcsDetector::ECompleteMatch ||
-aUpdatedState == CAknEcsDetector::EServiceNumMatch ) );
 // Hide the emergency call number again.
 // Number should be visible only in Partial or Complete match state
 if ( aUpdatedState != CAknEcsDetector::EPartialMatch &&
-aUpdatedState != CAknEcsDetector::ECompleteMatch &&
+aUpdatedState != CAknEcsDetector::ECompleteMatch  )
-aUpdatedState != CAknEcsDetector::EServiceNumMatch )
 {
 if ( iParent->QueryType() == EPinLayout )
 {
-_AKNTRACE( "[%s][%s] ", "RevealSecretText( EFalse )", __FUNCTION__);
+static_cast<CAknNumericSecretEditor*>
-if( iParent->ControlByLayoutOrNull( EPinLayout ) )
+( iParent->ControlByLayoutOrNull( EPinLayout ) )->RevealSecretText( EFalse );
-	{
-				static_cast<CAknNumericSecretEditor*>
-					( iParent->ControlByLayoutOrNull( EPinLayout ) )->RevealSecretText( EFalse );
-	}
 }
 }
 // This check must be last action in the routine.
 // If the query is cancelled, the iParent is deleted!
 if ( aUpdatedState == CAknEcsDetector::ECallAttempted )
 {
-_AKNTRACE( "[%s][%s] ", "cancel query", __FUNCTION__);
 TRAP_IGNORE( iParent->CancelQueryL() );
 }
-_AKNTRACE_FUNC_EXIT;
 }
 const TInt KMaxLinesInQuery=5;
 /**
 *
 */
 EXPORT_C CAknQueryControl::~CAknQueryControl()
 {
-	_AKNTRACE( "[%s][%s] enter", "CAknQueryControl", "~CAknQueryControl");
 AKNTASHOOK_REMOVE();
 	if (iEdwin)
 AknsUtils::DeregisterControlPosition(iEdwin);
 else if (iNumberEdwin)
 AknsUtils::DeregisterControlPosition(iNumberEdwin);
 #if defined( RD_SCALABLE_UI_V2)
 delete iIncreaseValueButton;
 delete iDecreaseValueButton;
 #endif //defined( RD_SCALABLE_UI_V2)
-_AKNTRACE( "[%s][%s] exit", "CAknQueryControl", "~CAknQueryControl");
 }
 /**
 * Construct from resource
 */
 EXPORT_C void CAknQueryControl::ConstructFromResourceL(TResourceReader &aRes)
 {
-_AKNTRACE_FUNC_ENTER;
 // Construct extension
 CAknQueryExtension::CreateExtensionL( this );
-iExtension = new (ELeave)CAknQueryControlExtension;
+	iExtension = new (ELeave)CAknQueryControlExtension;
 iEcsObserver   = new (ELeave) TAknQueryEcsObserver(this);
 iEditIndicator = CAknQueryEditIndicator::NewL(this);
 iEditIndicator->SetObserver(this);
 cba->SetPosition( TPoint( 0, 0 ) );
 iExtension->iKeypad = CAknKeypad::NewL( *this, iQueryType );
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAknQueryControl::ConstructQueryL(TResourceReader& aRes)
 {
-_AKNTRACE( "[%s][%s] iQueryType : %d", "CAknQueryControl", "ConstructQueryL", iQueryType );
 switch(iQueryType)
 {
 case EConfirmationQueryLayout:
 {
 TPtrC bmpFile=aRes.ReadTPtrC();
 CAknQueryExtension* extension = QueryExtension();
 if( extension )
 {
 extension->CreateEditorContextL();
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TInt CAknQueryControl::PinCodeTimeoutCallback( TAny* aThis )
 {
-_AKNTRACE_FUNC_ENTER;
 // play tacticon
 static_cast<CAknQueryControl*>( aThis )->PlayPinCodeTacticon();
-_AKNTRACE_FUNC_EXIT;
 return KErrNone;
 }
 void CAknQueryControl::PlayPinCodeTacticon()
 {
-_AKNTRACE_FUNC_ENTER;
 // play tacticon
 RTacticon client;
 if ( KErrNone == client.Connect() )
 	{
 	client.PlayTacticon( ENeutralTacticon );
 {
 // max amount reached, stop timer for good
 StopPinCodeTacticonTimer();
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAknQueryControl::ResetPinCodeTacticonTimer()
 {
-_AKNTRACE_FUNC_ENTER;
 // stop old timer
 StopPinCodeTacticonTimer();
 if ( iExtension )
 {
 iExtension->iPinTacticonTimer->Start(
 KPinCodeTacticonInterval, KPinCodeTacticonInterval,
 TCallBack( PinCodeTimeoutCallback, this ) );
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CAknQueryControl::StopPinCodeTacticonTimer()
 {
-_AKNTRACE_FUNC_ENTER;
 if ( iExtension )
 {
 // delete timer
 delete iExtension->iPinTacticonTimer;
 // set the timer null, so that it will not be used again
 iExtension->iPinTacticonTimer = NULL;
 }
-_AKNTRACE_FUNC_EXIT;
 }
 ///
 /// CCoeControl methods
 ///
 /**
 * Forward key event to the editor
 */
 EXPORT_C TKeyResponse CAknQueryControl::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType)
 {
-_AKNTRACE( "[%s][%s] aKeyEvent.iCode :%d, aType:%d ", "CAknQueryControl", __FUNCTION__, aKeyEvent.iCode, aType);
 TKeyResponse response( EKeyWasNotConsumed );
 // Send key handling for emergency call support
 if ( aKeyEvent.iCode == EKeyYes )
 {
 iQueryType == EPinLayout && response == EKeyWasConsumed )
 {
 ResetPinCodeTacticonTimer();
 }
 }
-_AKNTRACE_FUNC_EXIT;
 return response;
 }
 /**
 * Handle a focus changed
 // Manage appearance of the PIN query
 // If match is complete, or complete + Send key, show the number
 TBool reveal = EFalse;
 TInt ecsState( iEcsDetector->State() );
 if ( ( ecsState == CAknEcsDetector::ECompleteMatch ) ||
-( ecsState == CAknEcsDetector::EServiceNumMatch ) ||
 ( ecsState == CAknEcsDetector::ECompleteMatchThenSendKey ) )
 {
 // Further check to ensure that the matched number is the entire buffer
 // Get the matched text and see if is the same length as the current query length
 if ( GetTextLength() == iEcsDetector->CurrentMatch().Length() )
 {
 reveal = ETrue;
-if ( ecsState == CAknEcsDetector::ECompleteMatch ||
+if ( ecsState == CAknEcsDetector::ECompleteMatch )
-ecsState == CAknEcsDetector::EServiceNumMatch )
 {
 SetEcsCbaVisibleL( ETrue );
 }
 }
 }
-_AKNTRACE( "[%s][%s] iPinEdwin->RevealSecretText( %d )", "CAknQueryControl", __FUNCTION__, reveal);
 iPinEdwin->RevealSecretText( reveal );
 }
 }
 }
 * from within some other non-key event that subsequently does not require references to the object
 *
 */
 void CAknQueryControl::CancelQueryL()
 {
-_AKNTRACE_FUNC_ENTER;
 if (iQueryControlObserver)
 {
 iQueryControlObserver->HandleQueryEditorStateEventL(this, MAknQueryControlObserver::EEmergencyCallAttempted, MAknQueryControlObserver::EEditorValueValid);
 }
 else
 key.iCode=EKeyEscape;
 key.iModifiers=0;
 key.iScanCode = EStdKeyNull;
 iEikonEnv->SimulateKeyEventL(key, EEventKey);
 }
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * This method looks at the flags that have been set in the query control and
 * acts upon them if possible
 iEditIndicator->SetFlags( aFlags );
 }
 EXPORT_C void CAknQueryControl::SetImageL(CEikImage* aImage)
 { // Gets ownership of the aImage
-_AKNTRACE_FUNC_ENTER;
 	if ( iImage && iImage->IsPictureOwnedExternally() )
 {
 delete ((CApaMaskedBitmap*) iImage->Bitmap());
 }
 delete iAnimation;
 iAnimation = NULL;
 Layout();
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknQueryControl::SetImageL(const TDesC& aImageFile,
 TInt aBmpId, TInt aBmpMaskId)
 {
-_AKNTRACE_FUNC_ENTER;
 CEikImage* image = new(ELeave) CEikImage;
 CleanupStack::PushL( image );
 TBool skinnedFound( EFalse );
 if ( aImageFile.CompareF(KAvkonBitmapFile) == 0 ) // Skinning is supported only avkon bitmaps
 image->CreatePictureFromFileL(aImageFile,aBmpId,aBmpMaskId);
 }
 CleanupStack::Pop(); //image
 SetImageL(image); // gets ownership
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknQueryControl::SetAnimationL(TInt aResource)
 {
-_AKNTRACE_FUNC_ENTER;
 delete iAnimation;
 iAnimation = NULL;
 iAnimation = CAknBitmapAnimation::NewL();
 iAnimation->SetContainerWindowL(*this);
 // Save the animation resource id, because this function will be re-called
 // when handling resource change.
 iExtension->iAnimationId = aResource;
 Layout();
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknQueryControl::StartAnimationL()
 {
-_AKNTRACE_FUNC_ENTER;
 if (iAnimation)
 {
 CBitmapAnimClientData *animClientData = iAnimation->BitmapAnimData();
 if (animClientData != NULL && animClientData->FrameArray().Count() <= 1)
 {
 CleanupStack::Pop(bitmap);
 }
 iAnimation->StartAnimationL();
 }
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C TInt CAknQueryControl::CancelAnimation()
 {
-	_AKNTRACE_FUNC_ENTER;
+if ( iAnimation )
-	TInt result(KErrGeneral);
+{
-	if ( iAnimation )
+return iAnimation->CancelAnimation();
-{
+}
-		result = iAnimation->CancelAnimation();
+return KErrGeneral;
-}
-	_AKNTRACE( "[%s][%s] return %d", "CAknQueryControl", "CancelAnimation", result);
-return result;
 }
 /**
 }
 // Callback for doing a redraw when animating pictographs
 TInt CAknQueryControl::StaticPictographCallBack( TAny* aPtr )
 {
-_AKNTRACE_FUNC_ENTER;
 CAknQueryControl* me = static_cast<CAknQueryControl*>( aPtr );
 me->PictographCallBack();
-_AKNTRACE_FUNC_EXIT;
 return KErrNone;
 }
 void CAknQueryControl::PictographCallBack()
 {
-_AKNTRACE_FUNC_ENTER;
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
 for ( TInt i = 0 ; i < iPrompt->NumberOfLines() ; i++ )
 {
 Window().EndRedraw();
 DeactivateGc();
 // Draw the label after the background.
-TRAPD(err, iPrompt->Line( i )->ActivateL()); // Never leaves
+iPrompt->Line( i )->ActivateL(); // Never leaves
-if (err == KErrNone)
+iPrompt->Line( i )->DrawNow();
-{
-iPrompt->Line( i )->DrawNow();
-}
 iPrompt->SetLineModified( i, EFalse );
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TBool CAknQueryControl::EmbeddedVirtualInput() const
 {
 if ( !QueryExtension()->iVirtualInputStatusFlags.IsSet( CAknQueryExtension::EVirtualInputCheckedAlready ) )
 }
 CEikDialog* CAknQueryControl::Dialog() const
 {
-	_AKNTRACE_FUNC_ENTER;
 CAknQueryControl* control = const_cast<CAknQueryControl*>( this );
 CEikDialog* dialog = NULL;
 control->MopGetObject( dialog );
-_AKNTRACE_FUNC_EXIT;
 return dialog;
 }
 void CAknQueryControl::CreateIncAndDecButtonsL()
 AknLayoutUtils::LayoutLabel(iPrompt->Line(2), rect.Rect(), lineLayout );
 	}
 EXPORT_C void CAknQueryControl::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
-if ( iHasEditor && iEditorFrame.Valid()
+CEikMfne* edwin = NULL;
-&& iEditorFrame.Rect().Contains( aPointerEvent.iPosition ) )
+if ( iTimeEdwin )
-	{
+{
-		/*For the events happening inside editor frame's rect, query control will forward
+edwin = iTimeEdwin;
-		the events to editors to handle.This is added to fix bug ESLM-85YFCH:Text editor is hard
+}
-		to open in input dialog (usability). The valid area is enlarged to editor frame rect,
+else if ( iDateEdwin )
-		instead of text's rect, because text rect is too small for user to tap*/
+{
-		CCoeControl* ctrl = ControlByLayoutOrNull( iQueryType );
+edwin = iDateEdwin;
-		if( ctrl )
+}
-			{
+else if ( LocationEd() )
-			TPointerEvent pointerEvent( aPointerEvent );
+{
-			if( !ctrl->Rect().Contains( aPointerEvent.iPosition ) && ( NbrOfEditorLines() == 1 ) )
+edwin = LocationEd();
-				{
+}
-				// for the pointerevents happening in editor frame rect,
+else if ( iDurationEdwin )
-				// query control forward events to editors after justification
+{
-				pointerEvent.iPosition.iY = ctrl->Rect().iTl.iY + ctrl->Rect().Height()/2;
+edwin = iDurationEdwin;
-				}
+}
-			ctrl->HandlePointerEventL( pointerEvent );
-			}
+if ( edwin && iEditorFrame.Rect().Contains(aPointerEvent.iPosition) )
-		else
+{
-			{
+edwin->HandlePointerEventL(aPointerEvent);
-			CAknControl::HandlePointerEventL( aPointerEvent );
+}
-			}
-		}
 else
-	{
+{
-		CAknControl::HandlePointerEventL( aPointerEvent );
+CAknControl::HandlePointerEventL(aPointerEvent);
-		}
+}
 }
 EXPORT_C void* CAknQueryControl::ExtensionInterface( TUid /*aInterface*/ )
 {
 return NULL;
 }
 EXPORT_C void CAknQueryControl::HandleResourceChange(TInt aType)
 {
-_AKNTRACE_FUNC_ENTER;
 CCoeControl::HandleResourceChange(aType);
 if( aType == KAknsMessageSkinChange && iExtension->iAnimationId )
 {
 TRAP_IGNORE(SetAnimationL( iExtension->iAnimationId ));
 else if( aType == KEikDynamicLayoutVariantSwitch )
 {
 SizeChanged();
 TRAP_IGNORE(DoSetPromptL());
 }
-_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // Return prompt text needed by FEP to query dialog
 // ---------------------------------------------------------------------------
 // Sets the state of ECS number visibility in the query.
 // ---------------------------------------------------------------------------
 //
 void CAknQueryControl::SetEcsCbaVisibleL( TBool aVisible )
 {
-_AKNTRACE( "[%s][%s] aVisible:%d ", "CAknQueryControl", __FUNCTION__,aVisible);
 if ( iExtension &&
 !COMPARE_BOOLS( aVisible, iExtension->iEcsCbaShown ) &&
 iFlags.IsSet( EEmergencyCallsCBASupport ) )
 {
 CEikDialog* dlg;
 iExtension->iEcsCbaShown = EFalse;
 }
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // Attempts an emergency call.
 // ---------------------------------------------------------------------------
 //
 void CAknQueryControl::AttemptEmergencyCallL()
 {
-_AKNTRACE_FUNC_ENTER;
 if ( iEcsDetector )
 {
-if ( iEcsDetector->State() == CAknEcsDetector::ECompleteMatch ||
+if ( iEcsDetector->State() == CAknEcsDetector::ECompleteMatch )
-iEcsDetector->State() == CAknEcsDetector::EServiceNumMatch )
 {
 // Further check to ensure that the matched number is the
 // entire buffer. Get the matched text and see if is the same
 // length as the current query length.
 if ( GetTextLength() == iEcsDetector->CurrentMatch().Length() )
 // stop playing tacticons for pincode query
 StopPinCodeTacticonTimer();
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 /*****************************
 * CAknExtQueryControl
 }
 void CAknExtQueryControl::ConstructQueryL(TResourceReader& aRes)
 {
-_AKNTRACE_FUNC_ENTER;
 if ( iQueryType == EIpLayout)
 {
 iIpEditor = new(ELeave)CAknIpFieldEditor;
 iIpEditor->SetContainerWindowL(*this);
 iIpEditor->ConstructFromResourceL(aRes);
 CAknQueryExtension* extension = QueryExtension();
 if( extension )
 {
 extension->CreateEditorContextL();
 }
-_AKNTRACE_FUNC_EXIT;
 }
 ///
 /// CCoeControl methods
 }
 EXPORT_C void CAknExtQueryControl::HandleControlEventL(CCoeControl* /*aControl*/,TCoeEvent aEventType)
 {
 //CAknQueryControl::HandleControlEventL(NULL, aEventType);
-	_AKNTRACE( "[%s][%s] aEventType:%d ", "CAknExtQueryControl", "HandleControlEventL",aEventType);
 if(iQueryControlObserver && aEventType == EEventStateChanged)
 {
 if(GetTextLength())
 {
 iQueryControlObserver->HandleQueryEditorStateEventL(this,MAknQueryControlObserver::EQueryControlEditorStateChanging, MAknQueryControlObserver::EEditorValueValid);
 else
 {
 iQueryControlObserver->HandleQueryEditorStateEventL(this,MAknQueryControlObserver::EQueryControlEditorStateChanging, MAknQueryControlObserver::EEditorEmpty);
 }
 }
-_AKNTRACE( "[%s][%s] EXIT ", "CAknExtQueryControl", "HandleControlEventL");
 }
 ///
 /// DRAWING METHODS
 }
 }
 EXPORT_C void CAknExtQueryControl::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
-	if ( iHasEditor && iEditorFrame.Valid()
+if ( iIpEditor && iEditorFrame.Rect().Contains(aPointerEvent.iPosition) )
-	    && iEditorFrame.Rect().Contains( aPointerEvent.iPosition ) )
+{
-		{
+iIpEditor->HandlePointerEventL(aPointerEvent);
-		/*For the events happening inside editor frame's rect, query control will forward
+}
-		the events to editors to handle.This is added to fix bug ESLM-85YFCH:Text editor is hard
+else
-		to open in input dialog (usability). The valid area is enlarged to editor frame rect,
+{
-		instead of text's rect, because text rect is too small for user to tap*/
+CAknQueryControl::HandlePointerEventL(aPointerEvent);
-		CCoeControl* ctrl = ControlByLayoutOrNull( iQueryType );
+}
-		if( ctrl )
-			{
-			TPointerEvent pointerEvent( aPointerEvent );
-			if( !ctrl->Rect().Contains( aPointerEvent.iPosition ) && ( NbrOfEditorLines() == 1 ) )
-				{
-				// for the pointerevents happening in editor frame rect,
-				// query control forward events to editors after justification
-				pointerEvent.iPosition.iY = ctrl->Rect().iTl.iY + ctrl->Rect().Height()/2;
-				}
-			ctrl->HandlePointerEventL( pointerEvent );
-			}
-		else
-			{
-			CAknControl::HandlePointerEventL( aPointerEvent );
-			}
-		}
-	else
-		{
-		CAknControl::HandlePointerEventL( aPointerEvent );
-		}
 }
 EXPORT_C void* CAknExtQueryControl::ExtensionInterface( TUid /*aInterface*/ )
 {
 return NULL;
 // Callback for doing a redraw when animating pictographs
 TInt CAknExtQueryControl::StaticPictographCallBack( TAny* aPtr )
 {
-_AKNTRACE_FUNC_ENTER;
 CAknExtQueryControl* me = static_cast<CAknExtQueryControl*>( aPtr );
 me->PictographCallBack();
-_AKNTRACE_FUNC_EXIT;
 return KErrNone;
 }
 void CAknExtQueryControl::PictographCallBack()
 {
-_AKNTRACE_FUNC_ENTER;
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
 for ( TInt i = 0 ; i < iPrompt->NumberOfLines() ; i++ )
 {
 Window().EndRedraw();
 DeactivateGc();
 // Draw the label after the background.
-TRAPD(err, iPrompt->Line( i )->ActivateL()); // Never leaves
+iPrompt->Line( i )->ActivateL(); // Never leaves
-if (err == KErrNone)
+iPrompt->Line( i )->DrawNow();
-{
-iPrompt->Line( i )->DrawNow();
-}
 iPrompt->SetLineModified( i, EFalse );
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 // End of File

branch	RCL_3
changeset 55	aecbbf00d063
parent 51	fcdfafb36fe7
child 56	d48ab3b357f1