--- a/ncdengine/engine/transport/inc/catalogshttpdownload.h	Thu Aug 19 10:02:49 2010 +0300
+++ b/ncdengine/engine/transport/inc/catalogshttpdownload.h	Tue Aug 31 15:21:33 2010 +0300
@@ -19,8 +19,9 @@
 #ifndef C_CATALOGSHTTPDOWNLOAD_H
 #define C_CATALOGSHTTPDOWNLOAD_H
 
-#include <downloadmgrclient.h>
-
+// HLA: #include <DownloadMgrClient.h>
+#include <download.h>
+#include <downloadevent.h>
 #include <s32file.h>
 
 #include "catalogshttpoperation.h"
@@ -33,7 +34,8 @@
 class CCatalogsHttpHeaders;
 class CCatalogsKeyValuePair;
 class CCatalogsHttpDownloadManager;
-
+class CCatalogsHttpQTDownload;
+using namespace WRT;
 /**
 * HTTP file download implementation
 *
@@ -77,7 +79,7 @@
     */
     static CCatalogsHttpDownload* NewLC( 
         CCatalogsHttpDownloadManager& aOwner, 
-        RHttpDownload* aDownload,
+        Download* aDownload,
         const CCatalogsHttpConfig& aConfig );
 
 
@@ -238,7 +240,8 @@
      */
     TInt StatusCode() const;        
     
-    
+    TDownloadDeleteState GetStatusState();
+    Download* GetDownload();
     /**
      * Not supported
      * @see MCatalogsHttpOperation::StatusText()
@@ -282,7 +285,9 @@
         
     TBool HandleHttpError( MCatalogsHttpOperation& aOperation, 
         TCatalogsHttpError aError );
-            
+
+     void HandledownloadEventL(DownloadEvent& aEvent);   
+              
 public:     
 
     /**
@@ -290,8 +295,9 @@
     *
     * @param aEvent Download Manager event
     */
+     /* HLa
     void HandleEventL( THttpDownloadEvent aEvent );
-    
+    */
     
     /**
      * Set file server session
@@ -321,7 +327,7 @@
     */
     CCatalogsHttpDownload( 
         CCatalogsHttpDownloadManager& aOwner, 
-        RHttpDownload* aDownload );
+        Download* aDownload );
     
     /**
     * 2nd phase constructor
@@ -344,9 +350,10 @@
     /**
     * Handles event progress
     * @param aEvent The event that has progressed
-    */            
+    */
+    /* HLa
     void HandleEventProgressL( const THttpDownloadEvent& aEvent );
-
+    */
     
     /**
     * Updates the target filename from Content-Disposition -header
@@ -482,7 +489,7 @@
     /**
      *  Replace current extension at aName with extension given (eExt).
      */
-    void CCatalogsHttpDownload::ReplaceExtension( TDes& aName, const TDesC& aExt );
+    void ReplaceExtension( TDes& aName, const TDesC& aExt );
     
     /**
      * Checks the preset content-type and forces HEAD request if
@@ -509,19 +516,22 @@
 
     CCatalogsHttpDownloadManager& iOwner;
     TCatalogsTransportOperationId iId;  // Operation id
-    RHttpDownload* iDownload;           // Platform download
+    Download* iDownload;           // Platform download
     CCatalogsHttpConfig* iConfig;       // Configuration
     MCatalogsHttpObserver* iObserver;   // Observer        
     TCatalogsHttpEvent iState;          // State of the download
     HBufC8* iUri;                       // Current URI
     HBufC8* iEncodedUri;                // Current URI as encoded
     CCatalogsHttpHeaders* iResponseHeaders; // Headers from HTTP response
+    CCatalogsHttpQTDownload* iQTDownload;
     
     // added request headers not supported by DL man
     HBufC8* iAddedRequestHeaders;       
     TInt iRefCount;        
     TBool iNormalDelete;
-    TBuf8<KMaxContentTypeLength> iContentType;
+
+    // HLa: TBuf8<KMaxContentTypeLength> iContentType;
+    TBuf8<256> iContentType;
         
     // Transaction for retrieving all of the response headers
     MCatalogsHttpOperation* iTransaction;
@@ -555,7 +565,7 @@
     // For managing async pause with dlmgr.
     TBool iPausePending;
     TBool iQueuedResume;
-    
+    TDownloadDeleteState iStatus;
 protected:
 
     // Grant access to UpdateContentType
@@ -563,4 +573,18 @@
     
     };
 
+class  CCatalogsHttpQTDownload: public QObject
+	{
+		 Q_OBJECT
+		 	public:
+		 		CCatalogsHttpQTDownload(CCatalogsHttpDownload* aHttpDownload,Download* aDownload);
+	    public slots:
+    	void downloadEventHandler(DownloadEvent*);
+    	void downloadErrorHandler(Error);
+	    public:
+	    	CCatalogsHttpDownload* iCatalogsHttpDownload;
+	    	Download* iDownload;           // Platform download
+	};
+	
+	
 #endif // C_CATALOGSHTTPDOWNLOAD_H