diff -r 96907930389d -r 12af337248b1 calendarui/controller/src/calenpopulationstate.cpp
--- a/calendarui/controller/src/calenpopulationstate.cpp	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/controller/src/calenpopulationstate.cpp	Tue Aug 31 15:13:43 2010 +0300
@@ -11,33 +11,36 @@
 *
 * Contributors:
 *
-* Description:   Calendar state machine
+* Description:  Calendar state machine
 *
 */
 
 
-
 // includes
 #include "calenpopulationstate.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 "calenpopulationstateTraces.h"
+#endif
 
 // ----------------------------------------------------------------------------
-// CCalenPopulationState::NewLC
+// CalenPopulationState::NewLC
 // First stage construction
 // ----------------------------------------------------------------------------
 CCalenPopulationState* CCalenPopulationState::NewLC( CCalenController& aController,
                                                     RHashSet<TCalenNotification>& aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
-
+    OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_NEWLC_ENTRY );
+    
     CCalenPopulationState* self = new( ELeave ) CCalenPopulationState( aController, aOutstandingNotifications );
     CleanupStack::PushL( self );
     self->ConstructL();
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENPOPULATIONSTATE_NEWLC_EXIT );
     return self;
     }
 
@@ -47,10 +50,11 @@
 // ----------------------------------------------------------------------------
 void CCalenPopulationState::ConstructL()
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_CONSTRUCTL_ENTRY );
+    
     BaseConstructL();   
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENPOPULATIONSTATE_CONSTRUCTL_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -61,9 +65,9 @@
                                                           RHashSet<TCalenNotification>&  aOutstandingNotifications )
     : CCalenState( aController, aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_ENTRY );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -72,9 +76,9 @@
 // ----------------------------------------------------------------------------    
 CCalenPopulationState::~CCalenPopulationState()
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( DUP1_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_ENTRY );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( DUP1_CCALENPOPULATIONSTATE_CCALENPOPULATIONSTATE_EXIT );
     }
 
 // ----------------------------------------------------------------------------
@@ -84,7 +88,8 @@
 TBool CCalenPopulationState::HandleCommandL( const TCalenCommand& aCommand,
                                             CCalenStateMachine& aStateMachine )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_HANDLECOMMANDL_ENTRY );
+    
     TInt cmd = aCommand.Command();
     MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
     
@@ -100,7 +105,7 @@
         cmdUsed = ETrue;
         }
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENPOPULATIONSTATE_HANDLECOMMANDL_EXIT );
     return cmdUsed;
     }
 
@@ -111,7 +116,7 @@
 void CCalenPopulationState::HandleNotificationL(const TCalenNotification& aNotification,
                                                   CCalenStateMachine& aStateMachine )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENPOPULATIONSTATE_HANDLENOTIFICATIONL_ENTRY );
     
     switch ( aNotification )
         {
@@ -128,7 +133,7 @@
             break;
         }
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENPOPULATIONSTATE_HANDLENOTIFICATIONL_EXIT );
     }