--- a/accessoryservices/accessoryserver/src/ConfigFileParser/AccConfigFileParser.cpp Wed Sep 15 13:36:47 2010 +0300
+++ b/accessoryservices/accessoryserver/src/ConfigFileParser/AccConfigFileParser.cpp Wed Oct 13 15:58:37 2010 +0300
@@ -50,15 +50,15 @@
// ============================ MEMBER FUNCTIONS ===============================
// -----------------------------------------------------------------------------
-// CAccConfigFileParser::ParseSubblocksL
+// CAccConfigFileParser::ParseSubblocks
// Detecting subblocks and store them to destination array
// (other items were commented in a header).
// -----------------------------------------------------------------------------
//
-void CAccConfigFileParser::ParseSubblocksL( const TUint64& aVal,
+void CAccConfigFileParser::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 );
@@ -72,7 +72,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++;
@@ -80,32 +80,32 @@
}
while ( sum < aVal && curBit < KAccConfigMaxCapabilityGroups );
- COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocksL - return void" );
+ COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseSubblocks - return void" );
}
// -----------------------------------------------------------------------------
-// CAccConfigFileParser::ParseNamesL
+// CAccConfigFileParser::ParseNames
// Detect all subblock names and append them to the gicen array.
// (other items were commented in a header).
// -----------------------------------------------------------------------------
//
-void CAccConfigFileParser::ParseNamesL( const TUint32& aVal,
+void CAccConfigFileParser::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++;
@@ -113,7 +113,7 @@
}
while ( sum < aVal && curBit < KAccConfigMaxCapabilityGroups );
- COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNamesL - return void" );
+ COM_TRACE_( "[AccFW:SrvUtil] CAccConfigFileParser::ParseNames - return void" );
}
// -----------------------------------------------------------------------------