diff -r a76e86df7ccd -r 0e1e938beb1a videocollection/eabi/videocollectionwrapperu.def
--- a/videocollection/eabi/videocollectionwrapperu.def	Thu Sep 02 20:28:16 2010 +0300
+++ b/videocollection/eabi/videocollectionwrapperu.def	Fri Sep 17 08:30:05 2010 +0300
@@ -8,7 +8,7 @@
 	_ZN18VideoThumbnailData17thumbnailsFetchedER5QListI10TMPXItemIdE @ 7 NONAME
 	_ZN18VideoThumbnailData19getStaticMetaObjectEv @ 8 NONAME
 	_ZN18VideoThumbnailData23enableThumbnailCreationEb @ 9 NONAME
-	_ZN18VideoThumbnailData23startBackgroundFetchingEP25VideoSortFilterProxyModeli @ 10 NONAME
+	_ZN18VideoThumbnailData23startBackgroundFetchingEP22VideoProxyModelGenerici @ 10 NONAME
 	_ZN18VideoThumbnailData24enableBackgroundFetchingEb @ 11 NONAME
 	_ZN18VideoThumbnailData25backgroundFetchingEnabledEv @ 12 NONAME
 	_ZN18VideoThumbnailData8instanceEv @ 13 NONAME
@@ -20,63 +20,63 @@
 	_ZN22VideoCollectionWrapper11asyncStatusEiR8QVariant @ 19 NONAME
 	_ZN22VideoCollectionWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 20 NONAME
 	_ZN22VideoCollectionWrapper11qt_metacastEPKc @ 21 NONAME
-	_ZN22VideoCollectionWrapper15sendAsyncStatusEiR8QVariant @ 22 NONAME
-	_ZN22VideoCollectionWrapper16staticMetaObjectE @ 23 NONAME DATA 16
-	_ZN22VideoCollectionWrapper19getStaticMetaObjectEv @ 24 NONAME
-	_ZN22VideoCollectionWrapper8getModelEN21VideoCollectionCommon10TModelTypeE @ 25 NONAME
-	_ZN22VideoCollectionWrapper8instanceEv @ 26 NONAME
-	_ZN22VideoCollectionWrapperC1Ev @ 27 NONAME
-	_ZN22VideoCollectionWrapperC2Ev @ 28 NONAME
-	_ZN22VideoCollectionWrapperD0Ev @ 29 NONAME
-	_ZN22VideoCollectionWrapperD1Ev @ 30 NONAME
-	_ZN22VideoCollectionWrapperD2Ev @ 31 NONAME
-	_ZN25VideoSortFilterProxyModel10getSortingERiRN2Qt9SortOrderE @ 32 NONAME
-	_ZN25VideoSortFilterProxyModel10initializeEP18VideoListDataModel @ 33 NONAME
-	_ZN25VideoSortFilterProxyModel10modelReadyEv @ 34 NONAME
-	_ZN25VideoSortFilterProxyModel10renameItemERK10TMPXItemIdRK7QString @ 35 NONAME
-	_ZN25VideoSortFilterProxyModel11addNewAlbumERK7QString @ 36 NONAME
-	_ZN25VideoSortFilterProxyModel11deleteItemsERK5QListI11QModelIndexE @ 37 NONAME
-	_ZN25VideoSortFilterProxyModel11qt_metacallEN11QMetaObject4CallEiPPv @ 38 NONAME
-	_ZN25VideoSortFilterProxyModel11qt_metacastEPKc @ 39 NONAME
-	_ZN25VideoSortFilterProxyModel12modelChangedEv @ 40 NONAME
-	_ZN25VideoSortFilterProxyModel12removeAlbumsERK5QListI11QModelIndexE @ 41 NONAME
-	_ZN25VideoSortFilterProxyModel13setAlbumInUseERK10TMPXItemId @ 42 NONAME
-	_ZN25VideoSortFilterProxyModel14connectSignalsEv @ 43 NONAME
-	_ZN25VideoSortFilterProxyModel14processSortingEv @ 44 NONAME
-	_ZN25VideoSortFilterProxyModel15addItemsInAlbumER10TMPXItemIdRK5QListIS0_E @ 45 NONAME
-	_ZN25VideoSortFilterProxyModel16albumChangedSlotEv @ 46 NONAME
-	_ZN25VideoSortFilterProxyModel16fetchItemDetailsERK11QModelIndex @ 47 NONAME
-	_ZN25VideoSortFilterProxyModel16staticMetaObjectE @ 48 NONAME DATA 16
-	_ZN25VideoSortFilterProxyModel17disconnectSignalsEv @ 49 NONAME
-	_ZN25VideoSortFilterProxyModel17shortDetailsReadyE10TMPXItemId @ 50 NONAME
-	_ZN25VideoSortFilterProxyModel18setGenericIdFilterERK10TMPXItemIdb @ 51 NONAME
-	_ZN25VideoSortFilterProxyModel19getStaticMetaObjectEv @ 52 NONAME
-	_ZN25VideoSortFilterProxyModel20removeItemsFromAlbumER10TMPXItemIdRK5QListIS0_E @ 53 NONAME
-	_ZN25VideoSortFilterProxyModel21getMediaFilePathForIdERK10TMPXItemId @ 54 NONAME
-	_ZN25VideoSortFilterProxyModel4backEv @ 55 NONAME
-	_ZN25VideoSortFilterProxyModel4openEN21VideoCollectionCommon17TCollectionLevelsE @ 56 NONAME
-	_ZN25VideoSortFilterProxyModel7getTypeEv @ 57 NONAME
-	_ZN25VideoSortFilterProxyModel8openItemE10TMPXItemId @ 58 NONAME
-	_ZN25VideoSortFilterProxyModel9doSortingEiN2Qt9SortOrderEb @ 59 NONAME
-	_ZN25VideoSortFilterProxyModel9indexOfIdERK10TMPXItemId @ 60 NONAME
-	_ZN25VideoSortFilterProxyModelC1EN21VideoCollectionCommon10TModelTypeEP7QObject @ 61 NONAME
-	_ZN25VideoSortFilterProxyModelC2EN21VideoCollectionCommon10TModelTypeEP7QObject @ 62 NONAME
-	_ZN25VideoSortFilterProxyModelD0Ev @ 63 NONAME
-	_ZN25VideoSortFilterProxyModelD1Ev @ 64 NONAME
-	_ZN25VideoSortFilterProxyModelD2Ev @ 65 NONAME
-	_ZNK18VideoThumbnailData10metaObjectEv @ 66 NONAME
-	_ZNK22VideoCollectionWrapper10metaObjectEv @ 67 NONAME
-	_ZNK25VideoSortFilterProxyModel10metaObjectEv @ 68 NONAME
-	_ZNK25VideoSortFilterProxyModel11getOpenItemEv @ 69 NONAME
-	_ZNK25VideoSortFilterProxyModel16filterAcceptsRowEiRK11QModelIndex @ 70 NONAME
-	_ZNK25VideoSortFilterProxyModel16resolveAlbumNameERK7QString @ 71 NONAME
-	_ZNK25VideoSortFilterProxyModel17getMediaIdAtIndexERK11QModelIndex @ 72 NONAME
-	_ZNK25VideoSortFilterProxyModel8lessThanERK11QModelIndexS2_ @ 73 NONAME
-	_ZTI18VideoThumbnailData @ 74 NONAME
-	_ZTI22VideoCollectionWrapper @ 75 NONAME
-	_ZTI25VideoSortFilterProxyModel @ 76 NONAME
-	_ZTV18VideoThumbnailData @ 77 NONAME
-	_ZTV22VideoCollectionWrapper @ 78 NONAME
-	_ZTV25VideoSortFilterProxyModel @ 79 NONAME
-	_ZN25VideoSortFilterProxyModel11modelSortedEv @ 80 NONAME
+	_ZN22VideoCollectionWrapper15getGenericModelEv @ 22 NONAME
+	_ZN22VideoCollectionWrapper15sendAsyncStatusEiR8QVariant @ 23 NONAME
+	_ZN22VideoCollectionWrapper16staticMetaObjectE @ 24 NONAME DATA 16
+	_ZN22VideoCollectionWrapper17getAllVideosModelEv @ 25 NONAME
+	_ZN22VideoCollectionWrapper19getCollectionsModelEv @ 26 NONAME
+	_ZN22VideoCollectionWrapper19getStaticMetaObjectEv @ 27 NONAME
+	_ZN22VideoCollectionWrapper25getCollectionContentModelEv @ 28 NONAME
+	_ZN22VideoCollectionWrapper8instanceEv @ 29 NONAME
+	_ZN22VideoCollectionWrapperC1Ev @ 30 NONAME
+	_ZN22VideoCollectionWrapperC2Ev @ 31 NONAME
+	_ZN22VideoCollectionWrapperD0Ev @ 32 NONAME
+	_ZN22VideoCollectionWrapperD1Ev @ 33 NONAME
+	_ZN22VideoCollectionWrapperD2Ev @ 34 NONAME
+	_ZN22VideoProxyModelGeneric10getSortingERiRN2Qt9SortOrderE @ 35 NONAME
+	_ZN22VideoProxyModelGeneric10initializeEP18VideoListDataModel @ 36 NONAME
+	_ZN22VideoProxyModelGeneric10renameItemERK10TMPXItemIdRK7QString @ 37 NONAME
+	_ZN22VideoProxyModelGeneric11addNewAlbumERK7QString @ 38 NONAME
+	_ZN22VideoProxyModelGeneric11deleteItemsERK5QListI11QModelIndexE @ 39 NONAME
+	_ZN22VideoProxyModelGeneric11modelSortedEv @ 40 NONAME
+	_ZN22VideoProxyModelGeneric11qt_metacallEN11QMetaObject4CallEiPPv @ 41 NONAME
+	_ZN22VideoProxyModelGeneric11qt_metacastEPKc @ 42 NONAME
+	_ZN22VideoProxyModelGeneric12removeAlbumsERK5QListI11QModelIndexE @ 43 NONAME
+	_ZN22VideoProxyModelGeneric13setAlbumInUseERK10TMPXItemId @ 44 NONAME
+	_ZN22VideoProxyModelGeneric14connectSignalsEv @ 45 NONAME
+	_ZN22VideoProxyModelGeneric14processSortingEv @ 46 NONAME
+	_ZN22VideoProxyModelGeneric15addItemsInAlbumER10TMPXItemIdRK5QListIS0_E @ 47 NONAME
+	_ZN22VideoProxyModelGeneric16fetchItemDetailsERK11QModelIndex @ 48 NONAME
+	_ZN22VideoProxyModelGeneric16staticMetaObjectE @ 49 NONAME DATA 16
+	_ZN22VideoProxyModelGeneric17disconnectSignalsEv @ 50 NONAME
+	_ZN22VideoProxyModelGeneric17shortDetailsReadyE10TMPXItemId @ 51 NONAME
+	_ZN22VideoProxyModelGeneric18processSortingSlotEv @ 52 NONAME
+	_ZN22VideoProxyModelGeneric18setGenericIdFilterERK10TMPXItemIdb @ 53 NONAME
+	_ZN22VideoProxyModelGeneric19getStaticMetaObjectEv @ 54 NONAME
+	_ZN22VideoProxyModelGeneric20removeItemsFromAlbumER10TMPXItemIdRK5QListIS0_E @ 55 NONAME
+	_ZN22VideoProxyModelGeneric21getMediaFilePathForIdERK10TMPXItemId @ 56 NONAME
+	_ZN22VideoProxyModelGeneric4backEv @ 57 NONAME
+	_ZN22VideoProxyModelGeneric4openEN21VideoCollectionCommon17TCollectionLevelsE @ 58 NONAME
+	_ZN22VideoProxyModelGeneric8openItemE10TMPXItemId @ 59 NONAME
+	_ZN22VideoProxyModelGeneric9doSortingEiN2Qt9SortOrderEb @ 60 NONAME
+	_ZN22VideoProxyModelGeneric9indexOfIdERK10TMPXItemId @ 61 NONAME
+	_ZN22VideoProxyModelGenericC1EP7QObject @ 62 NONAME
+	_ZN22VideoProxyModelGenericC2EP7QObject @ 63 NONAME
+	_ZN22VideoProxyModelGenericD0Ev @ 64 NONAME
+	_ZN22VideoProxyModelGenericD1Ev @ 65 NONAME
+	_ZN22VideoProxyModelGenericD2Ev @ 66 NONAME
+	_ZNK18VideoThumbnailData10metaObjectEv @ 67 NONAME
+	_ZNK22VideoCollectionWrapper10metaObjectEv @ 68 NONAME
+	_ZNK22VideoProxyModelGeneric10metaObjectEv @ 69 NONAME
+	_ZNK22VideoProxyModelGeneric11getOpenItemEv @ 70 NONAME
+	_ZNK22VideoProxyModelGeneric16filterAcceptsRowEiRK11QModelIndex @ 71 NONAME
+	_ZNK22VideoProxyModelGeneric16resolveAlbumNameERK7QString @ 72 NONAME
+	_ZNK22VideoProxyModelGeneric17getMediaIdAtIndexERK11QModelIndex @ 73 NONAME
+	_ZNK22VideoProxyModelGeneric8lessThanERK11QModelIndexS2_ @ 74 NONAME
+	_ZTI18VideoThumbnailData @ 75 NONAME
+	_ZTI22VideoCollectionWrapper @ 76 NONAME
+	_ZTI22VideoProxyModelGeneric @ 77 NONAME
+	_ZTV18VideoThumbnailData @ 78 NONAME
+	_ZTV22VideoCollectionWrapper @ 79 NONAME
+	_ZTV22VideoProxyModelGeneric @ 80 NONAME