FCL/sf/app/organizer: comparison calendarui/controller/src/calennotifier.cpp

equal deleted inserted replaced

-:ecd7b9840282
+:0b38fc5b94c6
 //user includes
 #include "calendarui_debug.h"
 #include "calennotifier.h"            // CalenNotifier
 #include "calenstatemachine.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calennotifierTraces.h"
+#endif
 const TInt KHashLength = 64;
 // ----------------------------------------------------------------------------
 // CalenNotifier::CalenNotifier
 // ----------------------------------------------------------------------------
 //
 CalenNotifier::CalenNotifier( CCalenStateMachine& aStateMachine )
 : iStateMachine( aStateMachine )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_CALENNOTIFIER_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_CALENNOTIFIER_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::~CalenNotifier
 // Destructor.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CalenNotifier::~CalenNotifier()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( DUP1_CALENNOTIFIER_CALENNOTIFIER_ENTRY );
 // Reset the handler array.
 // Before we reset , close hashset for each handler
 for(TInt i = 0 ; i < iHandlers.Count() ; i++)
 {
 iHandlers[i].iHashSet.Close();
 {
 iEnvChangeNotifier->Cancel();
 delete iEnvChangeNotifier;
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( DUP1_CALENNOTIFIER_CALENNOTIFIER_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::ConstructL
 // Symbian 2nd phase of construction.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CalenNotifier::ConstructL()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_CONSTRUCTL_ENTRY );
 // Register for system environment changes
 TCallBack envCallback( EnvChangeCallbackL, this );
 iEnvChangeNotifier =
 CEnvironmentChangeNotifier::NewL( EActivePriorityLogonA, envCallback );
 iEnvChangeNotifier->Start();
 iIgnoreFirstLocaleChange = ETrue;
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_CONSTRUCTL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::RegisterForNotificationsL
 // Adds the passed handler to the handler array.
 // ----------------------------------------------------------------------------
 //
 void CalenNotifier::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
 TCalenNotification aNotification)
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_ENTRY );
 TNotificationHandler handler;
 handler.iHandler = aHandler;
 //Prepare hash
 handler.iHashSet.ReserveL(KHashLength);
 handler.iHashSet.InsertL(aNotification);
 }
 iHandlers.Append( handler );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::RegisterForNotificationsL
 // Adds the passed handler to the handler array.
 // ----------------------------------------------------------------------------
 //
 void CalenNotifier::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
 RArray<TCalenNotification>& aNotifications  )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( DUP1_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_ENTRY );
 TNotificationHandler handler;
 handler.iHandler = aHandler;
 //Prepare hash
 }
 }
 iHandlers.Append( handler );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( DUP1_CALENNOTIFIER_REGISTERFORNOTIFICATIONSL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::CancelNotifications
 // Removes the passed handler from the handler array.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CalenNotifier::CancelNotifications( MCalenNotificationHandler* aHandler )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_CANCELNOTIFICATIONS_ENTRY );
 for( TInt x = 0; x < iHandlers.Count(); ++x )
 {
 if( iHandlers[x].iHandler == aHandler )
 {
 // Mark the notification for deletion by
 // settings the handler to NULL. Actual deletion
 // will take place in DoBroadcast
 iHandlers[x].iHashSet.Close();
 iHandlers[x].iHandler = NULL;
 TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_CANCELNOTIFICATIONS_EXIT );
 return;
 }
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( DUP1_CALENNOTIFIER_CANCELNOTIFICATIONS_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::ContextChanged
 // From MCalenContextChangeObserver. Called when the context changes.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CalenNotifier::ContextChanged()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_CONTEXTCHANGED_ENTRY );
 BroadcastNotification( ECalenNotifyContextChanged );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_CONTEXTCHANGED_EXIT );
 }
 // ----------------------------------------------------------------------------
 //  CCalenNotifier::EnvChangeCallbackL
 //  CEnvironmentChangeNotifier callback.  Calendar is only interested in:
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 TInt CalenNotifier::EnvChangeCallbackL( TAny* aThisPtr )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_ENVCHANGECALLBACKL_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_ENVCHANGECALLBACKL_EXIT );
 // Return value for functions used as TCallBack objects should be EFalse
 // unless the function is intended to be called again from a timer.
 // return EFalse;
 return static_cast<CalenNotifier*>(aThisPtr)->DoEnvChange();
 }
 //  EnvChangeCallbackL calls this function
 // ----------------------------------------------------------------------------
 //
 TInt CalenNotifier::DoEnvChange()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_DOENVCHANGE_ENTRY );
 if( ((iEnvChangeNotifier->Change() & EChangesMidnightCrossover)
 || (iEnvChangeNotifier->Change() & EChangesSystemTime))
 && !iIgnoreFirstLocaleChange )
 {
 else
 {
 iIgnoreFirstLocaleChange = EFalse;
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_DOENVCHANGE_EXIT );
 return EFalse ;
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::BroadcastNotification
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CalenNotifier::BroadcastNotification( TCalenNotification aNotification )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_BROADCASTNOTIFICATION_ENTRY );
 // Someone has told us to broadcast, or one of our notifiers completed.
 // We run it past the state machine and that may or may not call the
 // function to really do the broadcast.
 iStateMachine.HandleNotification( aNotification );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_BROADCASTNOTIFICATION_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::BroadcastApprovedNotification
 // Issues a notification to all registered handlers
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CalenNotifier::BroadcastApprovedNotification( TCalenNotification aNotification )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_BROADCASTAPPROVEDNOTIFICATION_ENTRY );
 iBroadcastQueue.Append( aNotification );
 if( !iBroadcastActive )
 {
 iBroadcastQueue.Remove( 0 );
 }
 iBroadcastActive = EFalse;
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_BROADCASTAPPROVEDNOTIFICATION_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::DoBroadcast
 // Issues a notification to all registered handlers
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CalenNotifier::DoBroadcast( TCalenNotification aNotification )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CALENNOTIFIER_DOBROADCAST_ENTRY );
 for( TInt x = 0; x < iHandlers.Count(); ++x )
 {
 TNotificationHandler handler = iHandlers[x];
 if( handler.iHandler )
 {
 iHandlers.Remove( x ); // remove the entry
 --x; // decrement the index.
 }
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CALENNOTIFIER_DOBROADCAST_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CalenNotifier::TNotificationHandler()
 // TNotificationHandler contructor
 // ----------------------------------------------------------------------------
 CalenNotifier::TNotificationHandler::TNotificationHandler() :
 iHashSet(&::HashCalenNotificationFunction,&::HashCalenNotificationIdentityRelation)
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_EXIT );
 }
 // End of file

changeset 51	0b38fc5b94c6
parent 18	c198609911f9
child 89	b57382753122