--- a/taskswitcher/server/src/tsdatalist.cpp	Mon Sep 27 11:31:59 2010 +0300
+++ b/taskswitcher/server/src/tsdatalist.cpp	Wed Oct 06 16:00:22 2010 +0300
@@ -27,12 +27,16 @@
 #include <apgwgnam.h>
 #include <QSizeF>
 #include <camenuiconutility.h>
+#include <apgcli.h>
 
 #include "tsdatalist.h"
 #include "tsentrykeygenerator.h"
 #include "tsscreenshotmsg.h"
 #include "tsunregscreenshotmsg.h"
 #include "tsvisibilitymsg.h"
+#include "tsresourcemanager.h"
+#include "tsrunningapp.h"
+#include "tsrunningappstorage.h"
 
 // size for the created app icons
 const TInt KAppIconWidth = 128;
@@ -48,12 +52,10 @@
  * Two-phased constructor.
  */
 CTsDataList* CTsDataList::NewL( MTsResourceManager& aResources,
-                                MTsWindowGroupsMonitor& aMonitor, 
                                 MTsDataObserver& aObserver,
                                 TsEnv& aEnv )
     {
     CTsDataList* self = new (ELeave) CTsDataList( aResources, 
-                                                  aMonitor, 
                                                   aObserver,
                                                   aEnv);
     CleanupStack::PushL( self );
@@ -67,11 +69,10 @@
  * Constructor.
  */
 CTsDataList::CTsDataList(MTsResourceManager& aResources,
-                         MTsWindowGroupsMonitor &aMonitor, 
                          MTsDataObserver& aObserver,
                          TsEnv& aEnv) 
 :
-    CTsWindowGroupsObserver( aMonitor ),
+    CTsWindowGroupsObserverBase( aResources.WsMonitor() ),
     iResources( aResources ),
     iObserver( aObserver ),
     iEnv( aEnv )