--- a/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsmodel.cpp Tue Apr 27 16:57:49 2010 +0300
+++ b/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsmodel.cpp Tue May 11 16:30:05 2010 +0300
@@ -202,13 +202,15 @@
RPointerArray<CItemMap> settingItems;
CleanupResetAndDestroyPushL( settingItems );
- iPluginSettings->GetSettingsL( *iPluginId, settingItems );
+ User::LeaveIfError(
+ iPluginSettings->GetSettingsL( *iPluginId, settingItems ) );
for ( TInt i = 0; i < settingItems.Count(); i++ )
{
CItemMap* itemMap = settingItems[i];
- RPointerArray<HSPluginSettingsIf::CPropertyMap> properties;
- properties = itemMap->Properties();
+ // get properties
+ RPointerArray<HSPluginSettingsIf::CPropertyMap>& properties
+ = itemMap->Properties();
TSettingItem item = ItemL( properties );
iSettings.AppendL( item );
}
@@ -312,15 +314,17 @@
RPointerArray<CItemMap> settingItems;
CleanupResetAndDestroyPushL( settingItems );
- iPluginSettings->GetSettingsL( *iPluginId, settingItems );
+ User::LeaveIfError( iPluginSettings->GetSettingsL( *iPluginId, settingItems ) );
if ( aIndex >= 0 && aIndex < settingItems.Count() )
{
TBool exists( EFalse );
CItemMap* itemMap = settingItems[ aIndex ];
- RPointerArray<HSPluginSettingsIf::CPropertyMap> properties;
- properties = itemMap->Properties();
+ // get properties
+ RPointerArray<HSPluginSettingsIf::CPropertyMap>& properties
+ = itemMap->Properties();
+
const TInt KGranularity = 6;
CDesC8Array* propertiesList = new ( ELeave ) CDesC8ArrayFlat( KGranularity );
CleanupStack::PushL( propertiesList );