FCL/sf/app/organizer: comparison calendarui/customisationmanager/src/calencustomisationmanager.cpp

equal deleted inserted replaced

-:0b38fc5b94c6
+:2c54b51f39c4
 #include <ecom/ecom.h>
 #include <e32lang.h>
 #include "calenservices.h"
 #include "calenservicesfactory.h"
 #include "CalenUid.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calencustomisationmanagerTraces.h"
+#endif
 // ----------------------------------------------------------------------------
 CCalenCustomisationManager* CCalenCustomisationManager::NewL(
 MCalenServicesFactory& aFactory,
 MCalenServices& aServices
 )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_NEWL_ENTRY );
 CCalenCustomisationManager* self = new( ELeave ) CCalenCustomisationManager(
 aFactory,
 aServices );
 CleanupStack::PushL( self );
 self->ConstructL();
 CleanupStack::Pop( self );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_NEWL_EXIT );
 return self;
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CCalenCustomisationManager
 CCalenCustomisationManager::CCalenCustomisationManager( MCalenServicesFactory& aFactory,
 MCalenServices& aServices )
 : iServicesFactory( aFactory ),
 iServices( aServices )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::ConstructL
 // Second stage constructor
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::ConstructL()
 {
-TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_CONSTRUCTL_ENTRY );
 CreateActivePluginListL();
 // Load any enabled plugins
 DoImmediatePluginLoadingL();
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_CONSTRUCTL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::~CCalenCustomisationManager
 // Destructor
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenCustomisationManager::~CCalenCustomisationManager()
 {
-TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( DUP1_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_ENTRY );
 // Reset and destroy the contents of the owned arrays,
 // this will delete the plugins.
 iPlugins.ResetAndDestroy();
 // Close the ECOM interface
 REComSession::FinalClose();
 iDefferedUnloadPluginList.Reset();
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( DUP1_CCALENCUSTOMISATIONMANAGER_CCALENCUSTOMISATIONMANAGER_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::GetCommandHandlerL
 // Get a command handler for a specific command.  Ownership remains with the
 // plugin
 // ----------------------------------------------------------------------------
 MCalenCommandHandler* CCalenCustomisationManager::GetCommandHandlerL( TInt aCommand )
 {
-TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_GETCOMMANDHANDLERL_ENTRY );
 MCalenCommandHandler* handler( NULL );
 // Loop though all the enabled plugins asking for a command handler
 // to handle this command with.  Returns NULL if no plugin wants to
 {
 // Report a problem with plugin.
 }
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_GETCOMMANDHANDLERL_EXIT );
 return handler;
 }
 // Returns a reference to an array of active plugins uids
 // ----------------------------------------------------------------------------
 //
 const RArray<TUid>& CCalenCustomisationManager::ActivePlugins() const
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_ACTIVEPLUGINS_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_ACTIVEPLUGINS_EXIT );
 return iActivePlugins;
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CreateActivePluginListL
 // Generates the list of active plugins
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::CreateActivePluginListL()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_CREATEACTIVEPLUGINLISTL_ENTRY );
 iPluginInfo.ResetAndDestroy();
 iActivePlugins.Reset();
 iRomBasedPlugins.Reset();
 REComSession::ListImplementationsL( KCalenCustomisationInterfaceUid, iPluginInfo );
 				}
 			}
 		}
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_CREATEACTIVEPLUGINLISTL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::LoadPluginsBasedOnVariantL
 // Loads the plugin based on the language variant
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::LoadPluginsBasedOnVariantL()
 {
+	OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_LOADPLUGINSBASEDONVARIANTL_ENTRY );
 	TLanguage languge = User::Language();
 	RArray<TUid> needsToBeRemoved;
 	switch(languge)
 		{
 				delete impl;
 				}
 			}
 		}
 	needsToBeRemoved.Close();
+	OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_LOADPLUGINSBASEDONVARIANTL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::PluginInfoFinder(
 // Matches an uid in pluginInfo.
 // ----------------------------------------------------------------------------
 //
 TBool CCalenCustomisationManager::PluginInfoFinder( const TUid* aUid,
 								const CImplementationInformation&  aArrayItem )
 {
+	OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_PLUGININFOFINDER_ENTRY );
 	return (*aUid  == aArrayItem.ImplementationUid() );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::SetPluginAvailabilityL
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::SetPluginAvailabilityL( TUid aPluginUid,
 TBool aEnabled )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_SETPLUGINAVAILABILITYL_ENTRY );
 if ( aEnabled )
 {
 EnablePluginL( aPluginUid );
 }
 else
 {
 DisablePluginL( aPluginUid );
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_SETPLUGINAVAILABILITYL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::DisablePluginL
 // Disables the given plugin.
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::DisablePluginL( TUid aPluginUid )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_DISABLEPLUGINL_ENTRY );
 // Find the plugins
 TInt index = iPlugins.Find( aPluginUid, CPluginInfo::Identifier );
 if ( index != KErrNotFound )
 {
 CPluginInfo* pluginInfo = iPlugins[index];
 }
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_DISABLEPLUGINL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::UnloadPluginsL
 // When a plugin is disabled it can not be unloaded until
 // is called when it is safe to unload the plugin.
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::UnloadPluginsL( const RArray<TUid>& aPlugins )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_UNLOADPLUGINSL_ENTRY );
 // Check plugin isn't already enabled
 TInt count = aPlugins.Count();
 for (TInt index = 0; index < count; ++index )
 {
 TInt position = iPlugins.Find( aPlugins[index], CPluginInfo::Identifier );
 		        	iPlugins[position]->Disable(ETrue);
 					iDefferedUnloadPluginList.AppendL(iPlugins[position]->Uid());
 		        	}
 		   }
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_UNLOADPLUGINSL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::EnablePluginL
 // Enables the given plugin. Returns KErrNotFound if
 // the plugin can't be found, KErrNone otherwise.
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::EnablePluginL( TUid aPluginUid )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_ENABLEPLUGINL_ENTRY );
 // Check plugin isn't already enabled
 TInt index = iPlugins.Find( aPluginUid, CPluginInfo::Identifier);
 if ( index == KErrNotFound )
 {
 // Issue notification of plugin been added
 iPluginsEnabledDisabled = ETrue;
 iServices.IssueNotificationL( ECalenNotifyPluginEnabledDisabled );
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_ENABLEPLUGINL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::HandleNotificationL
 // From MCalenNotificationHandler. Handles notifications.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::HandleNotification(const TCalenNotification aNotification )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATION_ENTRY );
 PIM_TRAPD_HANDLE( HandleNotificationL(aNotification) );
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATION_EXIT );
-TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::HandleNotificationL
 // Handles notifications that the list of available plugins had been changed,
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::HandleNotificationL(TCalenNotification aNotification)
 	{
-	TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATIONL_ENTRY );
 	switch( aNotification )
 		{
 		case ECalenNotifySystemLanguageChanged:
 			{
 			CreateActivePluginListL();
 			DoImmediatePluginLoadingL();
 			}
 			break;
 	}
-	TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_HANDLENOTIFICATIONL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::PluginInfoArray
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 const RImplInfoPtrArray& CCalenCustomisationManager::PluginInfoArray() const
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_PLUGININFOARRAY_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_PLUGININFOARRAY_EXIT );
 return iPluginInfo;
 }
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::DoImmediatePluginLoadingL()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_DOIMMEDIATEPLUGINLOADINGL_ENTRY );
 for(TInt i = 0 ; i < iPlugins.Count() ; i++)
 {
 RArray<TUid> pluginArray;
 CleanupClosePushL( pluginArray );
 pluginArray.AppendL( iPlugins[i]->Uid() );
 }
 }
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_DOIMMEDIATEPLUGINLOADINGL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::LoadPluginL
 // Loads a plugin
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::LoadPluginL( TUid aPluginUid )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_LOADPLUGINL_ENTRY );
 // Get a new services object from global data
 MCalenServices* services = iServicesFactory.NewServicesL();
 CleanupStack::PushL( services );
 // Creates the plugin and transfers ownership of the services
 // object to the plugin.
 // Cleanup
 CleanupStack::Pop( plugin );
 CleanupStack::Pop( services );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_LOADPLUGINL_EXIT );
 }
 // Returns the infobar.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 HbWidget* CCalenCustomisationManager::Infobar( )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_INFOBAR_ENTRY );
 iInfoBarProviderUid = TUid::Uid(0);
 HbWidget* infoBar =NULL;
 // Loop though all the command handlers, within two interlinked
 // for loops. If GetInfoBarL leaves for one plugin, a plugin
 	{
 		// Need to handle the error case
 	}
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_INFOBAR_EXIT );
 return infoBar;
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::InfobarTextL
 // @returns info bar text
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 QString* CCalenCustomisationManager::InfobarTextL()
 {
-TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_INFOBARTEXTL_ENTRY );
+	iInfoBarProviderUid = TUid::Uid(0);
-iInfoBarProviderUid = TUid::Uid(0);
+	QString* infoBarText =NULL;
-QString* infoBarText =NULL;
+	// Loop though all the command handlers, within two interlinked
-// Loop though all the command handlers, within two interlinked
+	// for loops. If GetInfoBarL leaves for one plugin, a plugin
-// for loops. If GetInfoBarL leaves for one plugin, a plugin
+	// error message will be displayed and the loop will continue with
-// error message will be displayed and the loop will continue with
+	// the next command handler. If none of the plugins leave, there will
-// the next command handler. If none of the plugins leave, there will
+	// be only one TRAP used.
-// be only one TRAP used.
+	TInt count = iPlugins.Count();
-TInt count = iPlugins.Count();
+	/*if(count > 0)
-/*if(count > 0)
+		{
-{
+		infoBar = iPlugins[0]->Plugin().InfobarL();
-infoBar = iPlugins[0]->Plugin().InfobarL();
+		iInfoBarProviderUid = iPlugins[0]->Uid();
-iInfoBarProviderUid = iPlugins[0]->Uid();
+		}*/
-}*/
+	for ( TInt index = 0; index < count && !infoBarText; ++index )
-for ( TInt index = 0; index < count && !infoBarText; ++index )
+		 {
-{
+		 TRAPD( error,
-TRAPD( error,
+			 // Loop though until an infobar is found
-// Loop though until an infobar is found
+			 for (; index < count && !infoBarText; ++index )
-for (; index < count && !infoBarText; ++index )
+				 {
-{
+				 //if ( !iPlugins[index]->IsDisabled() )
-//if ( !iPlugins[index]->IsDisabled() )
+					 {
-{
+					 infoBarText = iPlugins[index]->Plugin().InfobarTextL();
-infoBarText = iPlugins[index]->Plugin().InfobarTextL();
+					 iInfoBarProviderUid = iPlugins[index]->Uid();
-iInfoBarProviderUid = iPlugins[index]->Uid();
+					 }
-}
+				 }
-}
+			  );
-);
+		 if(error)
-if(error)
+				{
-		        	{
+					// Need to handle the error case
-		        		// Need to handle the error case
+				}
-		        	}
+		 }
-}
+	OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_INFOBARTEXTL_EXIT );
-TRACE_EXIT_POINT;
+	return infoBarText;
-return infoBarText;
+}
-}
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::FindPluginL
 // Finds a plugin and returns a plugin with a given uid, returns NULL
 // if the uid can not be found.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenCustomisation* CCalenCustomisationManager::FindPluginL( TUid aUid )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_FINDPLUGINL_ENTRY );
 TInt index = iPlugins.Find( aUid, CPluginInfo::Identifier );
 CCalenCustomisation* plugin = NULL;
 if ( index != KErrNotFound )
 {
 plugin = &( iPlugins[index]->Plugin() );
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_FINDPLUGINL_EXIT );
 return plugin;
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CPluginInfo::CPluginInfo(
 CCalenCustomisation* aPlugin,
 TUid aUid )
 : iPlugin( aPlugin ),
 iUid( aUid )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CPLUGININFO_CPLUGININFO_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CPLUGININFO_CPLUGININFO_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CPluginInfo::~CPluginInfo(
 // C++ destructor
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenCustomisationManager::CPluginInfo::~CPluginInfo()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( DUP1_CPLUGININFO_CPLUGININFO_ENTRY );
 delete iPlugin;
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( DUP1_CPLUGININFO_CPLUGININFO_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CPluginInfo::Plugin
 // returns a reference to the plugin
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenCustomisation& CCalenCustomisationManager::CPluginInfo::Plugin()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CPLUGININFO_PLUGIN_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CPLUGININFO_PLUGIN_EXIT );
 return *iPlugin;
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CPluginInfo::Uid
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 TUid CCalenCustomisationManager::CPluginInfo::Uid() const
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CPLUGININFO_UID_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CPLUGININFO_UID_EXIT );
 return iUid;
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CPluginInfo::Disable
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::CPluginInfo::Disable( TBool aDisable)
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CPLUGININFO_DISABLE_ENTRY );
 iDisabled = aDisable;
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CPLUGININFO_DISABLE_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CPluginInfo::IsDisabled
 // Returns if the plugin has been marked as being disabled
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 TBool CCalenCustomisationManager::CPluginInfo::IsDisabled()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CPLUGININFO_ISDISABLED_ENTRY );
+OstTraceFunctionExit0( CPLUGININFO_ISDISABLED_EXIT );
 return iDisabled;
-TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::AddPluginL( CCalenCustomisation* aPlugin,
 TUid aUid )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_ADDPLUGINL_ENTRY );
 CPluginInfo* newPlugin = new ( ELeave ) CPluginInfo( aPlugin, aUid);
 CleanupStack::PushL( newPlugin );
 iPlugins.AppendL( newPlugin );
 CleanupStack::Pop( newPlugin );
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_ADDPLUGINL_EXIT );
-TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::CPluginInfo::Identifier(
 // Matches an uid and a plugin uid. Used by FindPluginL to
 // ----------------------------------------------------------------------------
 //
 TBool CCalenCustomisationManager::CPluginInfo::Identifier( const TUid* aUid,
 const CPluginInfo& aArray )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CPLUGININFO_IDENTIFIER_ENTRY );
-TRACE_EXIT_POINT;
 return ( *aUid == aArray.Uid() );
 }
 // ----------------------------------------------------------------------------
 //
 TBool CCalenCustomisationManager::PluginAvailabilityFinder( const TUid* aUid,
 const TCalenPluginAvailability& aArrayItem )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_PLUGINAVAILABILITYFINDER_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_PLUGINAVAILABILITYFINDER_EXIT );
 return ( *aUid == aArrayItem.iUid);
 }
 // ----------------------------------------------------------------------------
 // CCalenCustomisationManager::OfferMenu
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenCustomisationManager::OfferMenu(HbMenu* aHbMenu )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCUSTOMISATIONMANAGER_OFFERMENU_ENTRY );
 // Get the number of command handlers
 //   TInt count = iCommandHandlers.Count();
 const TInt count = iPlugins.Count();
 // Loop though all the command handlers, within two interlinked
 {
 // Report a problem with plugin.
 }
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCUSTOMISATIONMANAGER_OFFERMENU_EXIT );
 }
 // End of File

changeset 55	2c54b51f39c4
parent 45	b6db4fd4947b
child 89	b57382753122