diff -r fcdfafb36fe7 -r aecbbf00d063 uifw/eikctl/src/EIKSECED.CPP
--- a/uifw/eikctl/src/EIKSECED.CPP	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/eikctl/src/EIKSECED.CPP	Tue Aug 31 15:28:30 2010 +0300
@@ -230,7 +230,6 @@
     TBool iWindowSet;
     TBool iLaunchPenInputAutomatic;
     TBool iPartialScreenInput;
-    TBool iLockQuerySCT;
     };
 
 EXPORT_C void CEikSecretEditor::AknSetFont(const CFont &aFont)
@@ -583,18 +582,16 @@
     gc.UseFont(iFont);
 
     TSize size=iBorder.SizeDelta();
-    if ( iExtension )
-    	{
-		if ( iRevealSecretText )
-			{
-			gc.DrawText( iSecCharArr->Des(), iExtension->iTextRect, 
-				iAscent, iAlign, 0 );
-			}
-		else
-			{
-			gc.DrawText(iBuf, iExtension->iTextRect, iAscent, iAlign, 0);
-			}
-    	}
+
+    if ( iRevealSecretText )
+        {
+        gc.DrawText( iSecCharArr->Des(), iExtension->iTextRect, 
+            iAscent, iAlign, 0 );
+        }
+    else
+        {
+        gc.DrawText(iBuf, iExtension->iTextRect, iAscent, iAlign, 0);
+        }
         
     gc.DiscardFont();    
     }
@@ -626,14 +623,11 @@
 
 void CEikSecretEditor::ReportUpdate()
     {
-	if ( iExtension )
-		{
-        TRAP_IGNORE (
-            iExtension->iExtendedInputCapabilities->ReportEventL(
-            CAknExtendedInputCapabilities::MAknEventObserver::EControlContentUpdatedInternally,
-            NULL );
-            )
-		}
+    TRAP_IGNORE (
+        iExtension->iExtendedInputCapabilities->ReportEventL(
+        CAknExtendedInputCapabilities::MAknEventObserver::EControlContentUpdatedInternally,
+        NULL );
+        )
     }
 
 EXPORT_C void CEikSecretEditor::AppendCharacterL( TInt aKeyCode )
@@ -734,7 +728,7 @@
     TBool oldShown = iRevealSecretText;
     iRevealSecretText = aReveal;
 
-    if ( !COMPARE_BOOLS( oldShown, iRevealSecretText ) && iExtension )
+    if ( !COMPARE_BOOLS( oldShown, iRevealSecretText ) )
         {
         TInt caps = iExtension->iExtendedInputCapabilities->Capabilities();
         if ( iRevealSecretText )
@@ -790,14 +784,15 @@
     
 EXPORT_C void CEikSecretEditor::HandlePointerEventL(const TPointerEvent& aPointerEvent) 
     { 
-    if ( iFepState && iExtension )
+    if ( iFepState )
         {
         if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
             {
-            if ( iExtension->iFeedback )
+            if ( iExtension 
+              && iExtension->iFeedback )
                 {
                 // tactile feedback is always given on down event
-                iExtension->iFeedback->InstantFeedback( this, ETouchFeedbackEdit );
+                iExtension->iFeedback->InstantFeedback( this, ETouchFeedbackEditor );
                 }
             
             CAknExtendedInputCapabilities::
@@ -814,13 +809,13 @@
                 }
             }
         else if ( aPointerEvent.iType == TPointerEvent::EButton1Up && 
-                  !iExtension->iDisablePenInput )
+            iExtension && !iExtension->iDisablePenInput)
             {
-            if ( iExtension->iFeedback )
+            if (iExtension && iExtension->iFeedback)
                 {
                 // Edit feedback is given if PenInput will open on up event
                 iExtension->iFeedback->InstantFeedback( this,
-                                                        ETouchFeedbackEdit,
+                                                        ETouchFeedbackEditor,
                                                         ETouchFeedbackVibra,
                                                         aPointerEvent );
                 }
@@ -942,8 +937,7 @@
     editorState->SetFlags( EAknEditorFlagNoLRNavigation |
                            EAknEditorFlagLatinInputModesOnly |
                            EAknEditorFlagNoT9 |
-                           EAknEditorFlagUseSCTNumericCharmap |
-                           EAknEditorFlagAvkonSecretEditor );
+                           EAknEditorFlagUseSCTNumericCharmap );
 
     editorState->SetDefaultInputMode(EAknEditorSecretAlphaInputMode);
     editorState->SetCurrentInputMode(EAknEditorSecretAlphaInputMode);
@@ -1055,26 +1049,7 @@
                     ret = KErrGeneral;
                     }
                 break;
-            case ELockQuerySCT:
-                {
-                if ( iExtension )
-                    {
-                    iExtension->iLockQuerySCT = aFeatureParam;
-                    CAknEdwinState* edwinState = STATIC_CAST( CAknEdwinState*,State(KNullUid) );
-                    if ( iExtension->iLockQuerySCT && edwinState )
-                        {
-                        edwinState->SetSpecialCharacterTableResourceId(
-                                R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG_FOR_LOCKCODE_SYMBOL_INPUT );
-                        TRAP_IGNORE( edwinState->ReportAknEdStateEventL( 
-                            MAknEdStateObserver::EAknEdwinStateEventStateUpdate ) );
-                        }
-                    }
-                else
-                    {
-                    ret = KErrGeneral;
-                    }
-                }
-                break;
+
             default:
                 ret = KErrNotSupported;
                 break;
@@ -1126,18 +1101,7 @@
                     ret = KErrGeneral;
                     }
                 break;
-            case ELockQuerySCT:
-                {
-                if ( iExtension )
-                    {
-                    aFeatureParam = iExtension->iLockQuerySCT;
-                    }
-                else
-                    {
-                    ret = KErrGeneral;
-                    }
-                }
-                break;
+
             default:
                 ret = KErrNotSupported;
                 break;
@@ -1155,8 +1119,7 @@
         {
         EDisablePenInput,
         ELaunchPenInputAutomatic,
-        EPartialScreenInput,
-        ELockQuerySCT       
+        EPartialScreenInput
         };
         
     TBool ret = EFalse;
@@ -1174,31 +1137,28 @@
     }
 
 void CEikSecretEditor::SetCursorFormat()
-    { 
-	if ( iExtension )
-		{
-		iExtension->iCursor.iType = TTextCursor::ETypeRectangle;        
-		iExtension->iCursor.iFlags = 0;    
-		iExtension->iCursor.iHeight = AknLayoutUtils::CursorHeightFromFont( 
-			iFont->FontSpecInTwips() );
-		iExtension->iCursor.iAscent = AknLayoutUtils::CursorAscentFromFont( 
-			iFont->FontSpecInTwips() );
-		iExtension->iCursor.iWidth  = AknLayoutUtils::CursorWidthFromFont ( 
-			iFont->FontSpecInTwips() );
-		iExtension->iCursor.iColor = KRgbWhite;
-		if ( !iExtension->iWindowSet )
-			{
-	#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
-			CRedirectionListener* listener = ( CRedirectionListener* )
-			CAknTransitionUtils::GetData( (TInt) this );
-			listener->SetWindows( &( iCoeEnv->RootWin() ), DrawableWindow() );
-	#else           
-			iExtension->iWg = &( iCoeEnv->RootWin() );
-			iExtension->iWindow = DrawableWindow();
-	#endif
-			iExtension->iWindowSet = ETrue;
-			}
-		}
+    {    
+    iExtension->iCursor.iType = TTextCursor::ETypeRectangle;        
+    iExtension->iCursor.iFlags = 0;    
+    iExtension->iCursor.iHeight = AknLayoutUtils::CursorHeightFromFont( 
+        iFont->FontSpecInTwips() );
+    iExtension->iCursor.iAscent = AknLayoutUtils::CursorAscentFromFont( 
+        iFont->FontSpecInTwips() );
+    iExtension->iCursor.iWidth  = AknLayoutUtils::CursorWidthFromFont ( 
+        iFont->FontSpecInTwips() );
+    iExtension->iCursor.iColor = KRgbWhite;
+    if ( !iExtension->iWindowSet )
+        {
+#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
+        CRedirectionListener* listener = ( CRedirectionListener* )
+        CAknTransitionUtils::GetData( (TInt) this );
+        listener->SetWindows( &( iCoeEnv->RootWin() ), DrawableWindow() );
+#else           
+        iExtension->iWg = &( iCoeEnv->RootWin() );
+        iExtension->iWindow = DrawableWindow();
+#endif
+        iExtension->iWindowSet = ETrue;
+        }
     }
 
 TPoint CEikSecretEditor::CursorPos()
@@ -1209,22 +1169,19 @@
     TInt textWidth( iRevealSecretText ? 
         iFont->TextWidthInPixels( *iSecCharArr ) : 
         iFont->CharWidthInPixels( KSecretChar ) * pos );
-    TInt x( 0 );
-    if ( iExtension )
+    TInt x;
+    if ( iAlign == CGraphicsContext::ELeft )
+    	{
+        x = iExtension->iTextRect.iTl.iX + textWidth;
+    	}
+    else if (iAlign == CGraphicsContext::ECenter)
     	{
-		if ( iAlign == CGraphicsContext::ELeft )
-			{
-			x = iExtension->iTextRect.iTl.iX + textWidth;
-			}
-		else if (iAlign == CGraphicsContext::ECenter )
-			{
-			x = iExtension->iTextRect.iTl.iX +
-				(iExtension->iTextRect.Width() + textWidth) / 2;
-			}
-		else
-			{
-			x = iExtension->iTextRect.iBr.iX;
-			}
+        x = iExtension->iTextRect.iTl.iX +
+            (iExtension->iTextRect.Width() + textWidth) / 2;
+    	}
+    else
+    	{
+    	x = iExtension->iTextRect.iBr.iX;
     	}
     TInt y( Rect().iTl.iY + iAscent );    
     return TPoint( x, y );
@@ -1279,11 +1236,11 @@
         TInt flags( edwinState->Flags() );
         if ( aEnable )
             {
-            flags |= EAknEditorFlagTextCursorVisible;
+            flags &= ~EEikEdwinAvkonDisableCursor;
             }
         else
             {
-            flags &= ~EAknEditorFlagTextCursorVisible;
+            flags |= EEikEdwinAvkonDisableCursor;
             }
         edwinState->SetFlags( flags );
         }    
@@ -1291,24 +1248,21 @@
 
 void CEikSecretEditor::UpdateCursor()
     {
-    if ( iExtension )
-        {
-    #ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
-        CRedirectionListener* listener = ( CRedirectionListener* )
-            CAknTransitionUtils::GetData( (TInt) this );
-        listener->UpdateCursor( iExtension->iCursor );
-    #else
-        if ( iExtension->iCursorEnabled )
-            {                
-            if ( iExtension->iWindow )
-                {            
-                iExtension->iWg->SetTextCursor( *iExtension->iWindow, CursorPos(), 
-                    iExtension->iCursor );            
-                }
-            iExtension->iCursorEnabled = ETrue;
+#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
+    CRedirectionListener* listener = ( CRedirectionListener* )
+        CAknTransitionUtils::GetData( (TInt) this );
+    listener->UpdateCursor( iExtension->iCursor );
+#else
+    if ( iExtension->iCursorEnabled )
+        {                
+        if ( iExtension->iWindow )
+            {            
+            iExtension->iWg->SetTextCursor( *iExtension->iWindow, CursorPos(), 
+                iExtension->iCursor );            
             }
-    #endif   
+        iExtension->iCursorEnabled = ETrue;
         }
+#endif       
     }
 
 EXPORT_C void CEikSecretEditor::FocusChanged( TDrawNow /*aDrawNow*/ )