--- a/phoneuis/dialer/src/cdialerkeypadcontainer.cpp Fri Feb 19 22:50:26 2010 +0200
+++ b/phoneuis/dialer/src/cdialerkeypadcontainer.cpp Fri Mar 12 15:42:40 2010 +0200
@@ -78,7 +78,8 @@
'9', '9' },
{ KDialerNoIcon, KDialerNoIcon,
EStdKeyNkpAsterisk, '*' },
- { KDialerNoIcon, KDialerNoIcon,
+ { EMbmDialerQgn_indi_dialer_internet,
+ EMbmDialerQgn_indi_dialer_internet_mask,
'0', '0' },
{ KDialerNoIcon, KDialerNoIcon,
EStdKeyHash, '#' }
@@ -126,19 +127,14 @@
TDialerOperationMode aOperatingMode )
: CDialerContainerBase (
const_cast<CCoeControl&>(aContainer) ),
- iOperatingMode( aOperatingMode ),
- iButtonCount( KNumberOfButtons )
+ iOperatingMode( aOperatingMode )
{
}
// Destructor
CDialerKeyPadContainer::~CDialerKeyPadContainer()
{
- for ( TInt i = 0; i < iButtonCount; i++ )
- {
- delete iButtons[i];
- }
- iButtons.Close();
+ iButtons.ResetAndDestroy();
iCoeEnv->RemoveForegroundObserver( *this );
delete iKeyLabelManager;
}
@@ -422,7 +418,7 @@
}
__ASSERT_ALWAYS( tappedButton,
- _L("CDialerKeyPadContainer::HandleControlEventL, invalid button handle"));
+ _L("CDialerKeyPadContainer::HandleControlEventL, invalid button handle")); // TODO: This is meaningless statement, use either Panic or make this only comment.
// Send key event to phone.
TKeyEvent keyEvent;