--- a/videocollection/tsrc/stubs/src/videosortfilterproxymodel.cpp	Fri Aug 06 09:43:48 2010 +0300
+++ b/videocollection/tsrc/stubs/src/videosortfilterproxymodel.cpp	Mon Aug 23 14:27:29 2010 +0300
@@ -43,6 +43,8 @@
 int VideoSortFilterProxyModelData::mRenameItemReturnValue = 0;
 QString VideoSortFilterProxyModelData::mLastAddedAlbumName = "";
 
+const TMPXItemId INVALID_ID = TMPXItemId::InvalidId();
+
 VideoSortFilterProxyModel::VideoSortFilterProxyModel(VideoCollectionCommon::TModelType type, QObject *parent):
     QSortFilterProxyModel(parent),
     mModel(0),
@@ -177,7 +179,7 @@
     return true;
 }
 
-TMPXItemId VideoSortFilterProxyModel::getMediaIdAtIndex(
+ const TMPXItemId& VideoSortFilterProxyModel::getMediaIdAtIndex(
     const QModelIndex &index) const
 {
     if (index.row() >= 0 &&
@@ -185,10 +187,10 @@
     {
         return VideoSortFilterProxyModelData::mItemIds[index.row()];
     }
-    return TMPXItemId::InvalidId();
+    return INVALID_ID;
 }
 
-QModelIndex VideoSortFilterProxyModel::indexOfId(TMPXItemId id)
+QModelIndex VideoSortFilterProxyModel::indexOfId(const TMPXItemId &id)
 {
     //VideoListDataModel *sourceModel = qobject_cast<VideoListDataModel*>(sourceModel());
 
@@ -203,7 +205,7 @@
     return QModelIndex();
 }
 
-QString VideoSortFilterProxyModel::getMediaFilePathForId(TMPXItemId mediaId)
+QString VideoSortFilterProxyModel::getMediaFilePathForId(const TMPXItemId &mediaId)
 {
     Q_UNUSED(mediaId);
     // not stubbed
@@ -270,7 +272,7 @@
     return VideoSortFilterProxyModelData::mRemoveItemsFromAlbumReturnValue;
 }
 
-void VideoSortFilterProxyModel::setAlbumInUse(TMPXItemId albumId)
+void VideoSortFilterProxyModel::setAlbumInUse(const TMPXItemId &albumId)
 {
     VideoSortFilterProxyModelData::mLastItemId = albumId;
 }
@@ -291,7 +293,7 @@
     return VideoSortFilterProxyModelData::mOpenedItemId;
 }
 
-void VideoSortFilterProxyModel::setGenericIdFilter(TMPXItemId itemId, bool filterValue)
+void VideoSortFilterProxyModel::setGenericIdFilter(const TMPXItemId &itemId, bool filterValue)
 {
     VideoSortFilterProxyModelData::mGenericFilterId  = itemId;
     VideoSortFilterProxyModelData::mGenericFilterValue = filterValue;