diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simatktsy/src/csatcctsy.cpp
--- a/telephonyserverplugins/simatktsy/src/csatcctsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatcctsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -21,18 +21,13 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csatcctsyTraces.h"
-#endif
-
 #include "etelsat.h"                // SAT specific Etel definitions
 #include "CSatDataPackage.h"        // Parameter packing 
 #include "CSatCCTsy.h"              // Class header
 #include "CSatTsy.h"                // SAT TSY general class
 #include "CSatNotificationsTsy.h"   // SAT TSY Notifications class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "msattsy_ipcdefs.h"		// Sat Tsy specific request types
 #include "TSatUtility.h"			// Utility class
 #include "TTlv.h"					// TTlv class
@@ -49,13 +44,13 @@
         CSatNotificationsTsy* aNotificationsTsy   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_NEWL_1, "CSAT: CSatCCTsy::NewL");
+    TFLOGSTRING("CSAT: CSatCCTsy::NewL");
     CSatCCTsy* const satCcTsy = new ( ELeave ) CSatCCTsy( aNotificationsTsy );
     CleanupStack::PushL( satCcTsy );
     satCcTsy->iSatTsy = aSatTsy;
     satCcTsy->ConstructL();
     CleanupStack::Pop( satCcTsy );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_NEWL_2, "CSAT: CSatCCTsy::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatCCTsy::NewL, end of method");
     return satCcTsy;
     }
 
@@ -69,7 +64,7 @@
         //None   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_DTOR_1, "CSAT: CSatCCTsy::~CSatCCTsy");
+    TFLOGSTRING("CSAT: CSatCCTsy::~CSatCCTsy");
     // Unregister.
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatCCTsyObjType, NULL );
@@ -85,7 +80,7 @@
         //None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CONSTRUCTL_1, "CSAT: CSatCCTsy::ConstructL\n" );
+    TFLOGSTRING("CSAT: CSatCCTsy::ConstructL\n" );
     // Register.
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatCCTsyObjType, this );
@@ -122,7 +117,7 @@
 		 TInt /*aResult*/
 		 )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETEBEARERCAPABILITY_1, "CSAT: CSatCCTsy::CompleteBearerCapability");
+    TFLOGSTRING("CSAT: CSatCCTsy::CompleteBearerCapability");
     TPtrC8* bearerData = NULL;
 
     // Unpack parameters 
@@ -139,7 +134,7 @@
         CSatDataPackage* aDataPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEENVELOPEL_1, "CSAT: CSatCCTsy::CreateEnvelope");
+    TFLOGSTRING("CSAT: CSatCCTsy::CreateEnvelope");
     TCCInfo* ccInfo;
     
     // Unpack parameters
@@ -164,7 +159,8 @@
             }
         default:
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEENVELOPEL_2, "CSAT: CSatCCTsy::CreateEnvelope, Unidentified tag: %d", ccInfo->iTag );
+            TFLOGSTRING2("CSAT: CSatCCTsy::CreateEnvelope,\
+                Unidentified tag: %d", ccInfo->iTag );
             }
         }
     }
@@ -179,7 +175,7 @@
         CSatDataPackage* aDataPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_1, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent");
+    TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent"); 
     TDesC8* atkData;            
     RSat::TControlResult* result;
     
@@ -271,7 +267,8 @@
                         // can be made.
                         if ( 0 != alphaIdLength )
                             {
-                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_2, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. inform user.");
+                            TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent.\
+                                inform user.");
 
                             TPtrC8 sourceString;
                             sourceString.Set( ( *atkData ).Mid( index + 
@@ -286,7 +283,8 @@
                             }
                         else
                             {
-                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_3, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. AlphaID length: 0.");
+                            TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent.\
+                                AlphaID length: 0.");
                             }
 
                         // Update index
@@ -295,7 +293,8 @@
                         }
                     default:
                         {
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_4, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent Unknown tag.");
+                        TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent\
+                            Unknown tag.");
                         index = envLength;
                         break;
                         }
@@ -305,7 +304,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_5, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. Input data missing!");
+        TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent. \
+            Input data missing!");
         }
     }
     
@@ -320,7 +320,7 @@
         CSatDataPackage* aDataPackage 
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETECCEVENTL_1, "CSAT: CSatCCTsy::CompleteCCEventL, aIpc: %d", aIpc);
+    TFLOGSTRING2("CSAT: CSatCCTsy::CompleteCCEventL, aIpc: %d", aIpc);
     TCCInfo* ccInfo;
     
     // Unpack parameters
@@ -387,7 +387,7 @@
             }
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETECCEVENTL_2, "CSAT: CSatCCTsy::CompleteCCEventL, Unknown event!");
+            TFLOGSTRING("CSAT: CSatCCTsy::CompleteCCEventL, Unknown event!");
             }
         }
     }   
@@ -404,7 +404,7 @@
         const TUint8 aTonNpi 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_SETTONNPIFORSS_1, "CSAT: CSatCCTsy::SetTonNpiForSS");
+    TFLOGSTRING("CSAT: CSatCCTsy::SetTonNpiForSS");
     iTonNpiForSS = aTonNpi;
     iTonNpiPresent = ETrue;
     }
@@ -419,7 +419,7 @@
     	CSatDataPackage* aDataPackage
     	)
     { 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_SETUSSDSTATUS_1, "CSAT: CSatCCTsy::SetUssdStatus." );
+    TFLOGSTRING("CSAT: CSatCCTsy::SetUssdStatus." );    
     // Unpack parameters 
     aDataPackage->UnPackData( iUssdTlvSupported ); 
     }  
@@ -436,12 +436,12 @@
         const TDesC8& aAddress 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_1, "CSAT: CSatCCTsy::StoreAddressForCC");
+    TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC");
     
     if ( NULL == &aAddress )
         {
         iProactiveCommandAddress.Zero();
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_2, "CSAT: CSatCCTsy::StoreAddressForCC, address cleared");
+        TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC, address cleared");
         }
     else
         {
@@ -456,7 +456,7 @@
                 iProactiveCommandAddress.Delete( 0, 1 );
                 }
             }
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_3, "CSAT: CSatCCTsy::StoreAddressForCC, Address stored");
+        TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC, Address stored");
         }
     }     
        
@@ -470,7 +470,7 @@
 		const TCCInfo* aCCInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATECALLENVELOPEL_1, "CSAT: CSatCCTsy::CreateCallEnvelopeL" );
+    TFLOGSTRING("CSAT: CSatCCTsy::CreateCallEnvelopeL" );
     // Create envelope
     TTlv envelope;
     envelope.Begin( KBerTlvCallControlTag );
@@ -527,7 +527,8 @@
             }
         else
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATECALLENVELOPEL_2, "CSAT: CSatCCTsy::CreateCallEnvelopeL, Bearer data length exceeded, data not added" );
+        	TFLOGSTRING("CSAT: CSatCCTsy::CreateCallEnvelopeL,\
+        	    Bearer data length exceeded, data not added" );
         	}
         }
 
@@ -561,7 +562,7 @@
 		const TCCInfo* aCCInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATESSENVELOPEL_1, "CSAT: CSatCCTsy::CreateSSEnvelopeL" );
+    TFLOGSTRING("CSAT: CSatCCTsy::CreateSSEnvelopeL" );
     // There is no TON and NPI in SS cc request. Information is part of the 
     // number string: Spec ETSI TS 122 030 v5.0.0 says that if number starts
     // with +, TON is international and if it starts without it, it's unknown.
@@ -693,7 +694,7 @@
 		const TCCInfo* aCCInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEUSSDENVELOPEL_1, "CSAT: CSatCCTsy::CreateUSSDEnvelopeL" );
+    TFLOGSTRING("CSAT: CSatCCTsy::CreateUSSDEnvelopeL" );
     // Create USSD envelope
     TTlv envelope;
         
@@ -772,7 +773,7 @@
         const TDesC8& aUSSDString
         )
     {    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_ISONLYDIGITSINUSSD_1, "CSAT: CSatCCTsy::IsOnlyDigitsInUssd." );
+    TFLOGSTRING("CSAT: CSatCCTsy::IsOnlyDigitsInUssd." );        
     // Unpack it
     TBuf8<KMaxUssdStringLengthInBytes> ussdString;
     TSatUtility::Packed7to8Unpacked( aUSSDString, ussdString );    
@@ -803,7 +804,7 @@
         const TDesC8& aAddress 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_1, "CSAT: CSatCCTsy::HasProactiveOrigin");
+    TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin");
     TBool match( EFalse );
     
     if ( aAddress.Length() )
@@ -814,20 +815,21 @@
             // It means we need to drop the first character out from comparison
             if ( iProactiveCommandAddress == aAddress.Mid( 1 ) )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_2, "CSAT: CSatCCTsy::HasProactiveOrigin, Match!");
+                TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, Match!");
                 match = ETrue;
                 }
             }
         // Otherwise we can use the whole string for checking
         else if ( iProactiveCommandAddress == aAddress )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_3, "CSAT: CSatCCTsy::HasProactiveOrigin, Match!");
+            TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, Match!");
             match = ETrue;
             }
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_4, "CSAT: CSatCCTsy::HasProactiveOrigin, Invalid input address");
+        TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, \
+            Invalid input address");
         }
         
     return match;