diff -r 12af337248b1 -r bd7edf625bdd calendarui/controller/src/calenprintingstate.cpp
--- a/calendarui/controller/src/calenprintingstate.cpp	Tue Aug 31 15:13:43 2010 +0300
+++ b/calendarui/controller/src/calenprintingstate.cpp	Wed Sep 01 12:32:31 2010 +0100
@@ -11,21 +11,18 @@
 *
 * Contributors:
 *
-* Description:  Calendar state machine
+* Description:   Calendar state machine
 *
 */
 
 
+
 // includes
 #include "calenprintingstate.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 "calenprintingstateTraces.h"
-#endif
 
 // ----------------------------------------------------------------------------
 // CCalenPrintingState::NewLC
@@ -34,13 +31,13 @@
 CCalenPrintingState* CCalenPrintingState::NewLC( CCalenController& aController,
                                                         RHashSet<TCalenNotification>& aOutstandingNotifications )
     {
-    OstTraceFunctionEntry0( CCALENPRINTINGSTATE_NEWLC_ENTRY );
-    
+    TRACE_ENTRY_POINT;
+
     CCalenPrintingState* self = new ( ELeave ) CCalenPrintingState( aController,aOutstandingNotifications );
     CleanupStack::PushL( self );
     self->ConstructL();
 
-    OstTraceFunctionExit0( CCALENPRINTINGSTATE_NEWLC_EXIT );
+    TRACE_EXIT_POINT;
     return self;
     }
 
@@ -50,11 +47,10 @@
 // ----------------------------------------------------------------------------
 void CCalenPrintingState::ConstructL()
     {
-    OstTraceFunctionEntry0( CCALENPRINTINGSTATE_CONSTRUCTL_ENTRY );
-    
+    TRACE_ENTRY_POINT;
     BaseConstructL();    
     
-    OstTraceFunctionExit0( CCALENPRINTINGSTATE_CONSTRUCTL_EXIT );
+    TRACE_EXIT_POINT;
     }
     
 // ----------------------------------------------------------------------------
@@ -65,9 +61,9 @@
                                                 RHashSet<TCalenNotification>& aOutstandingNotifications )
     : CCalenState( aController, aOutstandingNotifications )
     {
-    OstTraceFunctionEntry0( CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_ENTRY );
+    TRACE_ENTRY_POINT;
     
-    OstTraceFunctionExit0( CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_EXIT );
+    TRACE_EXIT_POINT;
     }
     
 // ----------------------------------------------------------------------------
@@ -76,9 +72,9 @@
 // ----------------------------------------------------------------------------    
 CCalenPrintingState::~CCalenPrintingState()
     {
-    OstTraceFunctionEntry0( DUP1_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_ENTRY );
+    TRACE_ENTRY_POINT;
     
-    OstTraceFunctionExit0( DUP1_CCALENPRINTINGSTATE_CCALENPRINTINGSTATE_EXIT );
+    TRACE_EXIT_POINT;
     }
 
 // ----------------------------------------------------------------------------
@@ -88,8 +84,7 @@
 TBool CCalenPrintingState::HandleCommandL( const TCalenCommand& aCommand,
                                           CCalenStateMachine& aStateMachine )
     {
-    OstTraceFunctionEntry0( CCALENPRINTINGSTATE_HANDLECOMMANDL_ENTRY );
-    
+    TRACE_ENTRY_POINT;
     TInt cmd = aCommand.Command();
     MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
     
@@ -105,7 +100,7 @@
         cmdUsed = ETrue;
         }
 
-    OstTraceFunctionExit0( CCALENPRINTINGSTATE_HANDLECOMMANDL_EXIT );
+    TRACE_EXIT_POINT;
     return cmdUsed;
     }
 
@@ -116,9 +111,8 @@
 void CCalenPrintingState::HandleNotificationL(const TCalenNotification& /*aNotification*/,
                                                CCalenStateMachine& /*aStateMachine*/ )
     {
-    OstTraceFunctionEntry0( CCALENPRINTINGSTATE_HANDLENOTIFICATIONL_ENTRY );
-    
-    OstTraceFunctionExit0( CCALENPRINTINGSTATE_HANDLENOTIFICATIONL_EXIT );
+    TRACE_ENTRY_POINT;
+    TRACE_EXIT_POINT;
     }
 
 // end of file