summaryrefslogtreecommitdiff
path: root/apt-pkg/cdrom.h
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg/cdrom.h')
-rw-r--r--apt-pkg/cdrom.h41
1 files changed, 20 insertions, 21 deletions
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 614062cbb..319254fd0 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,12 +1,11 @@
#ifndef PKGLIB_CDROM_H
#define PKGLIB_CDROM_H
-#include<apt-pkg/init.h>
#include<string>
#include<vector>
-
-using namespace std;
+class Configuration;
+class OpProgress;
class pkgCdromStatus /*{{{*/
{
@@ -20,12 +19,12 @@ class 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
- virtual bool AskCdromName(string &Name) = 0;
+ virtual bool AskCdromName(std::string &Name) = 0;
// Progress indicator for the Index rewriter
virtual OpProgress* GetOpProgress() {return NULL; };
};
@@ -47,22 +46,22 @@ 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);
- 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);
+ void ReduceSourcelist(std::string CD,std::vector<std::string> &List);
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:
- bool Ident(string &ident, pkgCdromStatus *log);
+ bool Ident(std::string &ident, pkgCdromStatus *log);
bool Add(pkgCdromStatus *log);
};
/*}}}*/
@@ -71,9 +70,9 @@ class pkgCdrom /*{{{*/
// class that uses libudev to find cdrom/removable devices dynamically
struct CdromDevice /*{{{*/
{
- string DeviceName;
+ std::string DeviceName;
bool Mounted;
- string MountPath;
+ std::string MountPath;
};
/*}}}*/
class pkgUdevCdromDevices /*{{{*/
@@ -104,9 +103,9 @@ class pkgUdevCdromDevices /*{{{*/
// convenience interface, this will just call ScanForRemovable
// with "APT::cdrom::CdromOnly"
- vector<CdromDevice> Scan();
+ std::vector<CdromDevice> Scan();
- vector<CdromDevice> ScanForRemovable(bool CdromOnly);
+ std::vector<CdromDevice> ScanForRemovable(bool CdromOnly);
};
/*}}}*/