diff -r 96907930389d -r 12af337248b1 calendarui/controller/src/calenhelpstate.cpp
--- a/calendarui/controller/src/calenhelpstate.cpp	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/controller/src/calenhelpstate.cpp	Tue Aug 31 15:13:43 2010 +0300
@@ -11,18 +11,21 @@
 *
 * Contributors:
 *
-* Description:   Calendar state machine
+* Description:  Calendar state machine
 *
 */
 
 
-
 // includes
 #include "calenhelpstate.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 "calenhelpstateTraces.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // CCalenHelpState::NewLC
@@ -31,13 +34,13 @@
 CCalenHelpState* CCalenHelpState::NewLC( CCalenController& aController,
                                                 RHashSet<TCalenNotification>&  aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
-
+    OstTraceFunctionEntry0( CCALENHELPSTATE_NEWLC_ENTRY );
+    
     CCalenHelpState* self = new ( ELeave ) CCalenHelpState( aController, aOutstandingNotifications );
     CleanupStack::PushL( self );
     self->ConstructL();
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENHELPSTATE_NEWLC_EXIT );
     return self;
     }
 
@@ -47,10 +50,11 @@
 // ----------------------------------------------------------------------------
 void CCalenHelpState::ConstructL()
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENHELPSTATE_CONSTRUCTL_ENTRY );
+    
     BaseConstructL();
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENHELPSTATE_CONSTRUCTL_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -61,9 +65,9 @@
                                              RHashSet<TCalenNotification>&  aOutstandingNotifications )
     : CCalenState( aController, aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENHELPSTATE_CCALENHELPSTATE_ENTRY );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENHELPSTATE_CCALENHELPSTATE_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -72,9 +76,9 @@
 // ----------------------------------------------------------------------------    
 CCalenHelpState::~CCalenHelpState()
     {
-    TRACE_ENTRY_POINT;
-    
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( DUP1_CCALENHELPSTATE_CCALENHELPSTATE_ENTRY );
+
+    OstTraceFunctionExit0( DUP1_CCALENHELPSTATE_CCALENHELPSTATE_EXIT );
     }
 
 // ----------------------------------------------------------------------------
@@ -84,7 +88,8 @@
 TBool CCalenHelpState::HandleCommandL( const TCalenCommand& aCommand,
                                    CCalenStateMachine& aStateMachine )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENHELPSTATE_HANDLECOMMANDL_ENTRY );
+    
     TInt cmd = aCommand.Command();
     MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
     
@@ -101,7 +106,7 @@
         cmdUsed = ETrue;
         }
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENHELPSTATE_HANDLECOMMANDL_EXIT );
     return cmdUsed;
 
     }
@@ -113,8 +118,9 @@
 void CCalenHelpState::HandleNotificationL(const TCalenNotification& /*aNotification*/,
                                           CCalenStateMachine& /*aStateMachine*/ )
     {
-    TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( CCALENHELPSTATE_HANDLENOTIFICATIONL_ENTRY );
+    
+    OstTraceFunctionExit0( CCALENHELPSTATE_HANDLENOTIFICATIONL_EXIT );
     }