cleanup the hash iteration. unfortunately there is no 1:1 mapping from Hashes::Suppor...

[apt.git] / methods / rsh.h

diff --git a/methods/rsh.h b/methods/rsh.h
index b4c76479a11b5f6bbec1e7a6f997e5d7ccf4e9ad..d7efa3f065dee3d9d180dd0fba1d49c467b6ee54 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -12,9 +12,9 @@
 
 #include <string>
 #include <apt-pkg/strutl.h>
 
 #include <string>
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/hashes.h>
-#include <apt-pkg/acquire-method.h>
-#include <apt-pkg/fileutl.h>
+
+class Hashes;
+class FileFd;

 
 class RSHConn
 {
 
 class RSHConn
 {


@@ -25,16 +25,16 @@ class RSHConn
    URI ServerName;
 
    // Private helper functions
    URI ServerName;
 
    // Private helper functions

-   bool ReadLine(string &Text);
+   bool ReadLine(std::string &Text);

 
    public:
 
    pid_t Process;
 
    // Raw connection IO
 
    public:
 
    pid_t Process;
 
    // Raw connection IO

-   bool WriteMsg(string &Text,bool Sync,const char *Fmt,...);
-   bool Connect(string Host, string User);
-   bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
+   bool WriteMsg(std::string &Text,bool Sync,const char *Fmt,...);
+   bool Connect(std::string Host, std::string User);
+   bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};

 
    // Connection control
    bool Open();
 
    // Connection control
    bool Open();


@@ -50,14 +50,16 @@ class RSHConn
    ~RSHConn();
 };
 
    ~RSHConn();
 };
 

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

 class RSHMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
 class RSHMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);

-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);

 
    RSHConn *Server;
 
 
    RSHConn *Server;
 

-   static string FailFile;
+   static std::string FailFile;

    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);
    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);