--- a/phoneuis/dialer/src/cdialer.cpp Wed Mar 31 21:30:06 2010 +0300
+++ b/phoneuis/dialer/src/cdialer.cpp Wed Apr 14 15:56:42 2010 +0300
@@ -50,7 +50,8 @@
_LIT( KDialerResourceFile, "dialer.rsc" );
// number entry, keypad area, easydialing, toolbar
-const TInt KContainedControlsInTelephonyMode = 4;
+const TInt KContainedControlsInTelephonyMode = 4;
+
// ========================= MEMBER FUNCTIONS ================================
@@ -71,7 +72,12 @@
return self;
}
+// -----------------------------------------------------------------------------
+// CDialer::~CDialer
+//
// Destructor
+// -----------------------------------------------------------------------------
+//
EXPORT_C CDialer::~CDialer()
{
DIALER_PRINT("CDialer::~CDialer<");
@@ -131,11 +137,15 @@
DIALER_PRINT("CDialer::ConstructL>");
}
-// Constructor
-CDialer::CDialer( ) :
- iEikEnv( *CEikonEnv::Static() )
+// -----------------------------------------------------------------------------
+// CDialer::CDialer
+//
+// Default constructor
+// -----------------------------------------------------------------------------
+//
+CDialer::CDialer()
{
- // Empty
+ // Empty
}
// -----------------------------------------------------------------------------
@@ -151,8 +161,6 @@
// -----------------------------------------------------------------------------
// CDialer::SetNumberEntryObserver
-//
-//
// -----------------------------------------------------------------------------
//
EXPORT_C void CDialer::SetNumberEntryObserver( MNumberEntryObserver& aObserver )
@@ -653,9 +661,9 @@
path.Append( KDC_RESOURCE_FILES_DIR );
path.Append( KDialerResourceFile );
- RFs &fsSession= iEikEnv.FsSession();
+ RFs& fsSession= ControlEnv()->FsSession();
BaflUtils::NearestLanguageFile( fsSession, path );
- iResourceOffset = iEikEnv.AddResourceFileL( path );
+ iResourceOffset = ControlEnv()->AddResourceFileL( path );
}
// -----------------------------------------------------------------------------
@@ -667,7 +675,7 @@
{
if ( iResourceOffset > 0 )
{
- iEikEnv.DeleteResourceFile( iResourceOffset );
+ ControlEnv()->DeleteResourceFile( iResourceOffset );
iResourceOffset = 0;
}
}