connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ChangeConnectionDlg.cpp
--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ChangeConnectionDlg.cpp Thu Aug 19 10:18:49 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/src/ChangeConnectionDlg.cpp Tue Aug 31 15:35:44 2010 +0300
@@ -27,8 +27,7 @@
#include <WlanCdbCols.h>
#include <data_caging_path_literals.hrh>
-#include <ConnectionUiUtilities.rsg>
-#include <apsettings.mbg>
+#include <connectionuiutilities.rsg>
#include "ChangeConnectionDlg.h"
#include "ActiveCChangeConnectionDlg.h"
@@ -37,18 +36,10 @@
// CONSTANTS
-// ROM folder
-_LIT( KDriveZ, "z:" );
-
-// Name of the MBM file containing icons
-_LIT( KFileIcons, "ApSettings.mbm" );
-
#if defined(_DEBUG)
_LIT( KErrNullPointer, "NULL pointer" );
#endif
-LOCAL_D const TInt KIconsGranularity = 4;
-
// ================= MEMBER FUNCTIONS =======================
@@ -61,7 +52,8 @@
iIAPId( aIAPId ),
iConnectionName( aConnectionName ),
iIsWLANFeatureSupported( EFalse ),
- iActiveDlg( aActiveDlg )
+ iActiveDlg( aActiveDlg ),
+ iExpiryTimer( NULL )
{
}
@@ -166,8 +158,6 @@
SetItemTextArray( iActiveDlg->ActIAPs() );
SetOwnershipType( ELbmDoesNotOwnItemArray );
- SetIconsL();
-
// Timer not in use due the unresolved crash
//iExpiryTimer = CExpiryTimer::NewL( *this );
//iExpiryTimer->Start();
@@ -196,67 +186,6 @@
}
-// ---------------------------------------------------------
-// CChangeConnectionDlg::SetIconsL()
-// ---------------------------------------------------------
-//
-void CChangeConnectionDlg::SetIconsL()
- {
- CArrayPtr< CGulIcon >* icons = new( ELeave ) CAknIconArray(
- KIconsGranularity );
- CleanupStack::PushL( icons );
-
- MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-
- TFileName iconsFileName;
-
- iconsFileName.Append( KDriveZ );
-
- iconsFileName.Append( KDC_APP_BITMAP_DIR );
-
- iconsFileName.Append( KFileIcons );
-
- icons->AppendL( AknsUtils::CreateGulIconL( skinInstance,
- KAknsIIDQgnPropWmlGprs,
- iconsFileName,
- EMbmApsettingsQgn_prop_wml_gprs,
- EMbmApsettingsQgn_prop_wml_gprs_mask ) );
-
- icons->AppendL( AknsUtils::CreateGulIconL( skinInstance,
- KAknsIIDQgnPropWmlCsd,
- iconsFileName,
- EMbmApsettingsQgn_prop_wml_csd,
- EMbmApsettingsQgn_prop_wml_csd_mask ) );
-
- icons->AppendL( AknsUtils::CreateGulIconL( skinInstance,
- KAknsIIDQgnPropWmlHscsd,
- iconsFileName,
- EMbmApsettingsQgn_prop_wml_hscsd,
- EMbmApsettingsQgn_prop_wml_hscsd_mask ) );
-
- if ( iIsWLANFeatureSupported )
- {
- icons->AppendL( AknsUtils::CreateGulIconL( skinInstance,
- KAknsIIDQgnPropWlanEasy,
- iconsFileName,
- EMbmApsettingsQgn_prop_wlan_easy,
- EMbmApsettingsQgn_prop_wlan_easy_mask ) );
-
- icons->AppendL( AknsUtils::CreateGulIconL( skinInstance,
- KAknsIIDQgnPropWlanBearer,
- iconsFileName,
- EMbmApsettingsQgn_prop_wlan_bearer,
- EMbmApsettingsQgn_prop_wlan_bearer_mask ) );
- }
-
- SetIconArrayL( icons );
-
- CleanupStack::Pop( icons );
- }
-
-
-
-
// ----------------------------------------------------------------------------
// void CChangeConnectionDlg::HandleResourceChange( TInt aType )
// Handle resource change events.
@@ -268,7 +197,6 @@
{
CAknListQueryDialog::HandleResourceChange( aType );
- TRAP_IGNORE( SetIconsL() );
SizeChanged();
}
else