--- a/accessoryservices/accessoryserver/src/Policy/AccPolAccessoryPolicy.cpp	Wed Sep 15 13:36:47 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Policy/AccPolAccessoryPolicy.cpp	Wed Oct 13 15:58:37 2010 +0300
@@ -819,7 +819,7 @@
         TAccPolGenericIDAccessor::SetFeatureAttributeL( 
             genericID, KAccPolSBCapabilities, valU64 );
 
-        ParseSubblocksL( valU64, foundCapabilityGroups );
+        ParseSubblocks( valU64, foundCapabilityGroups );
 
         //set "values" to point to firts value
         TLex8 values;
@@ -871,7 +871,7 @@
                 TUint32 capabilityGroupValue(0);
                 lVal.Val( capabilityGroupValue, EDecimal );
 
-                ParseNamesL( capabilityGroupValue, foundCapability );
+                ParseNames( capabilityGroupValue, foundCapability );
 
                 TInt capabilityIter(0);
                 TInt foundCapabilityCount( foundCapability.Count() );
@@ -970,7 +970,7 @@
                                                                 value,
                                                               ( TAccPolValueType )type,
                                                               ( TAccPolValueLocation )location );
-                        nameValueArray.AppendL( nameValueRecord );
+                        nameValueArray.Append( nameValueRecord );
                         }
                     ++capabilityIter;
                     }
@@ -1004,14 +1004,14 @@
     }
 
 // -----------------------------------------------------------------------------
-// CAccPolAccessoryPolicy::ParseSubblocksL
+// CAccPolAccessoryPolicy::ParseSubblocks
 // Detecting subblocks and store them to destination array
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
-void CAccPolAccessoryPolicy::ParseSubblocksL( const TUint64& aVal, RArray<TUint64>& aCaps )
+void CAccPolAccessoryPolicy::ParseSubblocks( const TUint64& aVal, RArray<TUint64>& aCaps )
     {
-    COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocksL()" );
+    COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocks()" );
 
     TUint64 sum( 0 );
     TUint64 curVal( 1 );
@@ -1025,7 +1025,7 @@
         if ( ( curVal & aVal ) == curVal )
             {
             COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::(Cap) MATCH! HI:0x%x LO:0x%x", I64HIGH( curVal ), I64LOW( curVal ) );
-            aCaps.AppendL( curVal ); // Append to found caps array
+            aCaps.Append( curVal ); // Append to found caps array
             sum += curVal;
             }
         curBit++;
@@ -1033,31 +1033,31 @@
         }
     while ( sum < aVal && curBit < KAccConfigMaxCapabilityGroups );
 
-    COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocksL - return void" );
+    COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocks - return void" );
     }
 
 // -----------------------------------------------------------------------------
-// CAccPolAccessoryPolicy::ParseNamesL
+// CAccPolAccessoryPolicy::ParseNames
 // Detect all subblock names and append them to the gicen array.
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
-void CAccPolAccessoryPolicy::ParseNamesL( const TUint32& aVal, RArray<TUint32>& aNames )
+void CAccPolAccessoryPolicy::ParseNames( const TUint32& aVal, RArray<TUint32>& aNames )
     {
-    COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL()" );
+    COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames()" );
     TUint32 sum( 0 );
     TUint32 curVal( 1 );
     TInt curBit( 0 );
 
     do {
-        COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL Binary for this roundtrip is 0x%x, total sum is 0x%x", curVal, sum );
-        COM_TRACE_1( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL & 0x%x", curVal & aVal );
+        COM_TRACE_2( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames Binary for this roundtrip is 0x%x, total sum is 0x%x", curVal, sum );
+        COM_TRACE_1( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames & 0x%x", curVal & aVal );
         // Check if this subblock is defined in SB-def block
 
         if ( ( curVal & aVal ) == curVal )
             {
             COM_TRACE_1( "[AccFW:SrvUtil] (Name) MATCH! 0x%x",curVal );
-            aNames.AppendL( curVal ); // Append to found caps array
+            aNames.Append( curVal ); // Append to found caps array
             sum += curVal;
             }
         curBit++;
@@ -1065,7 +1065,7 @@
         }
     while ( sum < aVal && curBit < KAccConfigMaxCapabilityGroups );
 
-    COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL - return void" );
+    COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames - return void" );
     }
 
 // -----------------------------------------------------------------------------