--- a/videocollection/tsrc/stubs/src/videosortfilterproxymodel.cpp Tue Jul 06 14:17:50 2010 +0300
+++ b/videocollection/tsrc/stubs/src/videosortfilterproxymodel.cpp Wed Aug 18 09:50:14 2010 +0300
@@ -39,8 +39,8 @@
TMPXItemId VideoSortFilterProxyModelData::mGenericFilterId = TMPXItemId::InvalidId();
bool VideoSortFilterProxyModelData::mGenericFilterValue = false;
TMPXItemId VideoSortFilterProxyModelData::mNewAlbumId = TMPXItemId::InvalidId();
-QString VideoSortFilterProxyModelData::mLastAlbumNameInRename;
-int VideoSortFilterProxyModelData::mRenameAlbumReturnValue = 0;
+QString VideoSortFilterProxyModelData::mLastItemNameInRename = "";
+int VideoSortFilterProxyModelData::mRenameItemReturnValue = 0;
QString VideoSortFilterProxyModelData::mLastAddedAlbumName = "";
VideoSortFilterProxyModel::VideoSortFilterProxyModel(VideoCollectionCommon::TModelType type, QObject *parent):
@@ -159,12 +159,6 @@
// not stubbed
}
-void VideoSortFilterProxyModel::itemModifiedSlot(const TMPXItemId &itemId)
-{
- Q_UNUSED(itemId);
- // not stubbed
-}
-
bool VideoSortFilterProxyModel::lessThan(const QModelIndex &left,
const QModelIndex &right) const
{
@@ -281,15 +275,15 @@
VideoSortFilterProxyModelData::mLastItemId = albumId;
}
-int VideoSortFilterProxyModel::renameAlbum(const TMPXItemId &albumId, const QString &newTitle)
+int VideoSortFilterProxyModel::renameItem(const TMPXItemId &itemId, const QString &newTitle)
{
if(VideoSortFilterProxyModelData::mRemoveItemsFromAlbumReturnValue >= 0)
{
- VideoSortFilterProxyModelData::mLastItemId = albumId;
- VideoSortFilterProxyModelData::mLastAlbumNameInRename = newTitle;
+ VideoSortFilterProxyModelData::mLastItemId = itemId;
+ VideoSortFilterProxyModelData::mLastItemNameInRename = newTitle;
}
- return VideoSortFilterProxyModelData::mRenameAlbumReturnValue;
+ return VideoSortFilterProxyModelData::mRenameItemReturnValue;
}
TMPXItemId VideoSortFilterProxyModel::getOpenItem() const