Removed some debug stuff, corrected the VerifyConfigure calls to VerifyAndConfigure

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

diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index c8c3dd096dbe349c11c1c3517c15cd20c99b30ad..eb4f04d7262c2e029c01c754d23e66b61c053d34 100644 (file)
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -32,7 +32,9 @@ class CacheSetHelper {                                                        /*{{{*/
     printed out.
 */
 public:                                                                        /*{{{*/
-       CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {};
+       CacheSetHelper(bool const &ShowError = true,
+               GlobalError::MsgType ErrorType = GlobalError::ERROR) :
+                       ShowError(ShowError), ErrorType(ErrorType) {};
        virtual ~CacheSetHelper() {};
 
        virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {};
@@ -58,9 +60,21 @@ public:                                                                      /*{{{*/
 
        bool showErrors() const { return ShowError; };
        bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); };
+       GlobalError::MsgType errorType() const { return ErrorType; };
+       GlobalError::MsgType errorType(GlobalError::MsgType const &newValue)
+       {
+               if (ErrorType == newValue) return ErrorType;
+               else {
+                       GlobalError::MsgType const &oldValue = ErrorType;
+                       ErrorType = newValue;
+                       return oldValue;
+               }
+       };
+
                                                                        /*}}}*/
 protected:
        bool ShowError;
+       GlobalError::MsgType ErrorType;
 };                                                                     /*}}}*/
 class PackageSet : public std::set<pkgCache::PkgIterator> {            /*{{{*/
 /** \class APT::PackageSet
@@ -121,7 +135,7 @@ public:                                                                     /*{{{*/
        static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper);
        static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) {
                CacheSetHelper helper;
-               return APT::PackageSet::FromTask(Cache, pattern, helper);
+               return FromTask(Cache, pattern, helper);
        }
 
        /** \brief returns all packages in the cache whose name matchs a given pattern
@@ -135,7 +149,7 @@ public:                                                                     /*{{{*/
        static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper);
        static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) {
                CacheSetHelper helper;
-               return APT::PackageSet::FromRegEx(Cache, pattern, helper);
+               return FromRegEx(Cache, pattern, helper);
        }
 
        /** \brief returns all packages specified by a string
@@ -146,7 +160,7 @@ public:                                                                     /*{{{*/
        static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper);
        static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) {
                CacheSetHelper helper;
-               return APT::PackageSet::FromString(Cache, string, helper);
+               return FromString(Cache, string, helper);
        }
 
        /** \brief returns a package specified by a string
@@ -157,7 +171,7 @@ public:                                                                     /*{{{*/
        static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper);
        static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) {
                CacheSetHelper helper;
-               return APT::PackageSet::FromName(Cache, string, helper);
+               return FromName(Cache, string, helper);
        }
 
        /** \brief returns all packages specified on the commandline
@@ -170,7 +184,7 @@ public:                                                                     /*{{{*/
        static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper);
        static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) {
                CacheSetHelper helper;
-               return APT::PackageSet::FromCommandLine(Cache, cmdline, helper);
+               return FromCommandLine(Cache, cmdline, helper);
        }
 
        struct Modifier {
@@ -201,7 +215,7 @@ public:                                                                     /*{{{*/
                std::list<PackageSet::Modifier> const &mods,
                unsigned short const &fallback) {
                CacheSetHelper helper;
-               return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline,
+               return GroupedFromCommandLine(Cache, cmdline,
                                mods, fallback, helper);
        }
 
@@ -243,7 +257,7 @@ 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(); };
-               inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); };
+               __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(); };
@@ -254,7 +268,7 @@ public:                                                                     /*{{{*/
                inline const char *PriorityType() const { return (**this).PriorityType(); };
                inline string RelStr() const { return (**this).RelStr(); };
                inline bool Automatic() const { return (**this).Automatic(); };
-               inline bool Pseudo() const { return (**this).Pseudo(); };
+               __deprecated inline bool Pseudo() const { return false; };
                inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
        };
                                                                        /*}}}*/
@@ -295,10 +309,10 @@ public:                                                                   /*{{{*/
        static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
                        APT::VersionSet::Version const &fallback) {
                CacheSetHelper helper;
-               return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, helper);
+               return FromCommandLine(Cache, cmdline, fallback, helper);
        }
        static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) {
-               return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST);
+               return FromCommandLine(Cache, cmdline, CANDINST);
        }
 
        static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg,
@@ -307,10 +321,10 @@ public:                                                                   /*{{{*/
        static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg,
                        APT::VersionSet::Version const &fallback) {
                CacheSetHelper helper;
-               return APT::VersionSet::FromString(Cache, pkg, fallback, helper);
+               return FromString(Cache, pkg, fallback, helper);
        }
        static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) {
-               return APT::VersionSet::FromString(Cache, pkg, CANDINST);
+               return FromString(Cache, pkg, CANDINST);
        }
 
        /** \brief returns all versions specified for the package
@@ -324,10 +338,10 @@ public:                                                                   /*{{{*/
        static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
                        APT::VersionSet::Version const &fallback) {
                CacheSetHelper helper;
-               return APT::VersionSet::FromPackage(Cache, P, fallback, helper);
+               return FromPackage(Cache, P, fallback, helper);
        }
        static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) {
-               return APT::VersionSet::FromPackage(Cache, P, CANDINST);
+               return FromPackage(Cache, P, CANDINST);
        }
 
        struct Modifier {
@@ -350,7 +364,7 @@ public:                                                                     /*{{{*/
                std::list<VersionSet::Modifier> const &mods,
                unsigned short const &fallback) {
                CacheSetHelper helper;
-               return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline,
+               return GroupedFromCommandLine(Cache, cmdline,
                                mods, fallback, helper);
        }
                                                                        /*}}}*/