diff -r aabf2c525e0f -r 9f56a4e1b8ab uifw/EikStd/coctlsrc/aknitemactionmenuregisterarray.cpp --- a/uifw/EikStd/coctlsrc/aknitemactionmenuregisterarray.cpp Fri Mar 12 15:43:43 2010 +0200 +++ b/uifw/EikStd/coctlsrc/aknitemactionmenuregisterarray.cpp Mon Mar 15 12:41:34 2010 +0200 @@ -19,6 +19,7 @@ #include #include "aknitemactionmenuregisterarray.h" +#include "akntrace.h" // --------------------------------------------------------------------------- // CCAknItemActionMenuRegisterArray::NewL @@ -26,9 +27,11 @@ // CAknItemActionMenuRegisterArray* CAknItemActionMenuRegisterArray::NewL() { + _AKNTRACE_FUNC_ENTER; CAknItemActionMenuRegisterArray* self = CAknItemActionMenuRegisterArray::NewLC(); CleanupStack::Pop( self ); + _AKNTRACE_FUNC_EXIT; return self; } @@ -39,9 +42,11 @@ // CAknItemActionMenuRegisterArray* CAknItemActionMenuRegisterArray::NewLC() { + _AKNTRACE_FUNC_ENTER; CAknItemActionMenuRegisterArray* self = new ( ELeave ) CAknItemActionMenuRegisterArray(); CleanupStack::PushL( self ); + _AKNTRACE_FUNC_EXIT; return self; } @@ -52,8 +57,10 @@ // CAknItemActionMenuRegisterArray::~CAknItemActionMenuRegisterArray() { + _AKNTRACE_FUNC_ENTER; iRegisterArray.ResetAndDestroy(); iRegisterArray.Close(); + _AKNTRACE_FUNC_EXIT; } @@ -64,10 +71,12 @@ 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; } @@ -78,6 +87,7 @@ void CAknItemActionMenuRegisterArray::UnregisterMenuBar( CEikMenuBar& aMenuBar ) { + _AKNTRACE_FUNC_ENTER; CRegisterEntry* entry( NULL ); for ( TInt i = 0; i < iRegisterArray.Count(); i++ ) { @@ -97,6 +107,7 @@ break; } } + _AKNTRACE_FUNC_EXIT; } @@ -107,6 +118,7 @@ void CAknItemActionMenuRegisterArray::UnregisterItemActionMenu( CAknItemActionMenu& aItemActionMenu ) { + _AKNTRACE_FUNC_ENTER; CRegisterEntry* entry( NULL ); for ( TInt i = 0; i < iRegisterArray.Count(); i++ ) @@ -122,6 +134,7 @@ break; } } + _AKNTRACE_FUNC_EXIT; } @@ -132,6 +145,7 @@ TBool CAknItemActionMenuRegisterArray::RegisterCollectionObserverL( CEikMenuBar& aMenuBar, MAknCollectionObserver& aObserver ) { + _AKNTRACE_FUNC_ENTER; TBool menuBarFound( EFalse ); CRegisterEntry* entry( NULL ); for ( TInt i = 0; i < iRegisterArray.Count(); i++ ) @@ -148,6 +162,7 @@ break; } } + _AKNTRACE_FUNC_EXIT; return menuBarFound; } @@ -159,6 +174,7 @@ void CAknItemActionMenuRegisterArray::UnregisterCollectionObserver( MAknCollectionObserver& aObserver ) { + _AKNTRACE_FUNC_ENTER; CRegisterEntry* entry( NULL ); for ( TInt i = 0; i < iRegisterArray.Count(); i++ ) @@ -169,6 +185,7 @@ entry->ItemActionMenu()->RemoveCollectionObserver( aObserver ); } } + _AKNTRACE_FUNC_EXIT; } @@ -196,6 +213,7 @@ // void CAknItemActionMenuRegisterArray::RemoveEntry( TInt aIndex ) { + _AKNTRACE_FUNC_ENTER; if ( aIndex >= 0 && aIndex < iRegisterArray.Count() ) { CRegisterEntry* entry = iRegisterArray[ aIndex ]; @@ -203,6 +221,7 @@ entry = NULL; iRegisterArray.Remove( aIndex ); } + _AKNTRACE_FUNC_EXIT; } @@ -214,8 +233,10 @@ CAknItemActionMenuRegisterArray::CRegisterEntry::NewL( CEikMenuBar& aMenuBar, CAknItemActionMenu& aItemActionMenu ) { + _AKNTRACE_FUNC_ENTER; CRegisterEntry* self = CRegisterEntry::NewLC( aMenuBar, aItemActionMenu ); CleanupStack::Pop( self ); + _AKNTRACE_FUNC_EXIT; return self; } @@ -228,9 +249,11 @@ 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; } @@ -241,7 +264,9 @@ // CAknItemActionMenuRegisterArray::CRegisterEntry::~CRegisterEntry() { + _AKNTRACE_FUNC_ENTER; delete iActionMenu; + _AKNTRACE_FUNC_EXIT; } @@ -251,7 +276,9 @@ // void CAknItemActionMenuRegisterArray::CRegisterEntry::RemoveMenuBar() { + _AKNTRACE_FUNC_ENTER; iMenuBar = NULL; + _AKNTRACE_FUNC_EXIT; } @@ -261,6 +288,8 @@ // CEikMenuBar* CAknItemActionMenuRegisterArray::CRegisterEntry::MenuBar() { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE_FUNC_EXIT; return iMenuBar; } @@ -271,8 +300,10 @@ // void CAknItemActionMenuRegisterArray::CRegisterEntry::RemoveItemActionMenu() { + _AKNTRACE_FUNC_ENTER; delete iActionMenu; iActionMenu = NULL; + _AKNTRACE_FUNC_EXIT; } @@ -283,6 +314,8 @@ CAknItemActionMenu* CAknItemActionMenuRegisterArray::CRegisterEntry::ItemActionMenu() { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE_FUNC_EXIT; return iActionMenu; }