--- a/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p/stub/src/videocollectionwrapper.cpp	Thu Apr 01 23:13:36 2010 +0300
+++ b/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p/stub/src/videocollectionwrapper.cpp	Thu Apr 01 23:22:15 2010 +0300
@@ -28,30 +28,10 @@
 // VideoCollectionWrapper::instance()
 // -----------------------------------------------------------------------------
 //
-VideoCollectionWrapper *VideoCollectionWrapper::instance()
+VideoCollectionWrapper &VideoCollectionWrapper::instance()
 {
-    if(!mInstance)
-    {
-        mInstance = new VideoCollectionWrapper();
-    }
-    mInstance->mReferenceCount++;
-    return mInstance;
-}
-
-// -----------------------------------------------------------------------------
-// VideoCollectionWrapper::decreaseReferenceCount()
-// -----------------------------------------------------------------------------
-//
-void VideoCollectionWrapper::decreaseReferenceCount()
-{
-    if(mInstance)
-    {
-        if(--mInstance->mReferenceCount == 0)
-        {
-            delete mInstance;
-            mInstance = NULL;
-        }
-    }
+    static VideoCollectionWrapper _staticWrapper;
+    return _staticWrapper;
 }
 
 // -----------------------------------------------------------------------------
@@ -75,7 +55,7 @@
 // VideoCollectionWrapper::open()
 // -----------------------------------------------------------------------------
 //
-VideoSortFilterProxyModel* VideoCollectionWrapper::getModel()
+VideoSortFilterProxyModel* VideoCollectionWrapper::getModel(TModelType type)
 {
     return mModel;
 }