--- a/telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
@@ -20,6 +20,11 @@
  @internalComponent
 */
 
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "rawipmcprfactoryTraces.h"
+#endif
+
 #include "rawipmcprfactory.h"
 #include "rawipmcpr.h"
 #include <comms-infras/ss_log.h>
@@ -27,10 +32,6 @@
 
 #include <comms-infras/ss_msgintercept.h>
 
-#ifdef __CFLOG_ACTIVE
-#define KRawIPMCprFactoryTag KESockMetaConnectionTag
-// _LIT8(KRawIPMCprFactorySubTag, "rawipmcprfactory");
-#endif // __CFLOG_ACTIVE
 
 using namespace ESock;
 
@@ -41,14 +42,15 @@
 //-=========================================================	
 CRawIpMetaConnectionProviderFactory* CRawIpMetaConnectionProviderFactory::NewL(TAny* aParentContainer)
 	{
-	__CFLOG_VAR((KRawIPMCprFactoryTag, KRawIPMCprFactorySubTag, _L8("CRawIpMetaConnectionProviderFactory ::\tNewL(%08x)"), aParentContainer));
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_1, "CRawIpMetaConnectionProviderFactory ::\tNewL(%08x)",(TUint)aParentContainer);
  	return new (ELeave) CRawIpMetaConnectionProviderFactory(TUid::Uid(CRawIpMetaConnectionProviderFactory::iUid), *(reinterpret_cast<CMetaConnectionFactoryContainer*>(aParentContainer)));
 	}
 
 CRawIpMetaConnectionProviderFactory::CRawIpMetaConnectionProviderFactory(TUid aFactoryId, CMetaConnectionFactoryContainer& aParentContainer)
 	: CMetaConnectionProviderFactoryBase(aFactoryId,aParentContainer)
 	{
-	__CFLOG_VAR((KRawIPMCprFactoryTag, KRawIPMCprFactorySubTag, _L8("CRawIpMetaConnectionProviderFactory %08x:\tCRawIpMetaConnectionProviderFactory Constructor"), this));
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_2, "CRawIpMetaConnectionProviderFactory %08x:\tCRawIpMetaConnectionProviderFactory Constructor",(TUint)this);
+
 	}
 
 ACommsFactoryNodeId* CRawIpMetaConnectionProviderFactory::DoCreateObjectL(ESock::TFactoryQueryBase& aQuery)