diff -r fcdfafb36fe7 -r aecbbf00d063 uifw/EikStd/coctlsrc/aknitemactionmenudata.cpp
--- a/uifw/EikStd/coctlsrc/aknitemactionmenudata.cpp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/EikStd/coctlsrc/aknitemactionmenudata.cpp	Tue Aug 31 15:28:30 2010 +0300
@@ -20,7 +20,6 @@
 #include <eikpanic.h>
 
 #include "aknitemactionmenudata.h"
-#include "akntrace.h"
 
 // ---------------------------------------------------------------------------
 // CAknItemActionMenuData::NewL
@@ -28,9 +27,7 @@
 //
 CAknItemActionMenuData* CAknItemActionMenuData::NewL()
     {
-    _AKNTRACE_FUNC_ENTER;
     CAknItemActionMenuData* self = new ( ELeave ) CAknItemActionMenuData();
-    _AKNTRACE_FUNC_EXIT;
     return self;
     }
 
@@ -41,9 +38,7 @@
 //
 CAknItemActionMenuData::~CAknItemActionMenuData()
     {
-    _AKNTRACE_FUNC_ENTER;
     iMenuData.Close();
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -54,13 +49,11 @@
 void CAknItemActionMenuData::AddMenuItemToDataArrayL(
         TInt aCommandId, TInt aCascadeId, const TDesC& aText )
     {
-    _AKNTRACE_FUNC_ENTER;
     TAknItemActionMenuData newData;
     newData.iCommandId = aCommandId;
     newData.iCascadeId = aCascadeId;
     newData.iText = aText;
     iMenuData.AppendL( newData );
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -71,7 +64,6 @@
 void CAknItemActionMenuData::AddMenuItemsToStylusPopupMenuL(
         CAknStylusPopUpMenu* aPopupMenu )
     {
-    _AKNTRACE_FUNC_ENTER;
     if ( aPopupMenu )
         {
         for ( TInt i = 0; i < iMenuData.Count(); i++ )
@@ -79,7 +71,6 @@
             aPopupMenu->AddMenuItemL( iMenuData[ i ].iText, i + 1 );
             }
         }
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -89,7 +80,6 @@
 //
 MDesCArray* CAknItemActionMenuData::MenuItemsForQueryDialogL()
     {
-    _AKNTRACE_FUNC_ENTER;
     CDesCArrayFlat* itemArray( NULL );
     TInt itemCount( iMenuData.Count() );
     if ( itemCount )
@@ -103,7 +93,6 @@
             }
         CleanupStack::Pop( itemArray );
         }
-    _AKNTRACE_FUNC_EXIT;
     return itemArray;
     }
 
@@ -114,12 +103,10 @@
 //
 TInt CAknItemActionMenuData::MenuItemCascadeId( TInt aIndex )
     {
-    _AKNTRACE_FUNC_ENTER;
     aIndex--;
     __ASSERT_ALWAYS(
             ( aIndex >= 0 && aIndex < iMenuData.Count() ),
             Panic( EEikPanicOutOfRange ) );
-    _AKNTRACE_FUNC_EXIT;
     return iMenuData[ aIndex ].iCascadeId;
     }
 
@@ -130,12 +117,10 @@
 //
 TDesC& CAknItemActionMenuData::MenuItemText( TInt aIndex )
     {
-    _AKNTRACE_FUNC_ENTER;
     aIndex--;
     __ASSERT_ALWAYS(
             ( aIndex >= 0 && aIndex < iMenuData.Count() ),
             Panic( EEikPanicOutOfRange ) );
-    _AKNTRACE_FUNC_EXIT;
     return iMenuData[ aIndex ].iText;
     }
 
@@ -146,12 +131,10 @@
 //
 TInt CAknItemActionMenuData::MenuItemCommandId( TInt aIndex  )
     {
-    _AKNTRACE_FUNC_ENTER;
     aIndex--;
     __ASSERT_ALWAYS(
             ( aIndex >= 0 && aIndex < iMenuData.Count() ),
             Panic( EEikPanicOutOfRange ) );
-    _AKNTRACE_FUNC_EXIT;
     return iMenuData[ aIndex ].iCommandId;
     }
 
@@ -162,9 +145,7 @@
 //
 void CAknItemActionMenuData::Reset()
     {
-    _AKNTRACE_FUNC_ENTER;
     iMenuData.Reset();
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -174,8 +155,6 @@
 //
 TInt CAknItemActionMenuData::Count() const
     {
-    _AKNTRACE_FUNC_ENTER;;
-    _AKNTRACE_FUNC_EXIT;
     return iMenuData.Count();
     }