Merge commit 'e2073b0276226b625897ef475f225bf8f508719e' as 'triehash'

[apt.git] / methods / ftp.h

diff --git a/methods/ftp.h b/methods/ftp.h
index 2c4e9f57ad7d0563eccaf32d2c3065ef2898228c..6a12475a08a952e5c206163b118c6cd55bf57b3e 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -10,8 +10,8 @@
 #ifndef APT_FTP_H
 #define APT_FTP_H
 
 #ifndef APT_FTP_H
 #define APT_FTP_H
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/strutl.h>

+#include "aptmethod.h"

 
 #include <sys/socket.h>
 #include <sys/types.h>
 
 #include <sys/socket.h>
 #include <sys/types.h>


@@ -67,11 +67,11 @@ class FTPConn
            Hashes &MD5,bool &Missing, unsigned long long MaximumSize,
             pkgAcqMethod *Owner);
    
            Hashes &MD5,bool &Missing, unsigned long long MaximumSize,
             pkgAcqMethod *Owner);
    

-   FTPConn(URI Srv);
+   explicit FTPConn(URI Srv);

    ~FTPConn();
 };
 
    ~FTPConn();
 };
 

-class FtpMethod : public pkgAcqMethod
+class FtpMethod : public aptMethod

 {
    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
    virtual bool Configuration(std::string Message) APT_OVERRIDE;
 {
    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
    virtual bool Configuration(std::string Message) APT_OVERRIDE;