--- a/telephonyutils/telephonywatchers/src/indicatorwatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/src/indicatorwatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -14,13 +14,7 @@
 //
 
 // User includes
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "indicatorwatcherTraces.h"
-#endif
-
+#include "watcherlog.h"
 #include "indicatorwatcher.h"
 
 // System includes
@@ -81,7 +75,7 @@
 		{
 	case EIndicatorNotYetInitialised:
 	case EIndicatorRequestInitialIndicator:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEPHONESTATEEVENTL_1, "IndicatorWatcher : Requesting initial indicator values");
+		LOGINDICATOR1("IndicatorWatcher : Requesting initial indicator values");
 		Phone().GetIndicator(iStatus, iIndicatorInfo);
 		IndicatorState() = EIndicatorWaitingForInitialIndicator;
 		SetActive();
@@ -136,8 +130,8 @@
 
 void CIndicatorWatcher::HandleIndicatorUpdateL(TInt aCompletionCode)
 	{
-#ifdef OST_TRACE_COMPILER_IN_USE
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_1, "IndicatorWatcher : Handling phone state change with request result (%d)", aCompletionCode);
+#ifdef _DEBUG
+	LOGINDICATOR2("IndicatorWatcher : Handling phone state change with request result (%d)", aCompletionCode);
 #else
 	(void) aCompletionCode;
 #endif
@@ -216,7 +210,7 @@
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_2, "IndicatorWatcher : Processing successful indicator event");
+		LOGINDICATOR1("IndicatorWatcher : Processing successful indicator event");
 	
 		// Update charger status if there has been a change
 		{
@@ -232,7 +226,7 @@
 	
 		if (newChargerState!=chargerState)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_3, "IndicatorWatcher : New Charger State %d", newChargerState);
+			LOGINDICATOR2("IndicatorWatcher : New Charger State %d", newChargerState);
 			User::LeaveIfError(iChargerStatusProperty.Set(newChargerState));
 			}
 		}
@@ -250,7 +244,7 @@
 	
 		if (newNetworkState!=networkState)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_4, "IndicatorWatcher : New Network State %d", newNetworkState);
+			LOGINDICATOR2("IndicatorWatcher : New Network State %d", newNetworkState);
 			User::LeaveIfError(iNetworkStatusProperty.Set(newNetworkState));		
 			}
 		}
@@ -274,7 +268,7 @@
 	
 		if (newCallState!=callState)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_5, "IndicatorWatcher : New Call State %d", newCallState);
+			LOGINDICATOR2("IndicatorWatcher : New Call State %d", newCallState);
 			User::LeaveIfError(iCurrentCallProperty.Set(newCallState));
 			}
 		}