diff -r 2a26698d78ba -r 38529f706030 phoneuis/easydialing/inc/easydialingcontactdatamanager.h --- a/phoneuis/easydialing/inc/easydialingcontactdatamanager.h Mon Mar 15 12:40:24 2010 +0200 +++ b/phoneuis/easydialing/inc/easydialingcontactdatamanager.h Wed Mar 31 21:30:06 2010 +0300 @@ -26,6 +26,7 @@ #include #include #include // For name order setting +#include #include "easydialingcontactdata.h" // FORWARD DECLARATIONS @@ -47,7 +48,8 @@ public MVPbkContactStoreObserver, public MVPbkOperationErrorObserver, public MVPbkOperationResultObserver, - public MPbkGlobalSettingObserver + public MPbkGlobalSettingObserver, + public MVPbkContactViewObserver { public: @@ -279,6 +281,33 @@ MVPbkContactOperationBase* aOperation, MVPbkContactViewBase* aOperationResult ); + +private: + /** + * From MVPbkContactViewObserver. + * For observing changes to favourites view. + */ + virtual void ContactViewReady( + MVPbkContactViewBase& aView ); + + virtual void ContactViewUnavailable( + MVPbkContactViewBase& aView ); + + virtual void ContactAddedToView( + MVPbkContactViewBase& aView, + TInt aIndex, + const MVPbkContactLink& aContactLink ); + + virtual void ContactRemovedFromView( + MVPbkContactViewBase& aView, + TInt aIndex, + const MVPbkContactLink& aContactLink ); + + virtual void ContactViewError( + MVPbkContactViewBase& aView, + TInt aError, + TBool aErrorNotified ); + private: void InitReady(); @@ -296,6 +325,8 @@ void GetAvailableServicesL( MVPbkStoreContact* aContact, TInt aIndex ); void InformObserver(); + + void UpdateNameOrderL(); private: /** Array that contains all loaded contact data. Owned. */ @@ -343,6 +374,9 @@ /** View to vpbk containing all favourite contacts. Owned. */ MVPbkContactViewBase* iFavsView; + /** Favourites view is ready to be used. */ + TBool iFavsViewReady; + /** Virtual phonebook operation handle for getting favourites. Owned. */ MVPbkContactOperationBase* iFavsOperation;