--- a/uifw/EikStd/coctlsrc/aknitemactionmenu.cpp	Fri Mar 12 15:43:43 2010 +0200
+++ b/uifw/EikStd/coctlsrc/aknitemactionmenu.cpp	Mon Mar 15 12:41:34 2010 +0200
@@ -28,6 +28,7 @@
 #include "akncollectionobserver.h"
 #include "aknitemactionmenudata.h"
 #include "aknitemactionmenuregister.h"
+#include "akntrace.h"
 
 /**
  * Index for invalid list index.
@@ -41,9 +42,11 @@
 CAknItemActionMenu* CAknItemActionMenu::NewL(
         MAknCollection& aCollection, MObjectProvider* aOwner )
     {
+    _AKNTRACE_FUNC_ENTER;
     CAknItemActionMenu* self = CAknItemActionMenu::NewLC( 
             aCollection, aOwner );
     CleanupStack::Pop( self );
+    _AKNTRACE_FUNC_EXIT;
     return self;
     }
 
@@ -55,9 +58,11 @@
 CAknItemActionMenu* CAknItemActionMenu::NewLC(
         MAknCollection& aCollection, MObjectProvider* aOwner )
     {
+    _AKNTRACE_FUNC_ENTER;
     CAknItemActionMenu* self = new ( ELeave ) CAknItemActionMenu( aOwner );
     CleanupStack::PushL( self );
     self->ConstructL( aCollection );
+    _AKNTRACE_FUNC_EXIT;
     return self;
     }
 
@@ -68,6 +73,7 @@
 //
 CAknItemActionMenu::~CAknItemActionMenu()
     {
+    _AKNTRACE_FUNC_ENTER;
     AKNTASHOOK_REMOVE();
     delete iPopupMenu;
     delete iMenuPane;
@@ -80,6 +86,7 @@
         }
 
     iObservers.Close();
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -90,6 +97,8 @@
 EXPORT_C CAknItemActionMenu* CAknItemActionMenu::RegisterCollectionL(
         MAknCollection& aCollection )
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE_FUNC_EXIT;
     return AknItemActionMenuRegister::RegisterCollectionL( aCollection );
     }
 
@@ -101,6 +110,7 @@
 EXPORT_C void CAknItemActionMenu::RemoveCollection(
         MAknCollection& aCollection )
     {
+    _AKNTRACE_FUNC_ENTER;
     for ( TInt i = 0; i < iStates.Count(); i++ )
         {
         MAknCollection* state( iStates[ i ] );
@@ -111,6 +121,7 @@
             }
         }
     UnregisterMenu(); 
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -120,6 +131,7 @@
 //
 EXPORT_C TBool CAknItemActionMenu::InitMenuL()
     {
+    _AKNTRACE_FUNC_ENTER;
     iMenuData->Reset();
     if ( !iMenuBar )
         {
@@ -139,6 +151,7 @@
         return EFalse;
         }
 
+    _AKNTRACE_FUNC_EXIT;
     return iMenuData->Count();
     }
 
@@ -151,6 +164,7 @@
         const TPoint& aPosition,
         TUint /*aFlags*/ )
     {
+    _AKNTRACE_FUNC_ENTER;
     if ( iMenuData->Count() )
         {
         if ( !iPopupMenu )
@@ -164,6 +178,7 @@
                 CAknStylusPopUpMenu::EPositionTypeRightBottom );
         iPopupMenu->ShowMenu();
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -174,12 +189,14 @@
 EXPORT_C void CAknItemActionMenu::CollectionChanged(
         MAknCollection& aCollection )
     {
+    _AKNTRACE_FUNC_ENTER;
     if ( iObservers.Count() && iStates.Find( &aCollection ) != KErrNotFound )
         {
         TBool collectionVisible( aCollection.CollectionState()
                 & MAknCollection::EStateCollectionVisible );
         NotifyChangeToActiveObserver( collectionVisible );
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -190,10 +207,12 @@
 void CAknItemActionMenu::AddCollectionStateL(
         MAknCollection& aCollection )
     {
+    _AKNTRACE_FUNC_ENTER;
     if ( iStates.Find( &aCollection ) == KErrNotFound )
         {
         iStates.InsertL( &aCollection, 0 );
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -205,8 +224,10 @@
         MEikMenuObserver* aMenuObserver,
         CEikMenuBar* aMenuBar )
     {
+    _AKNTRACE_FUNC_ENTER;
     iMenuBarObserver = aMenuObserver;
     iMenuBar = aMenuBar;
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -216,6 +237,7 @@
 //
 TBool CAknItemActionMenu::CollectionHighlightVisible() const
     {
+    _AKNTRACE_FUNC_ENTER;
     TBool highlightVisible( ETrue );
     for ( TInt i = 0; i < iStates.Count(); i++ )
         {
@@ -231,6 +253,7 @@
             break;
             }
         }
+    _AKNTRACE_FUNC_EXIT;
     return highlightVisible;
     }
 
@@ -242,6 +265,7 @@
 TBool CAknItemActionMenu::CollectionSoftkeyVisible(
         TBool aVisibleCollection ) const
     {
+    _AKNTRACE_FUNC_ENTER;
     TBool softkeyVisible( ETrue );
     for ( TInt i = 0; i < iStates.Count(); i++ )
         {
@@ -262,6 +286,7 @@
             break;
             }
         }
+    _AKNTRACE_FUNC_EXIT;
     return softkeyVisible;
     }
 
@@ -272,6 +297,8 @@
 //
 CAknItemActionMenuData& CAknItemActionMenu::MenuData()
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE_FUNC_EXIT;
     return *iMenuData;
     }
 
@@ -283,11 +310,13 @@
 void CAknItemActionMenu::RegisterCollectionObserverL(
         MAknCollectionObserver& aObserver )
     {
+    _AKNTRACE_FUNC_ENTER;
     if ( iObservers.Find( &aObserver ) == KErrNotFound )
         {
         iObservers.InsertL( &aObserver, 0 );
         aObserver.SetItemActionMenu( this );
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -298,12 +327,14 @@
 void CAknItemActionMenu::RemoveCollectionObserver(
         MAknCollectionObserver& aObserver )
     {
+    _AKNTRACE_FUNC_ENTER;
     TInt index( iObservers.Find( &aObserver ) );
     if ( index != KErrNotFound )
         {
         iObservers.Remove( index );
         UnregisterMenu(); 
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -313,6 +344,8 @@
 //
 TInt CAknItemActionMenu::CollectionCount() const
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE_FUNC_EXIT;
     return iStates.Count();
     }
 
@@ -323,6 +356,8 @@
 //
  MObjectProvider* CAknItemActionMenu::Owner() const
      {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE_FUNC_EXIT;
      return iOwner;
      }
 
@@ -339,7 +374,9 @@
     iMenuData( NULL ),
     iOwner( aOwner )
     {
+    _AKNTRACE_FUNC_ENTER;
     AKNTASHOOK_ADD( this, "CAknItemActionMenu" );
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -349,8 +386,10 @@
 //
 void CAknItemActionMenu::ConstructL( MAknCollection& aCollection )
     {
+    _AKNTRACE_FUNC_ENTER;
     AddCollectionStateL( aCollection );
     iMenuData = CAknItemActionMenuData::NewL();
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -360,6 +399,7 @@
 //
 TInt CAknItemActionMenu::LaunchSubMenuQueryL( const TDesC& aHeading )
     {
+    _AKNTRACE_FUNC_ENTER;
     TInt selectedIndex( KInvalidListIndex );
     if ( iMenuData->Count() )
         {
@@ -375,6 +415,7 @@
             }
         queryDialog->RunLD();
         }
+    _AKNTRACE_FUNC_EXIT;
     return ++selectedIndex;
     }
 
@@ -386,6 +427,7 @@
 void CAknItemActionMenu::NotifyChangeToActiveObserver(
         TBool aCollectionVisible )
     {
+    _AKNTRACE_FUNC_ENTER;
     for ( TInt i = 0; i < iObservers.Count(); i++ )
         {
         MAknCollectionObserver* observer( iObservers[ i ] );
@@ -395,6 +437,7 @@
             break;
             }
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -406,6 +449,8 @@
         CCoeControl* /*aMenuControl*/,
         TBool /*aEmphasis*/ )
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -415,6 +460,7 @@
 //
 void CAknItemActionMenu::ProcessCommandL( TInt aCommandId )
     {
+    _AKNTRACE_FUNC_ENTER;
     MAknCollection* informState ( NULL );
     // Store collection state before sending the command
     for ( TInt i = 0; i < iStates.Count(); i++ )
@@ -454,6 +500,7 @@
         informState->ItemActionMenuClosed();
         }
     UnregisterMenu(); 
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -463,6 +510,7 @@
 //
 void CAknItemActionMenu::UnregisterMenu()
     {
+    _AKNTRACE_FUNC_ENTER;
     if ( !iProcessingCommand && !iStates.Count() && !iObservers.Count() )
         {
         delete iPopupMenu;
@@ -471,6 +519,7 @@
         iMenuPane = NULL;
         AknItemActionMenuRegister::UnregisterItemActionMenu( *this );
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 // End of File