merged previous bzr commit

[apt.git] / apt-pkg / cdrom.h

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 032fae755bcdd9f11d7cda4c5917eb0758c39247..4fc3d39285b727b58518d6a539a12e086d1ebe40 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,12 +1,16 @@
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 

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

 #include<string>
 #include<vector>
 
 #include<string>
 #include<vector>
 

-
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/init.h>

 using namespace std;
 using namespace std;

+#endif
+
+class Configuration;
+class OpProgress;

 
 class pkgCdromStatus                                                   /*{{{*/
 {
 
 class pkgCdromStatus                                                   /*{{{*/
 {


@@ -20,12 +24,12 @@ class pkgCdromStatus                                                        /*{{{*/
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };
    // update steps, will be called regularly as a "pulse"
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };
    // update steps, will be called regularly as a "pulse"

-   virtual void Update(string text="", int current=0) = 0;
+   virtual void Update(std::string text="", int current=0) = 0;

    
    // ask for cdrom insert
    virtual bool ChangeCdrom() = 0;
    // ask for cdrom name
    
    // ask for cdrom insert
    virtual bool ChangeCdrom() = 0;
    // ask for cdrom name

-   virtual bool AskCdromName(string &Name) = 0;
+   virtual bool AskCdromName(std::string &Name) = 0;

    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };
    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };


@@ -47,22 +51,23 @@ class pkgCdrom                                                              /*{{{*/
    };
 
 
    };
 
 

-   bool FindPackages(string CD,
-                    vector<string> &List,
-                    vector<string> &SList, 
-                    vector<string> &SigList,
-                    vector<string> &TransList,
-                    string &InfoDir, pkgCdromStatus *log,
+   bool FindPackages(std::string CD,
+                    std::vector<std::string> &List,
+                    std::vector<std::string> &SList, 
+                    std::vector<std::string> &SigList,
+                    std::vector<std::string> &TransList,
+                    std::string &InfoDir, pkgCdromStatus *log,

                     unsigned int Depth = 0);
                     unsigned int Depth = 0);

-   bool DropBinaryArch(vector<string> &List);
-   bool DropRepeats(vector<string> &List,const char *Name);
-   void ReduceSourcelist(string CD,vector<string> &List);
+   bool DropBinaryArch(std::vector<std::string> &List);
+   bool DropRepeats(std::vector<std::string> &List,const char *Name);
+   bool DropTranslation(std::vector<std::string> &List);
+   void ReduceSourcelist(std::string CD,std::vector<std::string> &List);

    bool WriteDatabase(Configuration &Cnf);
    bool WriteDatabase(Configuration &Cnf);

-   bool WriteSourceList(string Name,vector<string> &List,bool Source);
-   int Score(string Path);
+   bool WriteSourceList(std::string Name,std::vector<std::string> &List,bool Source);
+   int Score(std::string Path);

 
  public:
 
  public:

-   bool Ident(string &ident, pkgCdromStatus *log);
+   bool Ident(std::string &ident, pkgCdromStatus *log);

    bool Add(pkgCdromStatus *log);
 };
                                                                        /*}}}*/
    bool Add(pkgCdromStatus *log);
 };
                                                                        /*}}}*/


@@ -71,9 +76,9 @@ class pkgCdrom                                                                /*{{{*/
 // class that uses libudev to find cdrom/removable devices dynamically
 struct CdromDevice                                                     /*{{{*/
 {
 // class that uses libudev to find cdrom/removable devices dynamically
 struct CdromDevice                                                     /*{{{*/
 {

-   string DeviceName;
+   std::string DeviceName;

    bool Mounted;
    bool Mounted;

-   string MountPath;
+   std::string MountPath;

 };
                                                                        /*}}}*/
 class pkgUdevCdromDevices                                              /*{{{*/
 };
                                                                        /*}}}*/
 class pkgUdevCdromDevices                                              /*{{{*/


@@ -102,11 +107,11 @@ class pkgUdevCdromDevices                                         /*{{{*/
    // try to open 
    bool Dlopen();
 
    // try to open 
    bool Dlopen();
 

-   // this is the new interface
-   vector<CdromDevice> ScanForRemovable(bool CdromOnly);
-   // FIXME: compat with the old interface/API/ABI only
-   vector<CdromDevice> Scan();
+   // convenience interface, this will just call ScanForRemovable
+   // with "APT::cdrom::CdromOnly"
+   std::vector<CdromDevice> Scan();

 
 

+   std::vector<CdromDevice> ScanForRemovable(bool CdromOnly);

 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/