diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simtsy/src/CSimPubSub.cpp --- a/telephonyserverplugins/simtsy/src/CSimPubSub.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyserverplugins/simtsy/src/CSimPubSub.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" @@ -15,14 +15,8 @@ // // - - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "CSimPubSubTraces.h" -#endif - #include "CSimPubSub.h" +#include "Simlog.h" /** @@ -33,12 +27,12 @@ */ CSimPubSub* CSimPubSub::NewL(MPSSimObserver* aPSSimObserver, const CSimPubSub::TPubSubProperty aProperty) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPUBSUB_NEWL_1, ">>CSimPubSub::NewL"); + LOGSCOMMON1(">>CSimPubSub::NewL"); CSimPubSub* pubsub=new(ELeave) CSimPubSub(aPSSimObserver,aProperty); CleanupStack::PushL(pubsub); pubsub->ConstructL(); CleanupStack::Pop(); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPUBSUB_NEWL_2, "<