--- a/telephonyprotocols/pdplayer/src/pdptiermanagerfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdptiermanagerfactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -18,17 +18,16 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "pdptiermanagerfactoryTraces.h"
-#endif
-
 #include <comms-infras/ss_log.h>
 #include <ecom/ecom.h>
 #include "pdptiermanagerfactory.h"
 #include "pdptiermanager.h"
 
+#ifdef __CFLOG_ACTIVE
+#define KPDPTierMgrTag KESockMetaConnectionTag
+_LIT8(KPDPTierMgrSubTag, "pdptiermgr");
+#endif
+
 // ---------------- Factory Methods ----------------
 /**
 Creates a PDP Tier Manager Factory
@@ -38,7 +37,7 @@
 */
 CPDPTierManagerFactory* CPDPTierManagerFactory::NewL(TAny* aParentContainer)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGERFACTORY_NEWL_1, "CPDPTierManagerFactory::\tNewL(%08x)", aParentContainer);
+	__CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("CPDPTierManagerFactory::\tNewL(%08x)"), aParentContainer));
  	return new (ELeave) CPDPTierManagerFactory(TUid::Uid(CPDPTierManagerFactory::EUid), TUid::Uid(CPDPTierManagerFactory::EUid),*(reinterpret_cast<ESock::CTierManagerFactoryContainer*>(aParentContainer)));
 	}
 /**