--- a/uifw/EikStd/coctlsrc/aknitemactionmenuregisterarray.cpp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/EikStd/coctlsrc/aknitemactionmenuregisterarray.cpp	Tue Aug 31 15:28:30 2010 +0300
@@ -19,7 +19,6 @@
 #include <eikmenub.h>
 
 #include "aknitemactionmenuregisterarray.h"
-#include "akntrace.h"
 
 // ---------------------------------------------------------------------------
 // CCAknItemActionMenuRegisterArray::NewL
@@ -27,11 +26,9 @@
 //
 CAknItemActionMenuRegisterArray* CAknItemActionMenuRegisterArray::NewL()
     {
-    _AKNTRACE_FUNC_ENTER;
     CAknItemActionMenuRegisterArray* self =
         CAknItemActionMenuRegisterArray::NewLC();
     CleanupStack::Pop( self );
-    _AKNTRACE_FUNC_EXIT;
     return self;
     }
 
@@ -42,11 +39,9 @@
 //
 CAknItemActionMenuRegisterArray* CAknItemActionMenuRegisterArray::NewLC()
     {
-    _AKNTRACE_FUNC_ENTER;
     CAknItemActionMenuRegisterArray* self =
         new ( ELeave ) CAknItemActionMenuRegisterArray();
     CleanupStack::PushL( self );
-    _AKNTRACE_FUNC_EXIT;
     return self;
     }
 
@@ -57,10 +52,8 @@
 //
 CAknItemActionMenuRegisterArray::~CAknItemActionMenuRegisterArray()
     {
-    _AKNTRACE_FUNC_ENTER;
     iRegisterArray.ResetAndDestroy();
     iRegisterArray.Close();
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -71,12 +64,10 @@
 void CAknItemActionMenuRegisterArray::AddEntryL(
         CEikMenuBar& aMenuBar, CAknItemActionMenu& aItemActionMenu )
     {
-    _AKNTRACE_FUNC_ENTER;
     CRegisterEntry* newEntry = CRegisterEntry::NewLC(
             aMenuBar, aItemActionMenu );
     iRegisterArray.AppendL( newEntry );
     CleanupStack::Pop( newEntry );
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -87,7 +78,6 @@
 void CAknItemActionMenuRegisterArray::UnregisterMenuBar(
         CEikMenuBar& aMenuBar )
     {
-    _AKNTRACE_FUNC_ENTER;
     CRegisterEntry* entry( NULL );
     for ( TInt i = 0; i < iRegisterArray.Count(); i++ )
         {
@@ -107,7 +97,6 @@
             break;
             }
         }
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -118,9 +107,7 @@
 void CAknItemActionMenuRegisterArray::UnregisterItemActionMenu(
         CAknItemActionMenu& aItemActionMenu )
     {
-    _AKNTRACE_FUNC_ENTER;
     CRegisterEntry* entry( NULL );
-
     for ( TInt i = 0; i < iRegisterArray.Count(); i++ )
         {
         entry = iRegisterArray[ i ];
@@ -134,7 +121,6 @@
             break;
             }
         }
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -145,7 +131,6 @@
 TBool CAknItemActionMenuRegisterArray::RegisterCollectionObserverL(
         CEikMenuBar& aMenuBar, MAknCollectionObserver& aObserver )
     {
-    _AKNTRACE_FUNC_ENTER;
     TBool menuBarFound( EFalse );
     CRegisterEntry* entry( NULL );
     for ( TInt i = 0; i < iRegisterArray.Count(); i++ )
@@ -162,7 +147,6 @@
             break;
             }
         }
-    _AKNTRACE_FUNC_EXIT;
     return menuBarFound;
     }
 
@@ -174,9 +158,7 @@
 void CAknItemActionMenuRegisterArray::UnregisterCollectionObserver(
         MAknCollectionObserver& aObserver )
     {
-    _AKNTRACE_FUNC_ENTER;
     CRegisterEntry* entry( NULL );
-
     for ( TInt i = 0; i < iRegisterArray.Count(); i++ )
         {
         entry = iRegisterArray[ i ];
@@ -185,7 +167,6 @@
             entry->ItemActionMenu()->RemoveCollectionObserver( aObserver );
             }
         }
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -213,7 +194,6 @@
 //
 void CAknItemActionMenuRegisterArray::RemoveEntry( TInt aIndex )
     {
-    _AKNTRACE_FUNC_ENTER;
     if ( aIndex >= 0 && aIndex < iRegisterArray.Count() )
         {
         CRegisterEntry* entry = iRegisterArray[ aIndex ];
@@ -221,7 +201,6 @@
         entry = NULL;
         iRegisterArray.Remove( aIndex );
         }
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -233,10 +212,8 @@
     CAknItemActionMenuRegisterArray::CRegisterEntry::NewL(
             CEikMenuBar& aMenuBar, CAknItemActionMenu& aItemActionMenu )
     {
-    _AKNTRACE_FUNC_ENTER;
     CRegisterEntry* self = CRegisterEntry::NewLC( aMenuBar, aItemActionMenu );
     CleanupStack::Pop( self );
-    _AKNTRACE_FUNC_EXIT;
     return self;
     }
 
@@ -249,11 +226,9 @@
     CAknItemActionMenuRegisterArray::CRegisterEntry::NewLC(
             CEikMenuBar& aMenuBar, CAknItemActionMenu& aItemActionMenu )
     {
-    _AKNTRACE_FUNC_ENTER;
     CRegisterEntry* self =
         new ( ELeave ) CRegisterEntry( aMenuBar, aItemActionMenu );
     CleanupStack::PushL( self );
-    _AKNTRACE_FUNC_EXIT;
     return self;
     }
 
@@ -264,9 +239,7 @@
 //
 CAknItemActionMenuRegisterArray::CRegisterEntry::~CRegisterEntry()
     {
-    _AKNTRACE_FUNC_ENTER;
     delete iActionMenu;
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -276,9 +249,7 @@
 //
 void CAknItemActionMenuRegisterArray::CRegisterEntry::RemoveMenuBar()
     {
-    _AKNTRACE_FUNC_ENTER;
     iMenuBar = NULL;
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -288,8 +259,6 @@
 //
 CEikMenuBar* CAknItemActionMenuRegisterArray::CRegisterEntry::MenuBar()
     {
-    _AKNTRACE_FUNC_ENTER;
-    _AKNTRACE_FUNC_EXIT;
     return iMenuBar;
     }
 
@@ -300,10 +269,8 @@
 //
 void CAknItemActionMenuRegisterArray::CRegisterEntry::RemoveItemActionMenu()
     {
-    _AKNTRACE_FUNC_ENTER;
     delete iActionMenu;
     iActionMenu = NULL;
-    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -314,8 +281,6 @@
 CAknItemActionMenu*
     CAknItemActionMenuRegisterArray::CRegisterEntry::ItemActionMenu()
     {
-    _AKNTRACE_FUNC_ENTER;
-    _AKNTRACE_FUNC_EXIT;
     return iActionMenu;
     }