--- a/hgcacheproxymodel/tsrc/fute/HgCacheProxyModelTestApp/src/mydataprovider.cpp	Fri Jun 11 16:25:05 2010 +0100
+++ b/hgcacheproxymodel/tsrc/fute/HgCacheProxyModelTestApp/src/mydataprovider.cpp	Thu Jul 22 16:36:56 2010 +0100
@@ -13,16 +13,13 @@
 *
 * Description:
 *
-*  Version     : %version: 1 %
+*  Version     : %version: 7 %
 */
 #include <QList>
 #include "hglogger.h"
-#include <hbicon.h>
+#include <HbIcon>
 #include "mydataprovider.h"
 
-//#include "x:\sf\mw\qt\src\openvg\qpixmapdata_vg_p.h"
-//typedef VGImage (*pfnVgCreateEGLImageTargetKHR)(VGeglImageKHR);
-
 const int KItemIdRole = Qt::UserRole+1;
 
 const int KThumbnailsPriority = EPriorityLess; //standard priority
@@ -30,17 +27,19 @@
 
 MyDataProvider::MyDataProvider(QObject *parent) :
 HgDataProviderModel(parent),
-mDefaultIcon(new HbIcon(QIcon(QPixmap(":/icons/default.png")))),
+mDefaultIcon(QIcon(QPixmap(":/icons/default.png"))),
 mScheduler(new CActiveSchedulerWait()),
 mWrapper( new ThumbnailManager() ),
 mThumbnailRequestPending(false),
 mThumbnailRequestIndex(-1),
 mThumbnailRequestID(-1),
 mThumbnailsize(ThumbnailManager::ThumbnailMedium),
-mMDSLoadInProgress(false)
+mMDSLoadInProgress(false),
+mMode(0)
 {
 //    TX_ENTRY
     Q_UNUSED(parent);
+    
     mWrapper->setThumbnailSize( mThumbnailsize );
     mWrapper->setQualityPreference( ThumbnailManager::OptimizeForPerformance );
 
@@ -53,7 +52,6 @@
 MyDataProvider::~MyDataProvider()
 {
 //    TX_ENTRY
-    delete mDefaultIcon;
     delete mWrapper;
     delete mScheduler;
 //    TX_EXIT
@@ -68,6 +66,14 @@
 //    TX_EXIT
 }
 
+void MyDataProvider::changeMode(int mode)
+{
+    if(mMode!=mode){
+        mMode = mode;
+        resetModel();
+    }
+}
+
 void MyDataProvider::doRequestData(QList<int> list, bool silent)
 {
     TX_ENTRY
@@ -156,7 +162,7 @@
 
 QVariant MyDataProvider::defaultIcon() const
 {
-    return *mDefaultIcon;
+    return mDefaultIcon;
 }
 
 void MyDataProvider::HandleSessionOpened(CMdESession& aSession, TInt aError)
@@ -221,9 +227,15 @@
         
         CMdENamespaceDef& namespaceDef = session->GetDefaultNamespaceDefL();
                 
-        CMdEObjectDef& objectDef = namespaceDef.GetObjectDefL(_L("Image"));
-    
-        CMdEObjectQuery* imageQuery = session->NewObjectQueryL( namespaceDef, objectDef, this );
+        CMdEObjectQuery* imageQuery;
+        if ( mMode == 0){
+            CMdEObjectDef& objectDef = namespaceDef.GetObjectDefL(_L("Image"));
+            imageQuery = session->NewObjectQueryL( namespaceDef, objectDef, this );
+        } else {
+            CMdEObjectDef& objectDef = namespaceDef.GetObjectDefL(_L("Audio"));
+            imageQuery = session->NewObjectQueryL( namespaceDef, objectDef, this );
+        }   
+        
         CleanupStack::PushL( imageQuery );
         imageQuery->SetResultMode( EQueryResultModeId );
         imageQuery->FindL( );
@@ -235,4 +247,17 @@
     
     TX_EXIT    
 }
+void MyDataProvider::testRemoveItem(int pos)
+{
+    TX_ENTRY
+    removeItem(pos);
+    TX_EXIT  
+}
 
+void MyDataProvider::testInsertItem(int pos, QList< QPair< QVariant, int > >* data)
+{
+    TX_ENTRY
+    insertItem(pos, data, false);
+    TX_EXIT  
+}
+