--- a/omadrm/drmplugins/drmrohandler/inc/rohandlerdmgrwrapper.h Fri Jun 11 15:44:45 2010 +0300
+++ b/omadrm/drmplugins/drmrohandler/inc/rohandlerdmgrwrapper.h Thu Jun 24 12:39:58 2010 +0300
@@ -19,14 +19,18 @@
#ifndef ROHANDLERDMGRWRAPPER_H
#define ROHANDLERDMGRWRAPPER_H
-namespace Roap
- {
- class MRoapObserver;
- }
+#include <e32base.h>
+#include <f32file.h>
+
+#include <RoapObserver.h>
+#include <RoapEng.h>
+
+#include <qobject.h>
+#include <downloadmanager.h>
+#include <download.h>
class CDRMRights;
-
-class MHttpDownloadMgrObserver;
+class QRoHandlerDMgrEventHandler;
class MRoHandlerDMgrWrapper
{
@@ -40,7 +44,6 @@
*/
class CRoHandlerDMgrWrapper:
public CActive, // Now active
- public MHttpDownloadMgrObserver,
public Roap::MRoapObserver,
public MRoHandlerDMgrWrapper
{
@@ -72,19 +75,6 @@
*/
void HandleRoapTriggerL( const TDesC8& aTrigger );
-
-// from base class MHttpDownloadMgrObserver
-
- /**
- * From MHttpDownloadMgrObserver.
- * Handle download manager events
- *
- * @since S60 3.2
- * @param aDownload the download
- * @param aEvent the event
- */
- void HandleDMgrEventL( RHttpDownload& aDownload, THttpDownloadEvent aEvent );
-
// From Roap::MRoapObserver
/**
* ConnectionConfL
@@ -211,6 +201,13 @@
* @leave System wide error code */
void PostResponseUrlL( const TDesC8& aPostResponseUrl );
+ /**
+ * Handle download manager events
+ *
+ * @param aEvent the event
+ */
+ void HandleDownloadEventL( WRT::DownloadEvent* aEvent );
+
protected:
//from Cactive
virtual void DoCancel();
@@ -246,8 +243,9 @@
/**
* Download manager session
*/
- RHttpDownloadMgr iDlMgr;
+ WRT::DownloadManager* iDlMgr;
+ WRT::Download* iDownload;
/**
* Used to make downloads synchronous
*/
@@ -277,6 +275,9 @@
RFs iFs;
HBufC* iFileName;
+
+ QRoHandlerDMgrEventHandler* iRoHandlerDMgrEventHandler;
+
};
#endif // ROHANDLERDMGRWRAPPER_H