--- a/videoplayerapp/videoplayerengine/tsrc/testvideoplayerengine/stub/src/hbinstance.cpp	Thu Sep 02 20:28:16 2010 +0300
+++ b/videoplayerapp/videoplayerengine/tsrc/testvideoplayerengine/stub/src/hbinstance.cpp	Fri Sep 17 08:30:05 2010 +0300
@@ -15,16 +15,15 @@
 *
 */
 
-// Version : %version:  da1mmcf#7 %
+// Version : %version:  da1mmcf#8 %
 
-#include <hbmainwindow.h>
 
 #include "stub/inc/hbinstance.h"
 #include "mpxvideo_debug.h"
 
 bool initialised = false;
 HbInstance* mInstance = 0;
-QList<HbInstance *> mInstances;
+QList<HbMainWindow *> mWindows;
 
 // -------------------------------------------------------------------------------------------------
 // HbInstance::HbInstance()
@@ -33,6 +32,9 @@
 HbInstance::HbInstance()
 {
     MPX_DEBUG(_L("HbInstance::HbInstance()"));
+    
+    HbMainWindow* window = new HbMainWindow();  
+    mWindows.append(window);        
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -54,32 +56,21 @@
     
     if ( ! initialised )
     {
-    	mInstance = new HbInstance();  
-    	initialised = true;
-    	mInstances.append(mInstance);
+    	mInstance = new HbInstance();
     }
 	
     return mInstance;
 }
 
 // -------------------------------------------------------------------------------------------------
-// HbInstance::primaryWindow()
-// -------------------------------------------------------------------------------------------------
-//
-HbInstance* HbInstance::primaryWindow() const
-{
-    MPX_DEBUG(_L("HbInstance::primaryWindow()"));
-	return mInstance;
-}
-
-// -------------------------------------------------------------------------------------------------
 // HbInstance::allMainWindows()
 // -------------------------------------------------------------------------------------------------
 //
-QList<HbInstance *> HbInstance::allMainWindows() const
+QList<HbMainWindow *> HbInstance::allMainWindows() const
 {
     MPX_DEBUG(_L("HbInstance::allMainWindows()"));
-	return mInstances;
+
+	return mWindows;
 }
 
 // -------------------------------------------------------------------------------------------------