--- a/textinput/peninputgenericvkb/src/peninputgenericlafdatamgr.cpp	Wed Sep 15 12:34:44 2010 +0300
+++ b/textinput/peninputgenericvkb/src/peninputgenericlafdatamgr.cpp	Wed Oct 13 14:55:58 2010 +0300
@@ -1038,7 +1038,7 @@
     aDataInfo.iQwtRect = aParentWndRect;
     
     TInt v1, v2, gridLayoutVariant;
-
+    
     // Get the variant for Portrait QWERTY
     TInt cellVariantForPortraitQWERTY;
     
@@ -1199,6 +1199,7 @@
             }
         }
     
+    
     if ( !isPortraitFSQEnabled ||
         ( isPortraitFSQEnabled && Layout_Meta_Data::IsLandscapeOrientation() ) )
         {
@@ -1230,7 +1231,7 @@
         
         // the key rect without gap
         rect = keypaneRect.Rect();
-    
+        
         rect.Move( - rectXPane.iTl.iX, - rectXPane.iTl.iY );
         TRect rectXBorder = rect;
         rect = keylabelRect.Rect();
@@ -1243,14 +1244,14 @@
         
         rect = keypadRect.Rect();
         rect.Move( - base.iX, - base.iY );
-    
+        
         TRect rectOfButtons = rect;
         // The gap between the top of the first row key and the top of the keyboard
         gapValue = keypaneRect.Rect().iTl.iY - keypadRect.Rect().iTl.iY;
         // compute the top left Y coordinate of the function buttons
         rectOfButtons.iTl.iY = rectOfButtons.iTl.iY + 
     		keypaneRect.Rect().Height() * rowNumberOfKeyboard + gapValue;
-    
+        
         TInt spaceBtnWidth = rectOfButtons.Width() - rectXPane.Width() * 8;
         TInt dx = rectOfButtons.iTl.iX;
         TInt dy = rectOfButtons.iTl.iY;
@@ -1716,7 +1717,7 @@
     TAknLayoutText keyTextLayout; 
 	TAknTextLineLayout keyText;
 	TRect keyRect;
-	// The gap value of keyboard
+    // The gap value of keyboard
 	TInt gapValue;
 
     TBool isLandscape = Layout_Meta_Data::IsLandscapeOrientation();
@@ -1791,12 +1792,11 @@
         }
   	    
   	rectVkbCtrl = keypadRect.Rect();
-  	// Compute the gap between first row key's top line and keyboard's top line
+    // Compute the gap between first row key's top line and keyboard's top line
   	gapValue = keypaneRect.Rect().iTl.iY - rectVkbCtrl.iTl.iY;
   	// Compute keyboard position
   	rectVkbCtrl.iBr.iY = rectVkbCtrl.iTl.iY + keypaneRect.Rect().Height() * 3 + gapValue;
   	rectVkbCtrl.iTl.iY += gapValue;
-  	
   	dataInfo->iKeypad.iKaypadRect = rectVkbCtrl;
 
   	linelayout = AknLayoutScalable_Avkon::bg_cell_vkbss_key_g1(0).LayoutLine();
@@ -1805,6 +1805,7 @@
   	linelayout = AknLayoutScalable_Avkon::cell_vkbss_key_g1(0).LayoutLine();
   	keylabelRect.LayoutRect( keypaneRect.Rect(), linelayout );
 
+  	
     TRect rectOfKeypad = RelativeRect( keypadRect.Rect(), base );
     rectOfKeypad.iBr.iY -= keypaneRect.Rect().Height(); 
   	
@@ -1826,7 +1827,7 @@
             dataInfo->iKeypad.iRects.AppendL( bound );
             
             TRect inner = rectXPane;
-            inner.Move( j * rectXPane.Width(), i * rectXPane.Height() );
+            inner.Move( j * rectXPane.Width(), i * rectXPane.Height() );       
             
             TAknLayoutText keyTextLayout; 
             keyTextLayout.LayoutText( inner, keyText );
@@ -1944,13 +1945,11 @@
         }
   	    
   	rectVkbCtrl = keypadRect.Rect();
-    
-  	// Compute the gap between first row key's top line and keyboard's top line
+    // Compute the gap between first row key's top line and keyboard's top line
     gapValue = keypaneRect.Rect().iTl.iY - rectVkbCtrl.iTl.iY;
     // Compute keyboard position
     rectVkbCtrl.iBr.iY = rectVkbCtrl.iTl.iY + keypaneRect.Rect().Height() * 3 + gapValue;
     rectVkbCtrl.iTl.iY += gapValue;
-    
     dataInfo->iKeypad.iKaypadRect = rectVkbCtrl;
 
     linelayout = AknLayoutScalable_Avkon::bg_cell_vkbss_key_g1(2).LayoutLine();
@@ -1959,6 +1958,7 @@
     linelayout = AknLayoutScalable_Avkon::cell_vkbss_key_g1(2).LayoutLine();
     keylabelRect.LayoutRect( keypaneRect.Rect(), linelayout );
 
+    
     rectOfKeypad = RelativeRect( keypadRect.Rect(), base );
     rectOfKeypad.iBr.iY -= keypaneRect.Rect().Height(); 
     
@@ -1980,7 +1980,7 @@
             dataInfo->iKeypad.iRects.AppendL( bound );
             
             TRect inner = rectXPane;
-            inner.Move( j * rectXPane.Width(), i * rectXPane.Height() );
+            inner.Move( j * rectXPane.Width(), i * rectXPane.Height() );      
             
             TAknLayoutText keyTextLayout; 
             keyTextLayout.LayoutText( inner, keyText );
@@ -2086,14 +2086,12 @@
         keypaneRect.LayoutRect( keypadRect.Rect(), linelayout );
         }
   	    
-    rectVkbCtrl = keypadRect.Rect();
-    
+  	rectVkbCtrl = keypadRect.Rect();
     // Compute the gap between first row key's top line and keyboard's top line
     gapValue = keypaneRect.Rect().iTl.iY - rectVkbCtrl.iTl.iY;
     // Compute keyboard position
     rectVkbCtrl.iBr.iY = rectVkbCtrl.iTl.iY + keypaneRect.Rect().Height() * 4 + gapValue;
     rectVkbCtrl.iTl.iY += gapValue;
-    
     dataInfo->iKeypad.iKaypadRect = rectVkbCtrl;    
 
     linelayout = AknLayoutScalable_Avkon::bg_cell_vkbss_key_g1(3).LayoutLine();
@@ -2102,6 +2100,7 @@
     linelayout = AknLayoutScalable_Avkon::cell_vkbss_key_g1(3).LayoutLine();
     keylabelRect.LayoutRect( keypaneRect.Rect(), linelayout );
 
+    
     rectOfKeypad = RelativeRect( keypadRect.Rect(), base );
     rectOfKeypad.iBr.iY -= keypaneRect.Rect().Height(); 
     
@@ -2123,7 +2122,7 @@
             dataInfo->iKeypad.iRects.AppendL( bound );
             
             TRect inner = rectXPane;
-            inner.Move( j * rectXPane.Width(), i * rectXPane.Height() );
+            inner.Move( j * rectXPane.Width(), i * rectXPane.Height() );    
             
             TAknLayoutText keyTextLayout; 
             keyTextLayout.LayoutText( inner, keyText );