* apt-pkg/algorithms.cc:

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

diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index eb4f04d7262c2e029c01c754d23e66b61c053d34..3b1118bdca181b9f39cf9785d06c82f7dc524da8 100644 (file)
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -16,9 +16,12 @@
 #include <set>
 #include <string>
 
-#include <apt-pkg/cachefile.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
                                                                        /*}}}*/
+
+class pkgCacheFile;
+
 namespace APT {
 class PackageSet;
 class VersionSet;
@@ -37,10 +40,10 @@ public:                                                                     /*{{{*/
                        ShowError(ShowError), ErrorType(ErrorType) {};
        virtual ~CacheSetHelper() {};
 
-       virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {};
-       virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {};
+       virtual void showTaskSelection(PackageSet const &pkgset, std::string const &pattern) {};
+       virtual void showRegExSelection(PackageSet const &pkgset, std::string const &pattern) {};
        virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver,
-                                string const &ver, bool const &verIsRel) {};
+                                std::string const &ver, bool const &verIsRel) {};
 
        virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str);
        virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern);
@@ -257,7 +260,6 @@ public:                                                                     /*{{{*/
                inline const char *VerStr() const { return (**this).VerStr(); };
                inline const char *Section() const { return (**this).Section(); };
                inline const char *Arch() const { return (**this).Arch(); };
-               __deprecated inline const char *Arch(bool const pseudo) const { return (**this).Arch(); };
                inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); };
                inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); };
                inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); };
@@ -266,9 +268,8 @@ public:                                                                     /*{{{*/
                inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); };
                inline bool Downloadable() const { return (**this).Downloadable(); };
                inline const char *PriorityType() const { return (**this).PriorityType(); };
-               inline string RelStr() const { return (**this).RelStr(); };
+               inline std::string RelStr() const { return (**this).RelStr(); };
                inline bool Automatic() const { return (**this).Automatic(); };
-               __deprecated inline bool Pseudo() const { return false; };
                inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
        };
                                                                        /*}}}*/