diff -r aa99f2208aad -r b8d18c84f71c localisation/apparchitecture/apgrfx/APGPRIV.CPP --- a/localisation/apparchitecture/apgrfx/APGPRIV.CPP Wed Jul 28 16:03:37 2010 +0100 +++ b/localisation/apparchitecture/apgrfx/APGPRIV.CPP Tue Aug 03 10:20:34 2010 +0100 @@ -1,7 +1,7 @@ // Copyright (c) 1997-2009 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" +// under the terms of "Eclipse Public License v1.0" // which accompanies this distribution, and is available // at the URL "http://www.eclipse.org/legal/epl-v10.html". // @@ -11,6 +11,7 @@ // Contributors: // // Description: +// apgpriv.cpp // #include "APGPRIV.H" @@ -38,7 +39,6 @@ iScaleFactorWidth(1000), iScaleFactorHeight(1000) { - __DECLARE_NAME(_S("CApaIconPicture")); } void CApaIconPicture::ConstructL() @@ -138,3 +138,54 @@ { return TPictureCapability(TPictureCapability::ENotScaleable,EFalse); // scalable, not cropable } + + +// +// class CApaAppServiceInfoArrayImpl +// + +void CleanupAppServiceArray(TAny* aServiceArray) + { + __ASSERT_DEBUG(aServiceArray, Panic(EPanicNullPointer)); + CArrayFixFlat* serviceArray = static_cast*>(aServiceArray); + TInt serviceCount = serviceArray->Count(); + if (serviceCount > 0) + { + for (TInt i = serviceCount - 1; i >= 0; i--) + { + (*serviceArray)[i].Release(); + } + } + delete serviceArray; + serviceArray = 0; + } + +CApaAppServiceInfoArrayImpl* CApaAppServiceInfoArrayImpl::NewL(CArrayFix* aServiceInfoArray) + { + CApaAppServiceInfoArrayImpl* self = new CApaAppServiceInfoArrayImpl(aServiceInfoArray); + if (!self) + { + CleanupAppServiceArray(aServiceInfoArray); + User::LeaveNoMemory(); + } + return self; + } + +CApaAppServiceInfoArrayImpl::CApaAppServiceInfoArrayImpl(CArrayFix* aServiceInfoArray) + : iServiceInfoArray(aServiceInfoArray) + { + } + +CApaAppServiceInfoArrayImpl::~CApaAppServiceInfoArrayImpl() + { + CleanupAppServiceArray(iServiceInfoArray); + iServiceInfoArray = NULL; + } + +TArray CApaAppServiceInfoArrayImpl::Array() + { + return iServiceInfoArray->Array(); + } + + +