[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines

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

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 0fcdb6f1a714361ef05e1f48a7946dcfe7c7b124..7d19eb81359a5205a4a04b8e4408576cc356804c 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                                                   /*{{{*/
 {


@@ -14,18 +18,18 @@ class pkgCdromStatus                                                        /*{{{*/
    int totalSteps;
 
  public:
    int totalSteps;
 
  public:

-   pkgCdromStatus() {};
+   pkgCdromStatus() : totalSteps(0) {};

    virtual ~pkgCdromStatus() {};
 
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };
    // update steps, will be called regularly as a "pulse"
    virtual ~pkgCdromStatus() {};
 
    // 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,33 +51,34 @@ 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);
 };
                                                                        /*}}}*/
 
 

-// class that uses libudev to find cdrom devices dynamically
+// class that uses libudev to find cdrom/removable devices dynamically

 struct CdromDevice                                                     /*{{{*/
 {
 struct CdromDevice                                                     /*{{{*/
 {

-   string DeviceName;
+   std::string DeviceName;

    bool Mounted;
    bool Mounted;

-   string MountPath;
+   std::string MountPath;

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


@@ -83,7 +88,6 @@ class pkgUdevCdromDevices                                             /*{{{*/
    void *libudev_handle;
    struct udev* (*udev_new)(void);
    int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
    void *libudev_handle;
    struct udev* (*udev_new)(void);
    int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);

-   int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);

    int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate);
    struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enumerate *udev_enumerate);
    struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, const char *syspath);
    int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate);
    struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enumerate *udev_enumerate);
    struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, const char *syspath);


@@ -93,6 +97,7 @@ class pkgUdevCdromDevices                                             /*{{{*/
    struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
    struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
    const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
    struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
    struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
    const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);

+   int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);

    // end libudev dlopen
    
  public:
    // end libudev dlopen
    
  public:


@@ -101,7 +106,12 @@ class pkgUdevCdromDevices                                          /*{{{*/
 
    // try to open 
    bool Dlopen();
 
    // try to open 
    bool Dlopen();

-   vector<CdromDevice> Scan();
+
+   // convenience interface, this will just call ScanForRemovable
+   // with "APT::cdrom::CdromOnly"
+   std::vector<CdromDevice> Scan();
+
+   std::vector<CdromDevice> ScanForRemovable(bool CdromOnly);

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