# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1277124508 -10800 # Node ID 5bddc28da6270d0320c69d30ffd0ea68d16ad7c6 # Parent f8cf9d484c15fc7cad7c439a43bbd5d84591b47a Revision: 201023 Kit: 2010125 diff -r f8cf9d484c15 -r 5bddc28da627 iaupdate/IAD/engine/controller/src/iaupdateloader.cpp --- a/iaupdate/IAD/engine/controller/src/iaupdateloader.cpp Wed Jun 09 09:49:41 2010 +0300 +++ b/iaupdate/IAD/engine/controller/src/iaupdateloader.cpp Mon Jun 21 15:48:28 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -504,18 +504,20 @@ IAUPDATE_TRACE_1("[IAUPDATE] Container child: %d", i); MNcdNode* node( aParentContainer.ChildL( i ) ); - CleanupReleasePushL( *node ); - - MNcdNodeContainer* container( - node->QueryInterfaceLC< MNcdNodeContainer >() ); - if ( container ) + if ( node ) { - IAUPDATE_TRACE("[IAUPDATE] Container child had container interface"); - LoadContainerL( *container ); - CleanupStack::PopAndDestroy( container ); + CleanupReleasePushL( *node ); + + MNcdNodeContainer* container( + node->QueryInterfaceLC< MNcdNodeContainer >() ); + if ( container ) + { + IAUPDATE_TRACE("[IAUPDATE] Container child had container interface"); + LoadContainerL( *container ); + CleanupStack::PopAndDestroy( container ); + } + CleanupStack::PopAndDestroy( node ); } - - CleanupStack::PopAndDestroy( node ); } IAUPDATE_TRACE("[IAUPDATE] CIAUpdateLoader::LoadChildContainersL() end"); @@ -636,55 +638,55 @@ for ( TInt i = 0; i < childCount; ++i ) { MNcdNode* node( aContainer.ChildL( i ) ); - CleanupReleasePushL( *node ); + if ( node ) + { + CleanupReleasePushL( *node ); - MNcdNodeContainer* container( - node->QueryInterfaceLC< MNcdNodeContainer >() ); - if ( container ) - { - IAUPDATE_TRACE_1("[IAUPDATE] Container child: %d had container interface", i); - - switch ( aPreviousOperationType ) + MNcdNodeContainer* container( + node->QueryInterfaceLC< MNcdNodeContainer >() ); + if ( container ) { - case TIAUpdateOperationInfo::ELoadRoot: - IAUPDATE_TRACE("[IAUPDATE] Load children of the root child"); - // When root is loaded, also its children are loaded - // and they have now their child count. So, no need to - // reload children of the root. Load their children - // directly now. - LoadChildrenL( *container ); - break; - - case TIAUpdateOperationInfo::ELoadChildren: - IAUPDATE_TRACE("[IAUPDATE] Load children of a container"); - // Notice, that now we need to first load the child count - // for the child containers. So, even if children were - // already updated by LoadChildrenL, a new request for - // containers needs . Otherwise, the child count - // will not be up-to-date. When the child containers are - // loaded, the flow will continue to load the children. - LoadContainerL( *container ); - break; + IAUPDATE_TRACE_1("[IAUPDATE] Container child: %d had container interface", i); + switch ( aPreviousOperationType ) + { + case TIAUpdateOperationInfo::ELoadRoot: + IAUPDATE_TRACE("[IAUPDATE] Load children of the root child"); + // When root is loaded, also its children are loaded + // and they have now their child count. So, no need to + // reload children of the root. Load their children + // directly now. + LoadChildrenL( *container ); + break; + + case TIAUpdateOperationInfo::ELoadChildren: + IAUPDATE_TRACE("[IAUPDATE] Load children of a container"); + // Notice, that now we need to first load the child count + // for the child containers. So, even if children were + // already updated by LoadChildrenL, a new request for + // containers needs . Otherwise, the child count + // will not be up-to-date. When the child containers are + // loaded, the flow will continue to load the children. + LoadContainerL( *container ); + break; - case TIAUpdateOperationInfo::ELoadAllChildren: - IAUPDATE_TRACE("[IAUPDATE] Load all children of a container"); - // Notice, here we will try to skip the loading of the child - // count of the container. So, all the children are tried to - // be loaded directly even if the child count may not be - // up-to-date. - LoadAllChildrenL( *container ); - break; - - default: - IAUPDATE_TRACE("[IAUPDATE] ERROR: Wrong operation type"); - User::Leave( KErrArgument ); - break; + case TIAUpdateOperationInfo::ELoadAllChildren: + IAUPDATE_TRACE("[IAUPDATE] Load all children of a container"); + // Notice, here we will try to skip the loading of the child + // count of the container. So, all the children are tried to + // be loaded directly even if the child count may not be + // up-to-date. + LoadAllChildrenL( *container ); + break; + + default: + IAUPDATE_TRACE("[IAUPDATE] ERROR: Wrong operation type"); + User::Leave( KErrArgument ); + break; + } + CleanupStack::PopAndDestroy( container ); } - - CleanupStack::PopAndDestroy( container ); + CleanupStack::PopAndDestroy( node ); } - - CleanupStack::PopAndDestroy( node ); } IAUPDATE_TRACE("[IAUPDATE] CIAUpdateLoader::LoadChildrenOfChildrenL() end"); diff -r f8cf9d484c15 -r 5bddc28da627 iaupdate/IAD/ui/group/iaupdate.rss --- a/iaupdate/IAD/ui/group/iaupdate.rss Wed Jun 09 09:49:41 2010 +0300 +++ b/iaupdate/IAD/ui/group/iaupdate.rss Mon Jun 21 15:48:28 2010 +0300 @@ -605,7 +605,7 @@ // --------------------------------------------------------- RESOURCE LISTBOX r_iaupdate_updates_list { - flags = EAknListBoxMultiselectionList; + flags = EAknListBoxMultiselectionList|EAknListBoxItemSpecificMenuAlwaysShown; } diff -r f8cf9d484c15 -r 5bddc28da627 installationservices/swi/source/backuprestore/backupsession.cpp --- a/installationservices/swi/source/backuprestore/backupsession.cpp Wed Jun 09 09:49:41 2010 +0300 +++ b/installationservices/swi/source/backuprestore/backupsession.cpp Mon Jun 21 15:48:28 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -216,7 +216,7 @@ // Appending ELangNone at the end as marker for the end of the language IDs // as we also append the language ID's from other Augmentations - matchingSupportedLanguagesArray.Append(ELangNone); + matchingSupportedLanguagesArray.AppendL(ELangNone); CleanupStack::PopAndDestroy(2, &augmentation); } diff -r f8cf9d484c15 -r 5bddc28da627 installationservices/swi/source/sisregistry/server_legacy/sisregistrycache.cpp --- a/installationservices/swi/source/sisregistry/server_legacy/sisregistrycache.cpp Wed Jun 09 09:49:41 2010 +0300 +++ b/installationservices/swi/source/sisregistry/server_legacy/sisregistrycache.cpp Mon Jun 21 15:48:28 2010 +0300 @@ -441,7 +441,7 @@ User::Leave(KErrCorrupt); } - iTokens.Append(token); + iTokens.AppendL(token); CleanupStack::Pop(token); CleanupStack::PopAndDestroy(&fileStream); @@ -1412,7 +1412,7 @@ CleanupClosePushL(aDriveList); aDriveList.Reset(); // a copy of the controller is always kept on drive C - aDriveList.Append(iSystemDrive); + aDriveList.AppendL(iSystemDrive); // only controllers will be written to removable media and // we have now to check for those diff -r f8cf9d484c15 -r 5bddc28da627 installationservices/swi/source/swis/server/siscontentprovider.cpp --- a/installationservices/swi/source/swis/server/siscontentprovider.cpp Wed Jun 09 09:49:41 2010 +0300 +++ b/installationservices/swi/source/swis/server/siscontentprovider.cpp Mon Jun 21 15:48:28 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -202,7 +202,7 @@ for (TInt option = 0; option < options.Count(); option++) { const RPointerArray& names = options[option].Names(); - ret.Append(&names[aLanguageIndex]->Data()); + ret.AppendL(&names[aLanguageIndex]->Data()); } CleanupStack::Pop(&ret); diff -r f8cf9d484c15 -r 5bddc28da627 installationservices/swidevicetools/source/swiconsole/src/ciohandler.cpp --- a/installationservices/swidevicetools/source/swiconsole/src/ciohandler.cpp Wed Jun 09 09:49:41 2010 +0300 +++ b/installationservices/swidevicetools/source/swiconsole/src/ciohandler.cpp Mon Jun 21 15:48:28 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -433,11 +433,11 @@ if(aAllowDuplicates) { - aIntArr.Append(number); + aIntArr.AppendL(number); } else { - aIntArr.InsertInOrder(number); + aIntArr.InsertInOrderL(number); } string.Delete(0, pos); diff -r f8cf9d484c15 -r 5bddc28da627 installationservices/swidevicetools/source/swiconsole/src/cpreferencehandler.cpp --- a/installationservices/swidevicetools/source/swiconsole/src/cpreferencehandler.cpp Wed Jun 09 09:49:41 2010 +0300 +++ b/installationservices/swidevicetools/source/swiconsole/src/cpreferencehandler.cpp Mon Jun 21 15:48:28 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -67,7 +67,7 @@ { CPreferences* preferences = CPreferences::NewL(); // Ownership transfered to iPreferenceList - iPreferenceList.Append(preferences); + iPreferenceList.AppendL(preferences); return preferences; } diff -r f8cf9d484c15 -r 5bddc28da627 installationservices/swidevicetools/source/swiconsole/src/cpreferences.cpp --- a/installationservices/swidevicetools/source/swiconsole/src/cpreferences.cpp Wed Jun 09 09:49:41 2010 +0300 +++ b/installationservices/swidevicetools/source/swiconsole/src/cpreferences.cpp Mon Jun 21 15:48:28 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -104,14 +104,14 @@ { HBufC* ptr = aPackageName.AllocL(); // Ownership transfered to the list - iPackageNameList.Append(ptr); + iPackageNameList.AppendL(ptr); } void CPreferences::AddVendorNameL(const TDesC& aVendorName) { HBufC* ptr = aVendorName.AllocL(); // Ownership transfered to the list - iVendorNameList.Append(ptr); + iVendorNameList.AppendL(ptr); } TBool CPreferences::IsPackageNamePresent(const TDesC& aPackageName) const