--- a/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp	Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp	Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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,6 +20,12 @@
  @internalComponent
 */
 
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdpmcprfactoryTraces.h"
+#endif
+
 #include <etelqos.h>
 #include <ecom/implementationproxy.h>
 #include <comms-infras/ss_log.h>
@@ -31,13 +37,6 @@
 #include "pdpmcprfactory.h"
 #include "pdpmcpr.h"
 
-
-
-#ifdef _DEBUG
-#define KPdpMCprFactoryTag KESockMetaConnectionTag
-_LIT8(KPdpMCprFactorySubTag, "pdpmcprfactory");
-#endif
-
 using namespace ESock;
 
 //-=========================================================
@@ -47,14 +46,14 @@
 //-=========================================================	
 CPdpMetaConnectionProviderFactory* CPdpMetaConnectionProviderFactory::NewL(TAny* aParentContainer)
 	{
-	__CFLOG_VAR((KPdpMCprFactoryTag, KPdpMCprFactorySubTag, _L8("CPdpMetaConnectionProviderFactory ::\tNewL(%08x)"), aParentContainer));
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPMETACONNECTIONPROVIDERFACTORY_NEWL_1, "CPdpMetaConnectionProviderFactory ::\tNewL(%08x)", aParentContainer);
  	return new (ELeave) CPdpMetaConnectionProviderFactory(TUid::Uid(CPdpMetaConnectionProviderFactory::iUid), *(reinterpret_cast<CMetaConnectionFactoryContainer*>(aParentContainer)));
 	}
 
 CPdpMetaConnectionProviderFactory::CPdpMetaConnectionProviderFactory(TUid aFactoryId, CMetaConnectionFactoryContainer& aParentContainer)
 	: CMetaConnectionProviderFactoryBase(aFactoryId,aParentContainer)
 	{
-	__CFLOG_VAR((KPdpMCprFactoryTag, KPdpMCprFactorySubTag, _L8("CPdpMetaConnectionProviderFactory %08x:\tCPdpMetaConnectionProviderFactory Constructor"), this));
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPMETACONNECTIONPROVIDERFACTORY_CTOR_1, "CPdpMetaConnectionProviderFactory %08x:\tCPdpMetaConnectionProviderFactory Constructor", this);
 	}
 
 ESock::ACommsFactoryNodeId* CPdpMetaConnectionProviderFactory::DoCreateObjectL(ESock::TFactoryQueryBase& aQuery)