diff -r 0920c6a9b6c8 -r 8b8b34fa9751 contentstorage/srvsrc/caprogressnotifier.cpp
--- a/contentstorage/srvsrc/caprogressnotifier.cpp	Tue Jun 29 10:20:30 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) 2008 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"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  ?Description
- *
- */
-
-#include <s32mem.h>
-
-#include <usif/scr/scr.h>
-#include <usif/scr/screntries.h>
-
-#include "caprogressnotifier.h"
-#include "castorageproxy.h"
-#include "cainnerquery.h"
-#include "cainnerentry.h"
-#include "caarraycleanup.inl"
-
-using namespace Usif;
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CCaProgressNotifier* CCaProgressNotifier::NewL(
-        CCaStorageProxy& aCaStorageProxy )
-    {
-    CCaProgressNotifier* self = new ( ELeave ) CCaProgressNotifier(
-            aCaStorageProxy );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CCaProgressNotifier::~CCaProgressNotifier()
-    {
-    delete iNotifier;
-    iResultArrayItems.ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CCaProgressNotifier::CCaProgressNotifier( CCaStorageProxy& aCaStorageProxy ) :
-    iStorageProxy( aCaStorageProxy )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CCaProgressNotifier::ConstructL()
-    {
-    iNotifier = CSifOperationsNotifier::NewL( *this );
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CCaProgressNotifier::StartOperationHandler( TUint aKey,
-        const CSifOperationStartData& aStartData )
-    {
-    TInt err( KErrNone );
-    TComponentId componentId;
-    iResultArrayItems.ResetAndDestroy();
-
-    TRAP(err, componentId = ComponentIdL( aStartData.GlobalComponentId(),
-                    aStartData.SoftwareType() ));
-    if ( !err )
-        TRAP(err, MarkEntrysForUnistallL(aKey, componentId));
-
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CCaProgressNotifier::EndOperationHandler(
-        const CSifOperationEndData& aEndData )
-    {
-    TInt err = KErrNone;
-    TRAP(err, EndOperationL(aEndData.ErrorCode()));
-    iResultArrayItems.ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CCaProgressNotifier::ProgressOperationHandler(
-        const CSifOperationProgressData& aProgressData )
-    {
-    TInt err = KErrNone;
-    TRAP(err, UpdateProgressL(aProgressData));
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CCaProgressNotifier::UpdateProgressL(
-        const CSifOperationProgressData& aProgressData )
-    {
-    RBuf totalProgressBuf;
-    totalProgressBuf.CleanupClosePushL();
-    totalProgressBuf.CreateL( sizeof(TComponentId) + 1 );
-    totalProgressBuf.AppendNum( aProgressData.CurrentProgess() );
-
-    if ( iResultArrayItems.Count() && aProgressData.Phase() == EUninstalling )
-        {
-        for ( int i = 0; i < iResultArrayItems.Count(); i++ )
-            {
-            iResultArrayItems[i]->AddAttributeL( KCaAppUninstallProgress,
-                    totalProgressBuf );
-            iStorageProxy.AddL( iResultArrayItems[i], ETrue,
-                    EItemUninstallProgressChanged );
-            }
-        }
-
-    CleanupStack::PopAndDestroy( &totalProgressBuf );
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CCaProgressNotifier::EndOperationL( TInt aError )
-    {
-    if ( aError )
-        {
-        for ( int i = 0; i < iResultArrayItems.Count(); i++ )
-            {
-            iResultArrayItems[i]->SetFlags( iResultArrayItems[i]->GetFlags()
-                    & ~EUninstall );
-            iStorageProxy.AddL( iResultArrayItems[i] );
-            }
-        }
-    iNotifier->CancelSubscribeL( iKey );
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TComponentId CCaProgressNotifier::ComponentIdL(
-        const TDesC& aGlobalComponentId, const TDesC& aSwType )
-    {
-    RSoftwareComponentRegistry registry;
-    User::LeaveIfError( registry.Connect() );
-    CleanupClosePushL( registry );
-    TComponentId componentId = registry.GetComponentIdL( aGlobalComponentId,
-            aSwType );
-    CleanupStack::PopAndDestroy( &registry ); // registry    
-    return componentId;
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CCaProgressNotifier::MarkEntrysForUnistallL( TUint aKey,
-        TComponentId aComponentId )
-    {
-    RBuf componentIdBuf;
-    componentIdBuf.CleanupClosePushL();
-    componentIdBuf.CreateL( sizeof(TComponentId) + 1 );
-    componentIdBuf.AppendNum( aComponentId );
-
-    // find entry by componentID
-    CCaInnerQuery *innerQuery = CCaInnerQuery::NewLC();
-    innerQuery->SetRole( CCaInnerQuery::Item );
-    innerQuery->AddAttributeL( KCaAttrComponentId, componentIdBuf );
-
-    iStorageProxy.GetEntriesL( innerQuery, iResultArrayItems );
-
-    if ( iResultArrayItems.Count() )
-        {
-        for ( int i = 0; i < iResultArrayItems.Count(); i++ )
-            {
-            iResultArrayItems[i]->SetFlags( iResultArrayItems[i]->GetFlags()
-                    | EUninstall );
-            iStorageProxy.AddL( iResultArrayItems[i] );
-            }
-        // subscribe for progress notifier
-        iKey = aKey;
-        iNotifier->SubscribeL( aKey, ETrue );
-        }
-    CleanupStack::PopAndDestroy( innerQuery );
-    CleanupStack::PopAndDestroy( &componentIdBuf );
-    }