Imported Upstream version 16.3.2

[platform/upstream/libzypp.git] / zypp / media / MediaCurl.h

diff --git a/zypp/media/MediaCurl.h b/zypp/media/MediaCurl.h
index 209ff06..c78c7d9 100644 (file)
--- a/zypp/media/MediaCurl.h
+++ b/zypp/media/MediaCurl.h
@@ -53,7 +53,7 @@ class MediaCurl : public MediaHandler
 
     virtual void attachTo (bool next = false);
     virtual void releaseFrom( const std::string & ejectDev );
-    virtual void getFile( const Pathname & filename, const ByteCount &expectedFileSize_r ) const override;
+    virtual void getFile( const Pathname & filename ) const;
     virtual void getDir( const Pathname & dirname, bool recurse_r ) const;
     virtual void getDirInfo( std::list<std::string> & retlist,
                              const Pathname & dirname, bool dots = true ) const;
@@ -82,14 +82,14 @@ class MediaCurl : public MediaHandler
      * \throws MediaException
      *
      */
-    virtual void getFileCopy( const Pathname & srcFilename, const Pathname & targetFilename, const ByteCount &expectedFileSize_r) const override;
+    virtual void getFileCopy( const Pathname & srcFilename, const Pathname & targetFilename) const;
 
     /**
      *
      * \throws MediaException
      *
      */
-    virtual void doGetFileCopy( const Pathname & srcFilename, const Pathname & targetFilename, callback::SendReport<DownloadProgressReport> & _report, const ByteCount &expectedFileSize_r,  RequestOptions options = OPTION_NONE ) const;
+    virtual void doGetFileCopy( const Pathname & srcFilename, const Pathname & targetFilename, callback::SendReport<DownloadProgressReport> & _report, RequestOptions options = OPTION_NONE ) const;
 
 
     virtual bool checkAttachPoint(const Pathname &apoint) const;
@@ -113,10 +113,9 @@ class MediaCurl : public MediaHandler
     };
 
   protected:
-//     /** Callback sending just an alive trigger to the UI, without stats (e.g. during metalink download). */
-    static int aliveCallback( void *clientp, double dltotal, double dlnow, double ultotal, double ulnow );
-    /** Callback reporting download progress. */
-    static int progressCallback( void *clientp, double dltotal, double dlnow, double ultotal, double ulnow );
+
+    static int progressCallback( void *clientp, double dltotal, double dlnow,
+                                 double ultotal, double ulnow );
     static CURL *progressCallback_getcurl( void *clientp );
     /**
      * check the url is supported by the curl library
@@ -147,11 +146,9 @@ class MediaCurl : public MediaHandler
      *
      * \throws MediaException If there is a problem
      */
-    void evaluateCurlCode(const zypp::Pathname &filename, CURLcode code, bool timeout) const;
-
-    void doGetFileCopyFile( const Pathname & srcFilename, const Pathname & dest, FILE *file, callback::SendReport<DownloadProgressReport> & _report, const ByteCount &expectedFileSize_r, RequestOptions options = OPTION_NONE ) const;
+    void evaluateCurlCode( const zypp::Pathname &filename, CURLcode code, bool timeout ) const;
 
-    static void resetExpectedFileSize ( void *clientp, const ByteCount &expectedFileSize );
+    void doGetFileCopyFile( const Pathname & srcFilename, const Pathname & dest, FILE *file, callback::SendReport<DownloadProgressReport> & _report, RequestOptions options = OPTION_NONE ) const;
 
   private:
     /**