--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp	Mon May 24 18:38:31 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp	Tue Jun 22 11:02:32 2010 +0100
@@ -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,8 +20,14 @@
  @internalComponent
 */
 
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cqoschangenotifierTraces.h"
+#endif
+
 #include "cqoschangenotifier.h"
-#include "spudteldebuglogger.h"
 #include <pcktcs.h>
 
 
@@ -40,24 +46,24 @@
   iProfilePckg(iProfileBuffer)
   
 	{
-	SPUDTEL_FNLOG("CQoSChangeNotifier::CQoSChangeNotifier()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_CTOR_1, "CQoSChangeNotifier::CQoSChangeNotifier()");
 	}
 	
 CQoSChangeNotifier::~CQoSChangeNotifier()
 	{
-	SPUDTEL_FNLOG("CQoSChangeNotifier::~CQoSChangeNotifier()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_DTOR_1, "CQoSChangeNotifier::~CQoSChangeNotifier()");
 	Cancel();
 	}
 	
 /** starts notification */
 void CQoSChangeNotifier::Start()
 	{
-	SPUDTEL_FNLOG("CQoSChangeNotifier::Start()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_START_1, "CQoSChangeNotifier::Start()");
 	if (!IsActive())
 		{ 
 		iPacketQoS.NotifyProfileChanged(iStatus, iProfilePckg); 
 		SetActive();
-		SPUDTEL_FNLOG("CQoSChangeNotifier::Start(), iPacketQoS.NotifyProfileChanged()");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_START_2, "CQoSChangeNotifier::Start(), iPacketQoS.NotifyProfileChanged()");
 		}
 	}
 	
@@ -66,8 +72,7 @@
 	{
 	if (IsActive())
 		{ 
-		SPUDTELVERBOSE_INFO_LOG(
-			_L("CQoSChangeNotifier::DoCancel EPacketQoSNotifyProfileChanged"));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_DOCANCEL_1, "CQoSChangeNotifier::DoCancel EPacketQoSNotifyProfileChanged");
 		iPacketQoS.CancelAsyncRequest(EPacketQoSNotifyProfileChanged);
 		}
 	}
@@ -80,7 +85,7 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set QoSProfile"));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_1, "FSM set QoSProfile");
 
 #ifdef SYMBIAN_NETWORKING_UMTSR5
         iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR5());
@@ -92,12 +97,12 @@
 #endif
 // SYMBIAN_NETWORKING_UMTSR5
 
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM input EQoSProfileChangeNetwork"));
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_2, "FSM input EQoSProfileChangeNetwork");
 		iPdpFsmInterface.Input(iId, PdpFsm::EQoSProfileChangeNetwork);
 		}
 	else
 		{ 
-		SPUDTEL_ERROR_LOG(_L("CQoSChangeNotifier::Notify(), error: %d"), aStatus.Int());
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_3, "CQoSChangeNotifier::Notify(), error: %d", aStatus.Int());
 		ASSERT(aStatus == KErrCancel); 
 		}
 	}