--- a/contentstorage/casrv/cawidgetscanner/src/cawidgetstoragehandler.cpp Tue Jun 29 10:20:30 2010 +0300
+++ b/contentstorage/casrv/cawidgetscanner/src/cawidgetstoragehandler.cpp Fri Jul 09 14:19:08 2010 +0300
@@ -40,7 +40,8 @@
// -----------------------------------------------------------------------------
//
CCaWidgetStorageHandler::CCaWidgetStorageHandler( CCaStorageProxy* aStorage,
- RFs& aFs )
+ Usif::RSoftwareComponentRegistry& aSoftwareRegistry, RFs& aFs ) :
+ iSoftwareRegistry(aSoftwareRegistry)
{
iStorage = aStorage;
iFs = aFs;
@@ -52,7 +53,6 @@
//
void CCaWidgetStorageHandler::ConstructL()
{
- User::LeaveIfError( iSoftwareRegistry.Connect() );
iParser = CCaWidgetScannerParser::NewL( iFs );
}
@@ -61,9 +61,10 @@
// -----------------------------------------------------------------------------
//
CCaWidgetStorageHandler* CCaWidgetStorageHandler::NewL(
- CCaStorageProxy* aStorage, RFs& aFs )
+ CCaStorageProxy* aStorage,
+ Usif::RSoftwareComponentRegistry& aSoftwareRegistry, RFs& aFs )
{
- CCaWidgetStorageHandler* self = NewLC( aStorage, aFs );
+ CCaWidgetStorageHandler* self = NewLC( aStorage, aSoftwareRegistry, aFs );
CleanupStack::Pop( self );
return self;
}
@@ -73,10 +74,11 @@
// -----------------------------------------------------------------------------
//
CCaWidgetStorageHandler* CCaWidgetStorageHandler::NewLC(
- CCaStorageProxy* aStorage, RFs& aFs )
+ CCaStorageProxy* aStorage,
+ Usif::RSoftwareComponentRegistry& aSoftwareRegistry, RFs& aFs )
{
CCaWidgetStorageHandler* self = new ( ELeave ) CCaWidgetStorageHandler(
- aStorage, aFs );
+ aStorage, aSoftwareRegistry, aFs );
CleanupStack::PushL( self );
self->ConstructL();
return self;
@@ -89,7 +91,6 @@
CCaWidgetStorageHandler::~CCaWidgetStorageHandler()
{
delete iParser;
- iSoftwareRegistry.Close();
iWidgets.ResetAndDestroy();
}