--- a/contentstorage/casrv/casrvmgr/src/casrvmanager.cpp Tue Jul 06 14:37:10 2010 +0300
+++ b/contentstorage/casrv/casrvmgr/src/casrvmanager.cpp Wed Aug 18 10:05:49 2010 +0300
@@ -50,11 +50,12 @@
// ---------------------------------------------------------------------------
//
CCaSrvManager* CCaSrvManager::NewLC( CCaStorageProxy& aCaStorageProxy,
+ Usif::RSoftwareComponentRegistry* aSoftwareRegistry,
CCaSrvEngUtils* aUtils )
{
CCaSrvManager* self = new ( ELeave ) CCaSrvManager();
CleanupStack::PushL( self );
- self->ConstructL( aCaStorageProxy, aUtils );
+ self->ConstructL( aCaStorageProxy, aSoftwareRegistry, aUtils);
return self;
}
@@ -62,10 +63,12 @@
//
// ---------------------------------------------------------------------------
//
-EXPORT_C CCaSrvManager* CCaSrvManager::NewL(
- CCaStorageProxy& aCaStorageProxy, CCaSrvEngUtils* aUtils )
+EXPORT_C CCaSrvManager* CCaSrvManager::NewL( CCaStorageProxy& aCaStorageProxy,
+ Usif::RSoftwareComponentRegistry* aSoftwareRegistry,
+ CCaSrvEngUtils* aUtils )
{
- CCaSrvManager* self = CCaSrvManager::NewLC( aCaStorageProxy, aUtils );
+ CCaSrvManager* self = CCaSrvManager::NewLC( aCaStorageProxy,
+ aSoftwareRegistry, aUtils );
CleanupStack::Pop(); // self;
return self;
}
@@ -75,12 +78,13 @@
// ---------------------------------------------------------------------------
//
void CCaSrvManager::ConstructL( CCaStorageProxy& aCaStorageProxy,
+ Usif::RSoftwareComponentRegistry* aSoftwareRegistry,
CCaSrvEngUtils* aUtils )
{
iPluginParams = new TPluginParams();
iPluginParams->storageProxy = &aCaStorageProxy;
iPluginParams->engUtils = aUtils;
-
+ iPluginParams->softwareRegistry = aSoftwareRegistry;
LoadPluginsL();
}