diff -r ecd7b9840282 -r 0b38fc5b94c6 calendarui/controller/src/calenidlestate.cpp
--- a/calendarui/controller/src/calenidlestate.cpp	Fri Jul 02 19:56:46 2010 +0530
+++ b/calendarui/controller/src/calenidlestate.cpp	Mon Jul 12 02:32:28 2010 +0530
@@ -22,6 +22,10 @@
 #include "calencontroller.h"
 #include "calenstatemachine.h"
 #include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenidlestateTraces.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // CalenIdleState::NewLC
@@ -30,14 +34,14 @@
 CCalenIdleState* CCalenIdleState::NewLC( CCalenController& aController, 
                     RHashSet<TCalenNotification>&  aOutstandingNotifications  )
     {
-    TRACE_ENTRY_POINT;
-
+    OstTraceFunctionEntry0( CCALENIDLESTATE_NEWLC_ENTRY );
+    
     CCalenIdleState* self = new ( ELeave ) CCalenIdleState( aController, 
                                                     aOutstandingNotifications );
     CleanupStack::PushL( self );
     self->ConstructL();
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENIDLESTATE_NEWLC_EXIT );
     return self;
     }
 
@@ -47,10 +51,11 @@
 // ----------------------------------------------------------------------------
 void CCalenIdleState::ConstructL()
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENIDLESTATE_CONSTRUCTL_ENTRY );
+    
     BaseConstructL();
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENIDLESTATE_CONSTRUCTL_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -61,9 +66,9 @@
                     RHashSet<TCalenNotification>&  aOutstandingNotifications )
     : CCalenState( aController, aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENIDLESTATE_CCALENIDLESTATE_ENTRY );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENIDLESTATE_CCALENIDLESTATE_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -72,9 +77,9 @@
 // ----------------------------------------------------------------------------    
 CCalenIdleState::~CCalenIdleState()
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( DUP1_CCALENIDLESTATE_CCALENIDLESTATE_ENTRY );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( DUP1_CCALENIDLESTATE_CCALENIDLESTATE_EXIT );
     }
 
 // ----------------------------------------------------------------------------
@@ -84,7 +89,7 @@
 TBool CCalenIdleState::HandleCommandL( const TCalenCommand& aCommand,
                                        CCalenStateMachine& aStateMachine )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENIDLESTATE_HANDLECOMMANDL_ENTRY );
     
     TInt cmd = aCommand.Command();
     MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -220,7 +225,7 @@
         
     RequestCallbackL( handler, aCommand );
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENIDLESTATE_HANDLECOMMANDL_EXIT );
     return cmdUsed;
     }
 
@@ -231,11 +236,11 @@
 void CCalenIdleState::HandleNotificationL(const TCalenNotification& aNotification,
                                           CCalenStateMachine& aStateMachine)
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENIDLESTATE_HANDLENOTIFICATIONL_ENTRY );
     
     CCalenState::HandleNotificationL( aNotification, aStateMachine );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENIDLESTATE_HANDLENOTIFICATIONL_EXIT );
     }
 
 // end of file