diff -r d39add9822e2 -r 5bfc169077b2 webengine/widgetregistry/Server/inc/WidgetRegistry.h --- a/webengine/widgetregistry/Server/inc/WidgetRegistry.h Tue Feb 02 00:56:45 2010 +0200 +++ b/webengine/widgetregistry/Server/inc/WidgetRegistry.h Fri Mar 19 09:52:28 2010 +0200 @@ -23,10 +23,11 @@ // INCLUDES #include #include -#include -#include -#include -#include +#include +#include +#include "WidgetRegistryData.h" +#include "WidgetRegistryConstants.h" +#include "WidgetPropertyValue.h" #include "WidgetRegistryLog.h" // CONSTANTS @@ -36,7 +37,6 @@ // FORWARD DECLARATIONS class RFs; -class CWidgetMMCHandler; class CWidgetEntry; class CWidgetInstaller; class CWidgetRegistryXml; @@ -58,7 +58,7 @@ * @since 3.1 */ -class CWidgetRegistry : public CBase +class CWidgetRegistry : public CBase, public MApaAppListServObserver { public: /** @@ -214,9 +214,10 @@ * Returns security policyId. */ TInt SecurityPolicyId() { return FetchSecurityPolicyIdL(); } - - static void NotifyWidgetAltered(); - + + //from MApaAppListServObserver + void HandleAppListEvent(TInt aEvent); + private: /** @@ -233,11 +234,6 @@ * Get widget entry with a particular UId */ TInt GetWidgetEntry( const TUid& aUid, CWidgetEntry*& aEntry ) const; - - /** - * Get widget entry with a particular UId - */ - TInt GetWidgetOldEntry( const TUid& aUid, CWidgetEntry*& aEntry ) const; /** * Get widget entry with a particular bundle Id @@ -359,7 +355,6 @@ RWidgetArray iEntries; RUidArray iUsedUids; RFs iFs; // not owned - RPointerArray iOldEntries; // Hold the earlier entries from iEntries // added for validation purpose RApaLsSession iAppArch; @@ -372,9 +367,9 @@ // map of language code to lproj dir RPtrHashMap iLangDirList; - CWidgetMMCHandler* iMMCHandler; TInt iPolicyId; CWidgetRegistryXml* iXmlProcessor; + CApaAppListNotifier* iApaAppListNotifier; public: LOG_MEMBER_VARS };