diff -r d05a55b217df -r 79311d856354 idlehomescreen/widgetmanager/tsrc/wmunittest/inc/wmunittest.h --- a/idlehomescreen/widgetmanager/tsrc/wmunittest/inc/wmunittest.h Wed Apr 14 15:47:59 2010 +0300 +++ b/idlehomescreen/widgetmanager/tsrc/wmunittest/inc/wmunittest.h Tue Apr 27 16:26:12 2010 +0300 @@ -26,7 +26,6 @@ #include // RFs #include "wmwidgetorderdata.h" -#include "wmimageconverter.h" // MConverterObserver #include #include "wminstaller.h" @@ -67,7 +66,6 @@ * test class for STIF Test Framework TestScripter. */ NONSHARABLE_CLASS(CWmUnitTest) : public CScriptBase, - public MConverterObserver, public MHsContentController { public: // Constructors and destructor @@ -89,16 +87,13 @@ /** From CScriptBase Runs a script line. */ virtual TInt RunMethodL( CStifItemParser& aItem ); - public: // from MConverterObserver - - virtual void NotifyCompletion( TInt aError ); - public: // from MHsContentController TInt WidgetListL( CHsContentInfoArray& aArray ); TInt WidgetListL( CHsContentInfo& aInfo, CHsContentInfoArray& aArray ); TInt ViewListL( CHsContentInfoArray& aArray ); + TInt ViewListL( CHsContentInfo& aInfo, CHsContentInfoArray& aArray ); TInt AppListL( CHsContentInfoArray& aArray ); TInt AddWidgetL( CHsContentInfo& aInfo ); TInt RemoveWidgetL( CHsContentInfo& aInfo ); @@ -165,12 +160,6 @@ TInt ImageConverterDeleteL( CStifItemParser& aItem ); // calls image converter's main conversion method TInt ImageConverterConvertL( CStifItemParser& aItem ); - // checks image converter callback and checks its result - TInt ImageConverterWaitResultL( CStifItemParser& aItem ); - // gets and checks the conversion method from image converter - TInt ImageConverterConversionMethodL( CStifItemParser& aItem ); - // cancel ongoing convert - TInt CancelConvertL( CStifItemParser& aItem ); // TESTING UNISTALL TInt UninstallL( CStifItemParser& aItem );