diff -r 91d5ad76f5c6 -r 16db3449d7ba mmappcomponents/collectionhelper/inc/mpxcollectionhelperimp.h --- a/mmappcomponents/collectionhelper/inc/mpxcollectionhelperimp.h Wed Sep 15 12:45:22 2010 +0300 +++ b/mmappcomponents/collectionhelper/inc/mpxcollectionhelperimp.h Wed Oct 13 15:06:09 2010 +0300 @@ -19,9 +19,6 @@ #ifndef CMPXCOLLECTIONHELPERIMP_H #define CMPXCOLLECTIONHELPERIMP_H -#include -#include - #include "mpxcollectionhelper.h" #include "mpxharvesterutilityobserver.h" #include "mpxmediatorobserver.h" @@ -44,8 +41,7 @@ NONSHARABLE_CLASS( CMPXCollectionHelperImp ): public CBase, public MMPXCollectionHelper, public MMPXHarvesterUtilityObserver, - public MMPXMediatorObserver, - public MThumbnailManagerObserver + public MMPXMediatorObserver { public: @@ -699,18 +695,6 @@ */ void HandleFileGetMediaCompletedL( CMPXMedia* aMedia, TInt aErr ); -public: - /** - * From MThumbnailManagerObserver - */ - void ThumbnailPreviewReady( MThumbnailData& aThumbnail, - TThumbnailRequestId aId ); - /** - * From MThumbnailManagerObserver - */ - void ThumbnailReady( TInt aError, - MThumbnailData& aThumbnail, - TThumbnailRequestId aId ); private: /** @@ -718,13 +702,6 @@ * @param aMedia media item to add to the collection */ void DoAddToCollectionL( CMPXMedia* aMedia ); - - /** - * Rename the thumbnail through thumbnail manager - * @param aOldUri exiting uri of the song - * @param aNewUri new uri of the song - */ - void RenameThumbnailL( const TDesC& aOldUri, const TDesC& aNewUri ); protected: @@ -743,8 +720,7 @@ MMPXHarvesterUtility* iHvsUtility; MMPXCollectionUtility* iCollectionUtil; CMPXCollectionMediator* iMediator; - - CThumbnailManager* iTNManager; // owned + MMPXCollectionHelperObserver* iObserver; // not owned TUid iMusicCollectionId; TBool iInitialized;