--- a/imagehandlingutilities/thumbnailmanager/tmcommon/src/tmactivitymanager.cpp	Tue Aug 31 15:30:59 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/tmcommon/src/tmactivitymanager.cpp	Wed Sep 01 12:20:35 2010 +0100
@@ -17,10 +17,6 @@
 
 #include "tmactivitymanager.h"
 #include "thumbnaillog.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tmactivitymanagerTraces.h"
-#endif
 
 // ---------------------------------------------------------------------------
 // CTMActivityManager::NewL()
@@ -29,7 +25,6 @@
 CTMActivityManager* CTMActivityManager::NewL(MTMActivityManagerObserver* aObserver, TInt aTimeout)
     {
     TN_DEBUG1( "CTMActivityManager::NewL()");
-    OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_NEWL, "CTMActivityManager::NewL" );
     
     CTMActivityManager* self = new (ELeave) CTMActivityManager(aObserver, aTimeout);
     CleanupStack::PushL(self);
@@ -46,7 +41,6 @@
 : CActive(CActive::EPriorityHigh), iObserver(aObserver), iTimeout(aTimeout), iPreviousStatus(KErrNotFound)
     {
     TN_DEBUG1( "CTMActivityManager::CTMActivityManager()");
-    OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_CTMACTIVITYMANAGER, "CTMActivityManager::CTMActivityManager" );
     
     CActiveScheduler::Add(this);
     }
@@ -58,7 +52,6 @@
 CTMActivityManager::~CTMActivityManager()
     {
     TN_DEBUG1( "CTMActivityManager::~CTMActivityManager()");
-    OstTrace0( TRACE_NORMAL, DUP1_CTMACTIVITYMANAGER_CTMACTIVITYMANAGER, "CTMActivityManager::~CTMActivityManager" );
     
     iObserver = NULL;
     Cancel();
@@ -79,7 +72,6 @@
 void CTMActivityManager::ConstructL()
     {
     TN_DEBUG1( "CTMActivityManager::ConstructL()");
-    OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_CONSTRUCTL, "CTMActivityManager::ConstructL" );
     
     iTimer.CreateLocal();
     iWatch = ENone;
@@ -92,7 +84,6 @@
 void CTMActivityManager::SetTimeout(TInt aTimeout)
     {
     TN_DEBUG1( "CTMActivityManager::SetTimeout()");
-    OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_SETTIMEOUT, "CTMActivityManager::SetTimeout" );
     
     iTimeout = aTimeout;
     Reset();
@@ -105,7 +96,6 @@
 void CTMActivityManager::Reset()
     {
     TN_DEBUG1( "CTMActivityManager::Reset()");
-    OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_RESET, "CTMActivityManager::Reset" );
 
 #ifdef MONITOR_LIGHTS
     delete iLight;
@@ -122,7 +112,6 @@
 void CTMActivityManager::DoCancel()
     {
     TN_DEBUG1( "CTMActivityManager::DoCancel()");
-    OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_DOCANCEL, "CTMActivityManager::DoCancel" );
     
 #ifdef MONITOR_LIGHTS
     delete iLight;
@@ -140,7 +129,6 @@
 void CTMActivityManager::Start()
     {
     TN_DEBUG1( "CTMActivityManager::Start()");
-    OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_START, "CTMActivityManager::Start" );
     
 #ifdef MONITOR_LIGHTS
     if(!iLight)
@@ -169,13 +157,10 @@
 void CTMActivityManager::RunL()
     {
     TN_DEBUG4( "CTMActivityManager::RunL(0x%08x) %d, observer = 0x%08x", this, iStatus.Int(), iObserver);
-    OstTrace1( TRACE_NORMAL, CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL;this=%o", this );
-    OstTrace1( TRACE_NORMAL, DUP5_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL;iStatus.Int()=%d", iStatus.Int() );
     
     if(iFirstRound)
         {
         TN_DEBUG1( "CTMActivityManager::RunL() iFirstRound");
-        OstTrace0( TRACE_NORMAL, DUP1_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL - iFirstRound" );
         iFirstRound = EFalse;
         if (!IsActive())
              {
@@ -195,7 +180,6 @@
             if (inactivity >= iTimeout)
                 {
                 TN_DEBUG1( "CTMActivityManager::RunL() inactive");
-                OstTrace0( TRACE_NORMAL, DUP2_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL - inactive" );
                 NotifyObserver();
 
                 if (!IsActive()) //observer might have called a Reset()
@@ -212,7 +196,6 @@
         else if (iWatch == EWaitingForActivity)
             {
             TN_DEBUG1( "CTMActivityManager::RunL() active");
-            OstTrace0( TRACE_NORMAL, DUP3_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL - active" );
             NotifyObserver();
              
             if (!IsActive()) //observer might have called a Reset()
@@ -232,7 +215,6 @@
         iWatch = ENone;
         }
         TN_DEBUG1( "CTMActivityManager::RunL() end");
-        OstTrace0( TRACE_NORMAL, DUP4_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL - end" );
     }
 
 // ---------------------------------------------------------------------------
@@ -242,7 +224,6 @@
 TInt CTMActivityManager::RunError(TInt aError)
     {
     TN_DEBUG2( "CTMActivityManager::RunError() %d", aError);
-    OstTrace1( TRACE_NORMAL, CTMACTIVITYMANAGER_RUNERROR, "CTMActivityManager::RunError;aError=%d", aError );
     
     if (aError != KErrNone)
         {
@@ -261,14 +242,10 @@
     {
 #ifdef MONITOR_LIGHTS
 #ifdef _DEBUG
-TInt inactivityTime = User::InactivityTime().Int();
 TN_DEBUG3( "CTMActivityManager::IsInactive()= %d, iLights = %d", User::InactivityTime().Int(), iLights);
-OstTrace1( TRACE_NORMAL, DUP6_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL;inactivityTime=%d", inactivityTime );
 #endif
 #else
-TInt inactivityTime = User::InactivityTime().Int();
 TN_DEBUG2( "CTMActivityManager::IsInactive()= %d", User::InactivityTime().Int());
-OstTrace1( TRACE_NORMAL, DUP7_CTMACTIVITYMANAGER_RUNL, "CTMActivityManager::RunL;inactivityTime=%d", inactivityTime );
 #endif
 
     //if lights are off or inactivity timer is less that target the device is not idle
@@ -279,11 +256,9 @@
             )
       {
       TN_DEBUG1( "CTMActivityManager::IsInactive() ETrue");
-      OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_ISINACTIVE, "CTMActivityManager::IsInactive - ETrue" );
       return ETrue;
       }
     TN_DEBUG1( "CTMActivityManager::IsInactive() EFalse");
-    OstTrace0( TRACE_NORMAL, DUP1_CTMACTIVITYMANAGER_ISINACTIVE, "CTMActivityManager::IsInactive - EFalse" );
     return EFalse;
     }
 
@@ -295,20 +270,17 @@
 void CTMActivityManager::LightStatusChanged(TInt aTarget, CHWRMLight::TLightStatus aStatus)
     {
     TN_DEBUG3( "CTMActivityManager::LightStatusChanged() aTarget = %d, aStatus == %d", aTarget, aStatus);
-    OstTraceExt2( TRACE_NORMAL, CTMACTIVITYMANAGER_LIGHTSTATUSCHANGED, "CTMActivityManager::LightStatusChanged;aTarget=%d;aStatus=%u", aTarget, aStatus );    
     
     if(aTarget & CHWRMLight::EPrimaryDisplay)
         {
          if( aStatus == CHWRMLight::ELightOff )
             {
             TN_DEBUG1( "CTMActivityManager::LightStatusChanged() -- OFF");
-            OstTrace0( TRACE_NORMAL, DUP1_CTMACTIVITYMANAGER_LIGHTSTATUSCHANGED, "CTMActivityManager::LightStatusChanged - OFF" );
             iLights = EFalse;
             }
         else
             {
             TN_DEBUG1( "CTMActivityManager::LightStatusChanged() -- ON");
-            OstTrace0( TRACE_NORMAL, DUP2_CTMACTIVITYMANAGER_LIGHTSTATUSCHANGED, "CTMActivityManager::LightStatusChanged - ON" );
             iLights = ETrue;
             }
      
@@ -324,7 +296,6 @@
 void CTMActivityManager::NotifyObserver()
     {
     TN_DEBUG1( "void CTMAActivityManager::NotifyObserver()");
-    OstTrace0( TRACE_NORMAL, CTMACTIVITYMANAGER_NOTIFYOBSERVER, "CTMActivityManager::NotifyObserver" );
     
     TBool status = IsInactive();