diff -r 579cc610882e -r ef813d54df51 calendarui/controller/src/calenexitingstate.cpp
--- a/calendarui/controller/src/calenexitingstate.cpp	Tue Jul 06 14:14:56 2010 +0300
+++ b/calendarui/controller/src/calenexitingstate.cpp	Wed Aug 18 09:47:38 2010 +0300
@@ -22,6 +22,10 @@
 #include "calencontroller.h"
 #include "calenstatemachine.h"
 #include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenexitingstateTraces.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // CCalenExitingState::NewLC
@@ -30,13 +34,13 @@
 CCalenExitingState* CCalenExitingState::NewLC( CCalenController& aController,
                                                        RHashSet<TCalenNotification>&  aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENEXITINGSTATE_NEWLC_ENTRY );
 
     CCalenExitingState* self = new ( ELeave ) CCalenExitingState( aController,aOutstandingNotifications);
     CleanupStack::PushL( self );
     self->ConstructL();
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENEXITINGSTATE_NEWLC_EXIT );
     return self;
     }
 
@@ -46,10 +50,11 @@
 // ----------------------------------------------------------------------------
 void CCalenExitingState::ConstructL()
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENEXITINGSTATE_CONSTRUCTL_ENTRY );
+    
     BaseConstructL();
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENEXITINGSTATE_CONSTRUCTL_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -60,9 +65,9 @@
                                                     RHashSet<TCalenNotification>&  aOutstandingNotifications )
     : CCalenState( aController, aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -71,9 +76,9 @@
 // ----------------------------------------------------------------------------    
 CCalenExitingState::~CCalenExitingState()
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT );
     }
 
 // ----------------------------------------------------------------------------
@@ -83,8 +88,9 @@
 TBool CCalenExitingState::HandleCommandL( const TCalenCommand& /*aCommand*/,
                                         CCalenStateMachine& /*aStateMachine*/  )
     {
-    TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( CCALENEXITINGSTATE_HANDLECOMMANDL_ENTRY );
+    
+    OstTraceFunctionExit0( CCALENEXITINGSTATE_HANDLECOMMANDL_EXIT );
     return EFalse;
     }
 
@@ -95,8 +101,9 @@
 void CCalenExitingState::HandleNotificationL(const TCalenNotification& /*aNotification*/,
                                               CCalenStateMachine& /*aStateMachine*/ )
     {
-    TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( CCALENEXITINGSTATE_HANDLENOTIFICATIONL_ENTRY );
+    
+    OstTraceFunctionExit0( CCALENEXITINGSTATE_HANDLENOTIFICATIONL_EXIT );
     }