radioengine/settings/src/cradioregion.cpp
branchGCC_SURGE
changeset 37 451b2e1545b2
parent 33 11b6825f0862
child 38 f8c3d4e6102c
--- a/radioengine/settings/src/cradioregion.cpp	Fri Jun 11 16:24:13 2010 +0100
+++ b/radioengine/settings/src/cradioregion.cpp	Thu Jul 22 16:33:45 2010 +0100
@@ -20,6 +20,7 @@
 
 // User includes
 #include "cradioregion.h"
+#include "cradioenginelogger.h"
 
 // Used to convert kilohertz values to hertz values
 const TInt KRadioThousand = 1000;
@@ -32,6 +33,7 @@
 //
 CRadioRegion::CRadioRegion()
     {
+    LEVEL3( LOG_METHOD_AUTO );
     }
 
 // ---------------------------------------------------------------------------
@@ -40,8 +42,9 @@
 //
 void CRadioRegion::ConstructL( TResourceReader& aRr )
     {
+    LEVEL3( LOG_METHOD_AUTO );
     iId = static_cast<TRadioRegion>( aRr.ReadUint16());
-    iStepSize = static_cast<TUint16>( aRr.ReadUint16() ) * KRadioThousand;
+    iStepSize =  aRr.ReadUint32() * KRadioThousand;
     iMinFreq = aRr.ReadUint32() * KRadioThousand;
     iMaxFreq = aRr.ReadUint32() * KRadioThousand;
     iDecimalCount = aRr.ReadInt16();
@@ -53,9 +56,6 @@
         code.Set( aRr.ReadTPtrC());
         User::LeaveIfError( iCountryCodes.Append( code.AllocL()));
         }
-
-    iName = aRr.ReadHBufC16L();
-    iSettingName = aRr.ReadHBufC16L();
     }
 
 // ---------------------------------------------------------------------------
@@ -64,6 +64,7 @@
 //
 CRadioRegion* CRadioRegion::NewL( TResourceReader& aRr )
     {
+    LEVEL3( LOG_METHOD_AUTO );
     CRadioRegion* self = new ( ELeave ) CRadioRegion;
 
     CleanupStack::PushL( self );
@@ -80,10 +81,9 @@
 //
 CRadioRegion::~CRadioRegion()
     {
+    LEVEL3( LOG_METHOD_AUTO );
     iCountryCodes.ResetAndDestroy();
     iCountryCodes.Close();
-    delete iName;
-    delete iSettingName;
     }
 
 // ---------------------------------------------------------
@@ -92,6 +92,7 @@
 //
 EXPORT_C TRadioRegion CRadioRegion::Id() const
     {
+    LEVEL3( LOG_METHOD_AUTO );
     return iId;
     }
 
@@ -101,6 +102,7 @@
 //
 EXPORT_C TUint32 CRadioRegion::StepSize() const
     {
+    LEVEL3( LOG_METHOD_AUTO );
     return iStepSize;
     }
 
@@ -110,6 +112,7 @@
 //
 EXPORT_C TUint32 CRadioRegion::MinFrequency() const
     {
+    LEVEL3( LOG_METHOD_AUTO );
     return iMinFreq;
     }
 
@@ -119,6 +122,7 @@
 //
 EXPORT_C TUint32 CRadioRegion::MaxFrequency() const
     {
+    LEVEL3( LOG_METHOD_AUTO );
     return iMaxFreq;
     }
 
@@ -128,6 +132,7 @@
 //
 EXPORT_C TInt CRadioRegion::DecimalCount() const
     {
+    LEVEL3( LOG_METHOD_AUTO );
     return iDecimalCount;
     }
 
@@ -137,23 +142,6 @@
 //
 EXPORT_C const RRadioCountryCodeArray& CRadioRegion::CountryCodes()
     {
+    LEVEL3( LOG_METHOD_AUTO );
     return iCountryCodes;
     }
-
-// ---------------------------------------------------------
-// Get the name of region
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC16& CRadioRegion::Name() const
-    {
-    return *iName;
-    }
-
-// ---------------------------------------------------------
-// Get the name of region
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC16& CRadioRegion::SettingItemName() const
-    {
-    return *iSettingName;
-    }