--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp	Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp	Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -20,11 +20,17 @@
  @internalComponent
 */
 
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpdpstatuschangenotifierTraces.h"
+#endif
+
 #include <e32base.h>
 
 #include "cpdpstatuschangenotifier.h"
 #include "PDPFSM.h"
-#include "spudteldebuglogger.h"
 #include "pdpfsmnmspace.h"
 
 #include <pcktcs.h>
@@ -65,8 +71,7 @@
 	{
 	if(IsActive())
 		{ 
-		SPUDTELVERBOSE_INFO_LOG(
-			_L("CPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange"));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1, "CPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange");
 		iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange); 
 		}
 	}
@@ -79,13 +84,13 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		SPUDTELVERBOSE_INFO_LOG(_L("Notified of context status change"));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Notified of context status change");
 		RPacketContext::TContextStatus aOldContextStatus;
 		iPdpFsmInterface.Get(iId,aOldContextStatus);
 		// only notify of change if it has actually changed
 		if (iContextStatus != aOldContextStatus)
 			{
-			SPUDTELVERBOSE_INFO_LOG(_L("FSM input EContextStatusChangeNetwork"));
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
 			iPdpFsmInterface.Set(iId, iContextStatus);
             TInt err = KErrNone;
             iPacketContext.GetLastErrorCause(err); // Ignore error return code.
@@ -94,8 +99,7 @@
 		}
 	else
 		{ 
-		SPUDTEL_ERROR_LOG(_L("CPdpStatusChangeNotifier::Notify(), error: %d"), 
-						aStatus.Int());
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_3, "CPdpStatusChangeNotifier::Notify(), error: %d", aStatus.Int());
 		ASSERT(aStatus == KErrCancel); 
 		}
 	}
@@ -139,8 +143,7 @@
 	{
 	if(IsActive())
 		{ 
-		SPUDTELVERBOSE_INFO_LOG(
-			_L("CMbmsPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange"));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1, "CMbmsPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange");
 		iMbmsPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange); 
 		}
 	}
@@ -153,13 +156,13 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		SPUDTELVERBOSE_INFO_LOG(_L("Notified of context status change"));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Notified of context status change");
 		RPacketContext::TContextStatus aOldContextStatus;
 		iPdpFsmInterface.Get(iId,aOldContextStatus);
 		// only notify of change if it has actually changed
 		if (iContextStatus != aOldContextStatus)
 			{
-			SPUDTELVERBOSE_INFO_LOG(_L("FSM input EContextStatusChangeNetwork"));
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
 			iPdpFsmInterface.Set(iId, iContextStatus);
             TInt err = KErrNone;
             iMbmsPacketContext.GetLastErrorCause(err); // Ignore error return code.
@@ -168,8 +171,7 @@
 		}
 	else
 		{ 
-		SPUDTEL_ERROR_LOG(_L("CMbmsPdpStatusChangeNotifier::Notify(), error: %d"), 
-						aStatus.Int());
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3, "CMbmsPdpStatusChangeNotifier::Notify(), error: %d", aStatus.Int());
 		ASSERT(aStatus == KErrCancel); 
 		}
 	}