--- a/videocollection/videocollectionwrapper/tsrc/testvideomodel_p/stub/src/videodatacontainer.cpp	Tue Jul 06 14:17:50 2010 +0300
+++ b/videocollection/videocollectionwrapper/tsrc/testvideomodel_p/stub/src/videodatacontainer.cpp	Wed Aug 18 09:50:14 2010 +0300
@@ -19,6 +19,9 @@
 #include "videodatacontainer.h"
 #include "videocollectionutils.h"
 
+const TMPXItemId INVALID_ID = TMPXItemId::InvalidId();
+const int INVALID_INDEX = -1;
+
 /**
  * global qHash function required fo creating hash values for TMPXItemId -keys
  */
@@ -87,7 +90,7 @@
     mMediaData.erase(removeIter);
 }   
 
-void VideoDataContainer::decHashIndexesAfter(int fromIndex)
+void VideoDataContainer::decHashIndexesAfter(const int &fromIndex)
 {
     int count = mMediaIds.count();
     QMultiHash<TMPXItemId, QPair<int, CMPXMedia*> >::iterator hashIter;   
@@ -129,7 +132,7 @@
 // fromIndex
 // -----------------------------------------------------------------------------
 //
-CMPXMedia* VideoDataContainer::fromIndex(int index) const
+CMPXMedia* VideoDataContainer::fromIndex(const int &index) const
 {   
     if(index >= 0 && index < mMediaIds.count() && mMediaData.contains(mMediaIds[index]))
     {   
@@ -143,27 +146,27 @@
 // indexOfId
 // -----------------------------------------------------------------------------
 //
-int VideoDataContainer::indexOfId(const TMPXItemId &id) const
+const int& VideoDataContainer::indexOfId(const TMPXItemId &id) const
 {
     QMultiHash<TMPXItemId, QPair<int, CMPXMedia*> >::const_iterator iter = mMediaData.find(id);
     if(iter != mMediaData.constEnd())
     {
         return iter->first;
     }
-    return -1;
+    return INVALID_INDEX;
 }
 
 // -----------------------------------------------------------------------------
 // idFromIndex
 // -----------------------------------------------------------------------------
 //
-TMPXItemId VideoDataContainer::idFromIndex(int index) const
+TMPXItemId& VideoDataContainer::idFromIndex(const int &index) const
 {
     if(index >= 0 && index < mMediaIds.count())
     {
         return mMediaIds[index];
     }
-    return TMPXItemId::InvalidId();    
+    return INVALID_ID;    
 }
 
 // -----------------------------------------------------------------------------
@@ -179,7 +182,7 @@
 // markItemsRemoved
 // -----------------------------------------------------------------------------
 //
-TMPXItemId VideoDataContainer::markItemRemoved(const int &itemIndex)
+const TMPXItemId VideoDataContainer::markItemRemoved(const int &itemIndex)
 {
     // for all provided indexes:
     // - get item address from mMediaData
@@ -283,7 +286,7 @@
 // getRemovedMedia
 // -----------------------------------------------------------------------------
 //
-CMPXMedia* VideoDataContainer::getRemovedMedia(TMPXItemId itemId)
+CMPXMedia* VideoDataContainer::getRemovedMedia(TMPXItemId &itemId)
 {
     QHash<TMPXItemId, CMPXMedia*>::const_iterator itemIter = 
                                             mRemovedMedia.constFind(itemId);