--- a/telephonyserverplugins/simatktsy/utility/src/ctlv.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/ctlv.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,12 +21,7 @@
 
 
 //  Include Files  
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ctlvTraces.h"
-#endif
-
+#include "tflogger.h"				// For logging
 #include "CTlv.h"				    // Header of this class
 #include "TSatUtility.h"			// Utility methods
 
@@ -53,7 +48,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_DATA_1, "UTILITY: CTlvBase::Data");
+    TFLOGSTRING("UTILITY: CTlvBase::Data");
     return iData;
     }
 
@@ -68,7 +63,7 @@
         TPtrC8 aData
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_SETDATA_1, "UTILITY: CTlvBase::SetData");
+    TFLOGSTRING("UTILITY: CTlvBase::SetData");
     iData.Set( aData );
     }
 
@@ -82,7 +77,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETSIZE_1, "UTILITY: CTlvBase::GetSize");
+    TFLOGSTRING("UTILITY: CTlvBase::GetSize");
     return iData.Length();
     }
 
@@ -96,7 +91,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETTAG_1, "UTILITY: CTlvBase::GetTag");
+    TFLOGSTRING("UTILITY: CTlvBase::GetTag");
     return TUint8(iData[0] & KTagValueMask);
     }
 
@@ -110,7 +105,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETCOMPREHENSIONREQUIRED_1, "UTILITY: CTlvBase::GetComprehensionRequired");
+    TFLOGSTRING("UTILITY: CTlvBase::GetComprehensionRequired");
     return (iData[0] & KTagCrMask) ? ETrue : EFalse;
     }
 
@@ -124,7 +119,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETLENGTH_1, "UTILITY: CTlvBase::GetLength");
+    TFLOGSTRING("UTILITY: CTlvBase::GetLength");
     return (KTwoByteLengthCoding == iData[KTlvLengthStartPosition]) ?
         iData[KTlvLengthStartPosition + 1] :
         iData[KTlvLengthStartPosition];
@@ -140,7 +135,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETVALUE_1, "UTILITY: CTlvBase::GetValue");
+    TFLOGSTRING("UTILITY: CTlvBase::GetValue");
     TInt offset = (KTwoByteLengthCoding == iData[1]) ? 1 : 0;
     return iData.Mid(2+offset, iData[1+offset]);
     }
@@ -168,7 +163,7 @@
         TTlvSpesificDataType aType // Info spesific data type
         )    
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETSHORTINFO_1, "UTILITY: CTlv::GetShortInfo, type: %d", aType);
+    TFLOGSTRING2("UTILITY: CTlv::GetShortInfo, type: %d", aType);
     // Information is generally at index 2.
     TInt ind ( KTlvDataAreaStartPosition ); 
     TUint8 offset( 0 );
@@ -272,7 +267,7 @@
             } 
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETSHORTINFO_2, "UTILITY: CTlv::GetShortInfo, Type unknown");
+            TFLOGSTRING("UTILITY: CTlv::GetShortInfo, Type unknown");
             break;	
             }                                                                                                                                                              	
         }
@@ -290,7 +285,7 @@
         TTlvSpesificDataType aType //Info spesific data type
         )    
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_1, "UTILITY: CTlv::GetData, Data length: %d", iData.Length());
+    TFLOGSTRING2("UTILITY: CTlv::GetData, Data length: %d", iData.Length());
     // Information is generally at index 2.
     TInt ind ( 2 ); 
     TUint8 offset( 0 );
@@ -384,19 +379,20 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_2, "UTILITY: CTlv::GetData, Data length 0");
+                TFLOGSTRING("UTILITY: CTlv::GetData, Data length 0");
                 return 0;
                 }            
             break;	
             }
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_3, "UTILITY: CTlv::GetData, Type unknown");
+            TFLOGSTRING("UTILITY: CTlv::GetData, Type unknown");
             break;	
             } 
         }
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_4, "UTILITY: CTlv::GetData, length: %d, ind: %d", length, ind);
+    TFLOGSTRING3("UTILITY: CTlv::GetData, length: %d, ind: %d", 
+        length, ind);
     return iData.Mid( ind, length );
     }
 
@@ -410,7 +406,7 @@
         TTlvSpesificDataType aType // Info spesific data type
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETLONGINFO_1, "UTILITY: CTlv::GetLongInfo, type: %d", aType);
+    TFLOGSTRING2("UTILITY: CTlv::GetLongInfo, type: %d", aType);
     TUint16 ret( 0x0000 );
 
     switch( aType )
@@ -454,7 +450,7 @@
             }   
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETLONGINFO_2, "UTILITY: CTlv::GetLongInfo, Type unknown");
+            TFLOGSTRING("UTILITY: CTlv::GetLongInfo, Type unknown");
             break;
             }
         }