--- a/uifw/EikStd/dlgsrc/aknrecordinggc.cpp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/EikStd/dlgsrc/aknrecordinggc.cpp	Tue Aug 31 15:28:30 2010 +0300
@@ -25,7 +25,6 @@
 #include <e32err.h>
 
 #include "aknrecordinggc.h"
-#include "akntrace.h"
 
 #ifdef _DEBUG
 _LIT( KOverFlow, "Array overflow" );
@@ -65,12 +64,10 @@
 //
 CAknRecordingGc::~CAknRecordingGc()
     {
-    _AKNTRACE_FUNC_ENTER;
     iLines.ResetAndDestroy();
     delete iOffScreenBmp;
     delete iBitGc;
     delete iBitmapDevice;
-    _AKNTRACE_FUNC_EXIT;
     }
     
 
@@ -80,11 +77,6 @@
 //
 void CAknRecordingGc::FlushBuffer( const TRect& aRect, TInt aLineToSkip )
     {
-    _AKNTRACE_FUNC_ENTER;
-    _AKNTRACE( "The rect of FlushBuffer are ( %d, %d ) ( %d, %d )", 
-    		aRect.iTl.iX, aRect.iTl.iY, 
-    		aRect.iBr.iX, aRect.iBr.iY );
-    _AKNTRACE( "[%s][%s]aLineToSkip: [%d]", "CAknRecordingGc", __FUNCTION__, aLineToSkip );
     if ( iLines.Count() == 0 )
         {
         return;
@@ -175,27 +167,9 @@
                     case CBufferItem::EDrawRect:
                         gc->DrawRect( item->iRect );
                         break;
-                        
                     case CBufferItem::EClear:
                         gc->Clear( item->iRect );
                         break;
-                        
-                    case CBufferItem::EDrawLine:
-                        // EDrawLine is used for separator line only and it
-                        // should be skipped for the last visible item.
-                        if ( i < iLines.Count() - 1 )
-                            {
-                            gc->DrawLine( item->iRect.iTl, item->iRect.iBr );
-                            }
-                        break;
-                        
-                    case CBufferItem::EUseBrushPattern:
-                        gc->UseBrushPattern( item->iBitmap );
-                        break;
-                        
-                    case CBufferItem::EDiscardBrushPattern:
-                        gc->DiscardBrushPattern();
-                        break;
                     }
                 }
                 
@@ -218,7 +192,6 @@
         {
         iRealGc->BitBlt( TPoint( 0, 0 ), iOffScreenBmp, TRect( 0, 0, 360, 500 ) );
         }
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -239,12 +212,10 @@
 //
 void CAknRecordingGc::PrepareForNewLineL( const TRect& aRect )
     {
-    _AKNTRACE_FUNC_ENTER;
     CLineData* newLine = new ( ELeave ) CLineData;
     newLine->iRect = aRect;
     iLines.AppendL( newLine );
     iCurrentLine = iLines.Count() - 1;
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -254,8 +225,6 @@
 //
 void CAknRecordingGc::ReplaceLineL( TInt aLine )
     {
-    _AKNTRACE_FUNC_ENTER;
-    _AKNTRACE( "[%s][%s]aLine: [%d].", "CAknRecordingGc", __FUNCTION__, aLine );
     if (  aLine < iLines.Count() )
         {
         TRect rect( iLines[aLine]->iRect );
@@ -267,7 +236,6 @@
         }
         
     iCurrentLine = aLine;
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -287,14 +255,11 @@
 //
 void CAknRecordingGc::InsertLineL( TInt aLine, const TRect& aRect )
     {
-    _AKNTRACE_FUNC_ENTER;
-    _AKNTRACE( "[%s][%s]aLine: [%d].", "CAknRecordingGc", __FUNCTION__, aLine );
     CLineData* newLine = new ( ELeave ) CLineData;
     newLine->iRect = aRect;
     
     iLines.Insert( newLine, aLine );
     iCurrentLine = aLine;
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -349,14 +314,11 @@
 //
 void CAknRecordingGc::DeleteLine( TInt aLine )
     {
-    _AKNTRACE_FUNC_ENTER;
-    _AKNTRACE( "[%s][%s]aLine: [%d].", "CAknRecordingGc", __FUNCTION__, aLine );
     if ( aLine != -1 && aLine < iLines.Count() )
         {
         delete iLines[aLine];
         iLines.Remove( aLine );
         }
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -619,15 +581,8 @@
 // From class CWindowGc
 // ---------------------------------------------------------------------------
 //
-void CAknRecordingGc::UseBrushPattern( const CFbsBitmap* aDevice )
+void CAknRecordingGc::UseBrushPattern( const CFbsBitmap* /*aDevice*/ )
     {
-    CBufferItem* buffer = BufferItem();
-    buffer->iType = CBufferItem::EUseBrushPattern;
-    
-    CFbsBitmap* bitmap = NULL;
-    TRAP_IGNORE( bitmap = new (ELeave) CFbsBitmap() );
-    bitmap->Duplicate(aDevice->Handle());
-    buffer->iBitmap = bitmap;
     }
     
     
@@ -637,8 +592,6 @@
 //
 void CAknRecordingGc::DiscardBrushPattern()
     {
-    CBufferItem* buffer = BufferItem();
-    buffer->iType = CBufferItem::EDiscardBrushPattern;    
     }
     
     
@@ -683,15 +636,9 @@
 // From class CWindowGc
 // ---------------------------------------------------------------------------
 //
-void CAknRecordingGc::DrawLine( const TPoint& aPoint1, 
-    const TPoint& aPoint2 )
+void CAknRecordingGc::DrawLine( const TPoint& /*aPoint1*/, 
+    const TPoint& /*aPoint2*/ )
     {
-    _AKNTRACE_FUNC_ENTER;
-    CBufferItem* buffer = BufferItem();
-    buffer->iType = CBufferItem::EDrawLine;
-    buffer->iRect.iTl = aPoint1;
-    buffer->iRect.iBr = aPoint2;
-    _AKNTRACE_FUNC_EXIT;
     }
     
     
@@ -948,7 +895,6 @@
     const CFbsBitmap* aBitmap, const TRect& aSourceRect, 
     const CFbsBitmap* aMaskBitmap, TBool aInvertMask )
     {
-    _AKNTRACE_FUNC_ENTER;
     if ( !iUseBitGc )
         {
         CBufferItem* buffer = BufferItem();
@@ -973,7 +919,6 @@
         {
         iBitGc->BitBltMasked( aPoint, aBitmap, aSourceRect, aMaskBitmap, aInvertMask );
         }
-    _AKNTRACE_FUNC_EXIT;
     }
     
     
@@ -1146,7 +1091,6 @@
 TInt CAknRecordingGc::APIExtension( TUid aUid, TAny*& /*aOutput*/,
     TAny* aInput )
     {
-    _AKNTRACE_FUNC_ENTER;
     if (aUid == KDrawTextInContextUid)
         {
         __ASSERT_DEBUG( aInput, User::Panic(KBadArgument, KErrArgument ));
@@ -1157,12 +1101,10 @@
         TPtrC textToDraw = contextParam->iText.Mid( params->iStart, 
                                                     params->iEnd - params->iStart );
         DrawText(textToDraw, contextParam->iPosition);
-		_AKNTRACE_FUNC_EXIT;
         return KErrNone;
         }
     else
         {
-		_AKNTRACE_FUNC_EXIT;
         return KErrNotSupported;
         }
     }