--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstategettingnegqos.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstategettingnegqos.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,51 +20,41 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstategettingnegqosTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateGettingNegQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_1, ">>TPdpStateGettingNegQoS::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateGettingNegQoS::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	    {
     	case SpudMan::EGetNegQoS:
     		EtelDriverInput(aFsm, EtelDriver::ENegQoSGet);
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_3, "<<TPdpStateGettingNegQoS::Input()");
     		return KErrNone;
     		
     	case PdpFsm::EPdpNegQoSRetrieved:
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_4, "*** SUCCESS ***");
+    		SPUDFSMVERBOSE_LOG(_L("*** SUCCESS ***"));
     		aFsm.ChangeStateToOpen();
     		SpudManNotify(aFsm, KGetNegQoSEvent, KErrNone);
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_5, "<<TPdpStateGettingNegQoS::Input()");
     		return KErrNone;
     		
     	case PdpFsm::EPdpNegQoSRetrievedFailed:
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_6, "*** FAILURE ***");
+    		SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
     		// As far as everybody is concerned, the context was activated:
     		// This makes it eligible for certain events. 
     		// We have to move to Open state, so that that we can handle any operations
     		// on the activated PDP context correctly.
     		aFsm.ChangeStateToOpen(); 
     		SpudManNotify(aFsm, KGetNegQoSEvent, aErrorCode);
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_7, "<<TPdpStateGettingNegQoS::Input()");
     		return KErrNone;
     	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_8, "<<TPdpStateGettingNegQoS::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
     }