diff -r 12af337248b1 -r bd7edf625bdd calendarui/controller/src/calenexitingstate.cpp
--- a/calendarui/controller/src/calenexitingstate.cpp	Tue Aug 31 15:13:43 2010 +0300
+++ b/calendarui/controller/src/calenexitingstate.cpp	Wed Sep 01 12:32:31 2010 +0100
@@ -11,21 +11,18 @@
 *
 * Contributors:
 *
-* Description:  Calendar state machine
+* Description:   Calendar state machine
 *
 */
 
 
+
 // includes
 #include "calenexitingstate.h"
 #include "calendarui_debug.h"           // Debug macros
 #include "calencontroller.h"
 #include "calenstatemachine.h"
 #include "calennotifier.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "calenexitingstateTraces.h"
-#endif
 
 // ----------------------------------------------------------------------------
 // CCalenExitingState::NewLC
@@ -34,13 +31,13 @@
 CCalenExitingState* CCalenExitingState::NewLC( CCalenController& aController,
                                                        RHashSet<TCalenNotification>&  aOutstandingNotifications )
     {
-    OstTraceFunctionEntry0( CCALENEXITINGSTATE_NEWLC_ENTRY );
+    TRACE_ENTRY_POINT;
 
     CCalenExitingState* self = new ( ELeave ) CCalenExitingState( aController,aOutstandingNotifications);
     CleanupStack::PushL( self );
     self->ConstructL();
 
-    OstTraceFunctionExit0( CCALENEXITINGSTATE_NEWLC_EXIT );
+    TRACE_EXIT_POINT;
     return self;
     }
 
@@ -50,11 +47,10 @@
 // ----------------------------------------------------------------------------
 void CCalenExitingState::ConstructL()
     {
-    OstTraceFunctionEntry0( CCALENEXITINGSTATE_CONSTRUCTL_ENTRY );
-    
+    TRACE_ENTRY_POINT;
     BaseConstructL();
     
-    OstTraceFunctionExit0( CCALENEXITINGSTATE_CONSTRUCTL_EXIT );
+    TRACE_EXIT_POINT;
     }
     
 // ----------------------------------------------------------------------------
@@ -65,9 +61,9 @@
                                                     RHashSet<TCalenNotification>&  aOutstandingNotifications )
     : CCalenState( aController, aOutstandingNotifications )
     {
-    OstTraceFunctionEntry0( CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY );
+    TRACE_ENTRY_POINT;
     
-    OstTraceFunctionExit0( CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT );
+    TRACE_EXIT_POINT;
     }
     
 // ----------------------------------------------------------------------------
@@ -76,9 +72,9 @@
 // ----------------------------------------------------------------------------    
 CCalenExitingState::~CCalenExitingState()
     {
-    OstTraceFunctionEntry0( DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_ENTRY );
+    TRACE_ENTRY_POINT;
     
-    OstTraceFunctionExit0( DUP1_CCALENEXITINGSTATE_CCALENEXITINGSTATE_EXIT );
+    TRACE_EXIT_POINT;
     }
 
 // ----------------------------------------------------------------------------
@@ -88,9 +84,8 @@
 TBool CCalenExitingState::HandleCommandL( const TCalenCommand& /*aCommand*/,
                                         CCalenStateMachine& /*aStateMachine*/  )
     {
-    OstTraceFunctionEntry0( CCALENEXITINGSTATE_HANDLECOMMANDL_ENTRY );
-    
-    OstTraceFunctionExit0( CCALENEXITINGSTATE_HANDLECOMMANDL_EXIT );
+    TRACE_ENTRY_POINT;
+    TRACE_EXIT_POINT;
     return EFalse;
     }
 
@@ -101,9 +96,8 @@
 void CCalenExitingState::HandleNotificationL(const TCalenNotification& /*aNotification*/,
                                               CCalenStateMachine& /*aStateMachine*/ )
     {
-    OstTraceFunctionEntry0( CCALENEXITINGSTATE_HANDLENOTIFICATIONL_ENTRY );
-    
-    OstTraceFunctionExit0( CCALENEXITINGSTATE_HANDLENOTIFICATIONL_EXIT );
+    TRACE_ENTRY_POINT;
+    TRACE_EXIT_POINT;
     }