diff -r d2f833ab7940 -r 7aaf39b772ac tstaskmonitor/client/s60/src/tstaskmonitor_p.cpp --- a/tstaskmonitor/client/s60/src/tstaskmonitor_p.cpp Fri Jun 11 16:13:51 2010 +0300 +++ b/tstaskmonitor/client/s60/src/tstaskmonitor_p.cpp Thu Jun 24 16:18:29 2010 +0300 @@ -17,13 +17,15 @@ #include "tstaskmonitor_p.h" #include "tstaskmonitor.h" +#include + #include "tstaskmonitorclient.h" #include "tsapplicationtask.h" #include "tsutils.h" using TaskSwitcher::CleanupResetAndDestroyPushL; -TsTaskMonitorPrivate::TsTaskMonitorPrivate(TsTaskMonitor *q) : q_ptr(q), mClient(0) +TsTaskMonitorPrivate::TsTaskMonitorPrivate(TsTaskMonitor *q) : q_ptr(q), mClient(0), mWsSession(CEikonEnv::Static()->WsSession()) { QT_TRAP_THROWING(mClient = CTsTaskMonitorClient::NewL()); mClient->Subscribe(*this); @@ -40,8 +42,8 @@ QList< QSharedPointer > tasks; QT_TRAP_THROWING ( - RPointerArray entries; - CleanupResetAndDestroyPushL(entries); + RPointerArray entries; + CleanupResetAndDestroyPushL(entries); mClient->TaskListL(entries); // TsTask claims ownership of CTsFswEntry, so we have to remove entries from @@ -49,12 +51,12 @@ // CTsFswEntry objects in case of leave (for example due to OOM) in the middle // of the loop below. while (entries.Count()) { - CTsFswEntry *firstEntry = entries[0]; + CTsEntry *firstEntry = entries[0]; CleanupStack::PushL(firstEntry); entries.Remove(0); // @todo switch by entry type - QT_TRYCATCH_LEAVING(tasks.append(QSharedPointer(new TsApplicationTask(firstEntry)))); + QT_TRYCATCH_LEAVING(tasks.append(QSharedPointer(new TsApplicationTask(mWsSession, firstEntry)))); CleanupStack::Pop(firstEntry); }