rred: Only call pkgInitConfig() in test mode

[apt.git] / methods / ftp.h

diff --git a/methods/ftp.h b/methods/ftp.h
index 2efd28ec6e28bb0acbc0f5d46dec1fb334f40dd4..de2c232bd41db0efd18e02c9fa29a0aad7b1f30c 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -10,8 +10,11 @@
 #ifndef APT_FTP_H
 #define APT_FTP_H
 
+#include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
+#include "aptmethod.h"
 
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <time.h>
 #include <string>
@@ -65,14 +68,14 @@ class FTPConn
            Hashes &MD5,bool &Missing, unsigned long long MaximumSize,
             pkgAcqMethod *Owner);
    
-   FTPConn(URI Srv);
+   explicit FTPConn(URI Srv);
    ~FTPConn();
 };
 
-class FtpMethod : public pkgAcqMethod
+class FtpMethod : public aptMethod
 {
-   virtual bool Fetch(FetchItem *Itm);
-   virtual bool Configuration(std::string Message);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   virtual bool Configuration(std::string Message) APT_OVERRIDE;
    
    FTPConn *Server;