--- a/videocollection/tsrc/stubs/src/videolistview.cpp	Fri Sep 17 08:30:05 2010 +0300
+++ b/videocollection/tsrc/stubs/src/videolistview.cpp	Mon Oct 04 00:19:07 2010 +0300
@@ -16,6 +16,7 @@
 */
 
 #include "videolistview.h"
+#include "videolistwidget.h"
 #include "videocollectionviewutils.h"
 #include "videocollectionwrapper.h"
 
@@ -26,6 +27,7 @@
 int VideoListViewData::mDeactivateViewCount = 0;
 int VideoListViewData::mInitializeViewCount = 0;
 TMPXItemId VideoListViewData::mActivatedItemId = TMPXItemId::InvalidId();
+VideoListWidget* VideoListViewData::mCurrentListWidget = 0;
 
 VideoListView::VideoListView(VideoCollectionUiLoader *uiLoader, QGraphicsItem *parent) :
 HbView(parent),
@@ -34,11 +36,7 @@
 mUiLoader(uiLoader),
 mModelReady(false),
 mVideoServices(0),
-mCurrentList(0),
-mToolbarViewsActionGroup(0),
-mToolbarCollectionActionGroup(0),
-mToolbarServiceExtension(0)
-
+mCurrentList(0)
 {
     // not stubbed
 }
@@ -112,29 +110,13 @@
     return 0;
 }
 
-void VideoListView::createOperatorServicesToolbar()
-{
-    // not stubbed
-}
-
-void VideoListView::loadOperatorService(int titleKey, int iconKey, int uriKey, int uidKey)
+VideoListWidget *VideoListView::getCurrentList()
 {
-    // not stubbed
-    Q_UNUSED(titleKey);
-    Q_UNUSED(iconKey);
-    Q_UNUSED(uriKey);
-    Q_UNUSED(uidKey);
-}
-
-HbAction* VideoListView::createAction(QString icon,
-    QActionGroup* actionGroup,
-    const char *slot)
-{
-    Q_UNUSED(icon);
-    Q_UNUSED(actionGroup);
-    Q_UNUSED(slot);
-    // not stubbed
-    return 0;
+    if(VideoListViewData::mCurrentListWidget)
+    {
+        return VideoListViewData::mCurrentListWidget;
+    }
+    return mCurrentList;
 }
 
 void VideoListView::showHint(bool show)
@@ -154,13 +136,6 @@
     // not stubbed
 }
 
-void VideoListView::showAction(bool show, const QString &name)
-{
-    Q_UNUSED(show);
-    Q_UNUSED(name);
-    // not stubbed
-}
-
 void VideoListView::openAllVideosViewSlot()
 {
     // not stubbed
@@ -171,16 +146,6 @@
     // not stubbed
 }
 
-void VideoListView::openOperatorServiceSlot()
-{
-    // not stubbed
-}
-
-void VideoListView::startSorting()
-{
-    // not stubbed
-}
-
 void VideoListView::aboutToChangeOrientationSlot()
 {
     // not stubbed
@@ -192,36 +157,6 @@
     // not stubbed
 }
 
-void VideoListView::deleteItemsSlot()
-{
-    // not stubbed
-}
-
-void VideoListView::createCollectionSlot()
-{
-    // not stubbed
-}
-
-void VideoListView::addVideosToCollectionSlot()
-{
-    // not stubbed
-}
-
-void VideoListView::removeVideosFromCollectionSlot()
-{
-    // not stubbed
-}
-
-void VideoListView::aboutToShowMainMenuSlot()
-{
-    // not stubbed
-}
-
-void VideoListView::prepareBrowseServiceMenu()
-{
-    // not stubbed
-}
-
 void VideoListView::handleAsyncStatusSlot(int statusCode, QVariant &additional)
 {
     Q_UNUSED(statusCode);
@@ -246,19 +181,20 @@
     // not stubbed
 }
 
-void VideoListView::doSorting(int value)
-{
-    Q_UNUSED(value);
-}
-
 void VideoListView::doDelayedsSlot()
 {
     // not stubbed    
 }
 
-void VideoListView::debugNotImplementedYet()
+
+void VideoListView::toolbarActionsChanged(QList<QAction*> newActions)
 {
-    // not stubbed
+    Q_UNUSED(newActions);    
+}
+
+void VideoListView::toolbarExtensionChanged(HbToolBarExtension* newExtension)
+{
+    Q_UNUSED(newExtension);     
 }
 
 // end of file