--- a/mpdata/inc/mpmpxcollectiondata_p.h	Fri Aug 06 16:51:36 2010 -0500
+++ b/mpdata/inc/mpmpxcollectiondata_p.h	Tue Aug 24 03:36:14 2010 -0500
@@ -21,6 +21,8 @@
 #include <e32base.h>
 
 #include <QHash>
+#include <QPair>
+#include <QAbstractListModel>
 
 #include "mpmpxcollectiondata.h"
 #include "mpmpxcollectionviewdefs.h"
@@ -40,7 +42,7 @@
 
     int count() const;
     QString collectionTitle() const;
-    QString itemData( int index, MpMpxCollectionData::DataType type ) const;
+    QString itemData( int index, MpMpxCollectionData::DataType type );
 
     bool isAutoPlaylist();
     bool isAutoPlaylist( int index );
@@ -56,33 +58,46 @@
     int currentAlbumIndex() const;
     int albumSongsCount() const;
     QString albumSongData( int index, MpMpxCollectionData::DataType type ) const;
+    bool hasItemProperty( int index, MpMpxCollectionData:: DataProperty type ) const;
+    bool hasAlbumSongProperty( int index, MpMpxCollectionData:: DataProperty type ) const;
 
     void setMpxMedia( const CMPXMedia& entries, bool reopen );
+    void incrementalOpenUpdate();
     const CMPXMedia& containerMedia();
     void setContext( TCollectionContext context );
     void setAlbumContent( const CMPXMedia& albumContent );
     int itemIndex( int itemUniqueId );
     int albumSongIndex( int songUniqueId );
+    QList<int> songIndex( int songUniqueId );
+    void setCorruptValue( QModelIndex index, bool tBone );
+    void setReloadAlbumContent( bool reloadAlbum );
 
 private:
+
     void loadAlbumsLookup();
     void loadAlbumSongsLookup();
-    void DoGetDataL( int index, MpMpxCollectionData::DataType type, QString& data ) const;
+    void setReloadRange( int index );
+    int itemId2( int index);
+    void DoGetDataL( int index, MpMpxCollectionData::DataType type, QString& data );
     bool DoIsAutoPlaylistL();
     bool DoIsAutoPlaylistL( int index );
     int DoGetItemCountL( int index );
     int DoGetContainerIdL();
     int DoGetItemIdL( int index );
+    int DoGetItemId2L( int index );
     int DoGetAlbumSongIdL( int index );
     void DoRemoveItemL( int index );
     bool DoTestCachedItemL( int itemId );
 
     bool DoSetCurrentAlbumL( int index );
     void DoGetAlbumSongDataL( int index, MpMpxCollectionData::DataType type, QString& data ) const;
+    bool DoHasItemPropertyL( int index, MpMpxCollectionData:: DataProperty type ) const;
+    bool DoHasAlbumSongPropertyL( int index, MpMpxCollectionData:: DataProperty type ) const;
 
     void SetCollectionContextL();
     void DoSetMpxMediaL( const CMPXMedia& entries );
     void DoSetAlbumContentL( const CMPXMedia& albumContent );
+    void DoSetCorruptValueL( QModelIndex index, bool tBone );
 
 private:
 
@@ -96,9 +111,14 @@
 
     int                     iCurrentAlbumIndex;
     int                     iAlbumSongCount;
-    QHash<int, int>         albumIdIndexMapping;
-    QHash<int, int>         albumSongIdIndexMapping;
+    QHash<int, int>         iAlbumIdIndexMapping;
+    QHash<int, int>         iAlbumSongIdIndexMapping;
+    QHash<int, int>         iSongIdIndexMapping;
+    bool                    iReloadAlbumContent;
 
+    bool                    iNeedReload;
+    QPair<int, int>         iReloadRange;
+	
 };
 
 #endif // MPMPXCOLLECTIONDATA_P_H