diff -r c743ef5928ba -r f966699dea19 idlehomescreen/xmluirendering/uiengine/inc/xnviewdata.h --- a/idlehomescreen/xmluirendering/uiengine/inc/xnviewdata.h Tue Feb 02 00:04:13 2010 +0200 +++ b/idlehomescreen/xmluirendering/uiengine/inc/xnviewdata.h Fri Feb 19 22:42:37 2010 +0200 @@ -62,7 +62,7 @@ /** * @see CXnPluginData */ - void LoadL(); + TInt Load(); /** * @see CXnPluginData @@ -93,36 +93,16 @@ * @see CXnPluginData */ void AppearanceNodesL( RPointerArray< CXnNode >& aList ) const; - - /* - * @see CXnPluginData - */ - void LoadDataPluginsL(); - - /* - * @see CXnPluginData - */ - void DataPluginsLoadCompletedL( TInt aStatus ); - - /* - * @see CXnPluginData - */ - void DestroyDataPluginsL(); - - /* - * @see CXnPluginData - */ - TBool DataPluginsLoaded() const; - + public: // New functions /** * Sets viewdata to active/ not active * - * @param aActive ETrue active, EFalse not active + * @param aActive ETrue active, EFalse not active */ - void SetActiveL( TBool aActive ); + void SetActive( TBool aActive ); /** * Returns if active or not @@ -144,20 +124,6 @@ inline TBool Initial() const; /** - * Sets focused node - * - * @param aNode Focused node - */ - inline void SetFocusedNode( CXnNode* aNode ); - - /** - * Returns focused node - * - * @return focused node - */ - inline CXnNode* FocusedNode() const; - - /** * Sets this view data to use empty widget * * @param aUse ETrue use, EFalse don't use @@ -238,18 +204,29 @@ * @param aLockingStatusString attr. locking_status ("locked"/"none") */ void SetLockingStatus( const TDesC8& aLockingStatusString ); + +private: + // new functions + + void LoadPublishers(); + + void DestroyPublishers( TInt aReason ); + + static TInt DoLoadPublishersL( TAny* aAny ); + + void DoDestroyPublishersL( TInt aReason ); private: // data - /** Focused Node, Not owned */ - CXnNode* iFocusedNode; - /** Pointer to wallpaper image, Owned */ - CFbsBitmap* iBgImage; - + CFbsBitmap* iBgImage; /** Path of the wallpaper image, including filename */ - HBufC* iBgImagePath; + HBufC* iBgImagePath; + /** Publisher load index */ + TInt iLoadIndex; + /** Flag to indicate whether content removed error should be shown */ + TBool iShowContentRemoved; }; #include "xnviewdata.inl"