diff -r 189d20c34778 -r 11b6825f0862 radioengine/settings/src/cradioregion.cpp --- a/radioengine/settings/src/cradioregion.cpp Wed Jun 23 18:12:57 2010 +0300 +++ b/radioengine/settings/src/cradioregion.cpp Tue Jul 06 14:16:27 2010 +0300 @@ -44,7 +44,7 @@ { LEVEL3( LOG_METHOD_AUTO ); iId = static_cast( aRr.ReadUint16()); - iStepSize = static_cast( aRr.ReadUint16() ) * KRadioThousand; + iStepSize = aRr.ReadUint32() * KRadioThousand; iMinFreq = aRr.ReadUint32() * KRadioThousand; iMaxFreq = aRr.ReadUint32() * KRadioThousand; iDecimalCount = aRr.ReadInt16(); @@ -56,9 +56,6 @@ code.Set( aRr.ReadTPtrC()); User::LeaveIfError( iCountryCodes.Append( code.AllocL())); } - - iName = aRr.ReadHBufC16L(); - iSettingName = aRr.ReadHBufC16L(); } // --------------------------------------------------------------------------- @@ -87,8 +84,6 @@ LEVEL3( LOG_METHOD_AUTO ); iCountryCodes.ResetAndDestroy(); iCountryCodes.Close(); - delete iName; - delete iSettingName; } // --------------------------------------------------------- @@ -150,23 +145,3 @@ LEVEL3( LOG_METHOD_AUTO ); return iCountryCodes; } - -// --------------------------------------------------------- -// Get the name of region -// --------------------------------------------------------- -// -EXPORT_C const TDesC16& CRadioRegion::Name() const - { - LEVEL3( LOG_METHOD_AUTO ); - return *iName; - } - -// --------------------------------------------------------- -// Get the name of region -// --------------------------------------------------------- -// -EXPORT_C const TDesC16& CRadioRegion::SettingItemName() const - { - LEVEL3( LOG_METHOD_AUTO ); - return *iSettingName; - }