--- a/contentstorage/casrv/cawidgetscanner/inc/cawidgetstoragehandler.h Tue Jul 06 14:37:10 2010 +0300
+++ b/contentstorage/casrv/cawidgetscanner/inc/cawidgetstoragehandler.h Wed Aug 18 10:05:49 2010 +0300
@@ -49,8 +49,10 @@
* Two-phased constructor.
*/
static CCaWidgetStorageHandler* NewL( CCaStorageProxy* aStorage,
+ Usif::RSoftwareComponentRegistry& aSoftwareRegistry,
RFs& aFs );
static CCaWidgetStorageHandler* NewLC( CCaStorageProxy* aStorage,
+ Usif::RSoftwareComponentRegistry& aSoftwareRegistry,
RFs& aFs );
/**
@@ -124,7 +126,8 @@
/**
* C++ default constructor.
*/
- CCaWidgetStorageHandler( CCaStorageProxy* aStorage, RFs& aFs );
+ CCaWidgetStorageHandler( CCaStorageProxy* aStorage,
+ Usif::RSoftwareComponentRegistry& aSoftwareRegistry, RFs& aFs );
/**
* By default Symbian 2nd phase constructor is private.
@@ -139,11 +142,12 @@
/**
* Adds or updates component id attribute in entry based on SCR provided data
+ * and removable flag - get info from src.
* @param aPackageUid uid of the package which the widget represented by aEntry
- * is delivered with
+ * is delivered with.
* @param aEntry widget entry being updated with component id attribute.
*/
- void UpdateComponentIdL( const TDesC& aManifestFilePathName,
+ void UpdateCompIdAndRemovableFlagL( const TDesC& aManifestFilePathName,
CCaInnerEntry& aEntry ) const;
private:
@@ -160,16 +164,19 @@
RFs iFs;
/*
- * Widgets. Own.
+ * DB cache for widgets. Own.
*/
- RWidgetArray iWidgets;
+ RWidgetArray iWidgetDBCache;
/**
* Pointer to a parser object. Own
*/
CCaWidgetScannerParser* iParser;
- Usif::RSoftwareComponentRegistry iSoftwareRegistry;
+ /*
+ * Software Component Registry. Not own
+ */
+ Usif::RSoftwareComponentRegistry& iSoftwareRegistry;
};
#endif // C_WIDGETSTORAGEHANDLER_H