--- a/videocollection/videofiledetailsview/tsrc/testplugin/src/testvideofiledetails.cpp	Thu Apr 01 23:22:15 2010 +0300
+++ b/videocollection/videofiledetailsview/tsrc/testplugin/src/testvideofiledetails.cpp	Thu Apr 01 23:32:44 2010 +0300
@@ -63,7 +63,7 @@
    mDummyModel = new VideoSortFilterProxyModel();
    
    connect(this, SIGNAL(shortDetailsReady(TMPXItemId)), mDummyModel, SIGNAL(shortDetailsReady(TMPXItemId)));
-   connect(this, SIGNAL(fullDetailsReady(TMPXItemId)), mDummyModel, SIGNAL(fullDetailsReady(TMPXItemId)));
+   connect(this, SIGNAL(fullDetailsReady(TMPXItemId)), mDummyModel, SIGNAL(fullVideoDetailsReady(TMPXItemId)));
 
    connect(this, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), 
            mDummyModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)));
@@ -81,7 +81,7 @@
 void TestVideoFileDetails::cleanupTestCase()
 {
     disconnect(this, SIGNAL(shortDetailsReady(int)), mDummyModel, SIGNAL(shortDetailsReady(int)));
-    disconnect(this, SIGNAL(fullDetailsReady(int)),mDummyModel, SIGNAL(fullDetailsReady(int)));
+    disconnect(this, SIGNAL(fullDetailsReady(int)),mDummyModel, SIGNAL(fullVideoDetailsReady(int)));
     disconnect(this, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), 
             mDummyModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)));
     disconnect(this, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
@@ -100,7 +100,6 @@
     
     mPlugin = new VideoFileDetailsViewPlugin();
     mPlugin->createView();
-    mPlugin->createView();
     mCommandReceived = false;
     mReceivedCommand = -1;
     ThumbnailManager::mRequests.clear();
@@ -245,7 +244,7 @@
     QVERIFY( mPlugin->getView() == 0 );
     // plugin is still alive
     QVERIFY( mPlugin->viewPlugin() == mPlugin );
-    QVERIFY( mPlugin->mSecSkAction == 0 );
+    QVERIFY( mPlugin->mNavKeyBackAction == 0 );
     QVERIFY( mPlugin->mActivated == false );
     cleanup();
 }
@@ -341,7 +340,7 @@
     QCOMPARE( mCommandReceived, false );
     QCOMPARE( mReceivedCommand, -1 );
     
-    mPlugin->mSecSkAction->trigger();
+    mPlugin->mNavKeyBackAction->trigger();
     QCOMPARE( mCommandReceived, false );
     QCOMPARE( mReceivedCommand, -1 );
     
@@ -354,7 +353,7 @@
     mCommandReceived = false;
     mReceivedCommand = -1;
 
-    mPlugin->mSecSkAction->trigger();
+    mPlugin->mNavKeyBackAction->trigger();
     QCOMPARE( mCommandReceived, true );
     QCOMPARE( mReceivedCommand, static_cast<int>(MpxHbVideoCommon::ActivateCollectionView) );
     
@@ -367,7 +366,7 @@
     QCOMPARE( mCommandReceived, false );
     QCOMPARE( mReceivedCommand, -1 );
     
-    mPlugin->mSecSkAction->trigger();
+    mPlugin->mNavKeyBackAction->trigger();
     QCOMPARE( mCommandReceived, false );
     QCOMPARE( mReceivedCommand, -1 );
 
@@ -739,7 +738,7 @@
 template<class T> 
 T* TestVideoFileDetails::findWidget(QString name)
 {
-    return qobject_cast<T *>(mPlugin->mView.findWidget(name));
+    return qobject_cast<T *>(mPlugin->mLoader.findWidget(name));
 }
 
 // ---------------------------------------------------------------------------
@@ -749,7 +748,7 @@
 template<class T> 
 T* TestVideoFileDetails::findObject(QString name)
 {
-    return qobject_cast<T *>(mPlugin->mView.findObject(name));
+    return qobject_cast<T *>(mPlugin->mLoader.findObject(name));
 }
 
 // ---------------------------------------------------------------------------