* apt-pkg/cacheset.{cc,h}:

  - add simple wrapper around std::set for cache structures

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index e5b23a81880a78ca2b94b80500329bcecd8a7c6c..f0b40dbb549627c16d85ef261a7ae4c2a9889ad3 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -205,8 +205,8 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        inline PrvIterator ProvidesList() const;
        inline VerFileIterator FileList() const;
        bool Downloadable() const;
-       inline const char *PriorityType() {return Owner->Priority(S->Priority);};
-       string RelStr();
+       inline const char *PriorityType() const {return Owner->Priority(S->Priority);};
+       string RelStr() const;
 
        bool Automatic() const;
        bool Pseudo() const;

diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 7c05face69dbeab1f5366847405ade8a3148a7e3..f0131bfed333c109879e75558a41afb8ff799093 100644 (file)
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -17,12 +17,12 @@
 #include <apt-pkg/pkgcache.h>
                                                                        /*}}}*/
 namespace APT {
+class PackageSet : public std::set<pkgCache::PkgIterator> {            /*{{{*/
 /** \class APT::PackageSet
 
     Simple wrapper around a std::set to provide a similar interface to
     a set of packages as to the complete set of all packages in the
     pkgCache. */
-class PackageSet : public std::set<pkgCache::PkgIterator> {            /*{{{*/
 public:                                                                        /*{{{*/
        /** \brief smell like a pkgCache::PkgIterator */
        class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator {
@@ -86,11 +86,54 @@ public:                                                                     /*{{{*/
                std::ostream out (std::ofstream("/dev/null").rdbuf());
                return APT::PackageSet::FromCommandLine(Cache, cmdline, out);
        }
+                                                                       /*}}}*/
+};                                                                     /*}}}*/
+class VersionSet : public std::set<pkgCache::VerIterator> {            /*{{{*/
+/** \class APT::VersionSet
 
+    Simple wrapper around a std::set to provide a similar interface to
+    a set of versions as to the complete set of all versions in the
+    pkgCache. */
+public:                                                                        /*{{{*/
+       /** \brief smell like a pkgCache::VerIterator */
+       class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator {
+       public:
+               const_iterator(std::set<pkgCache::VerIterator>::const_iterator x) :
+                        std::set<pkgCache::VerIterator>::const_iterator(x) {}
 
+               operator pkgCache::VerIterator(void) { return **this; }
+
+               inline pkgCache *Cache() const { return (**this).Cache(); };
+               inline unsigned long Index() const {return (**this).Index();};
+               // we have only valid iterators here
+               inline bool end() const { return false; };
+
+               inline pkgCache::Version const * operator->() const {
+                       return &***this;
+               };
+
+               inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); };
+               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); };
+               inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); };
+               inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); };
+               inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); };
+               inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); };
+               inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); };
+               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 bool Automatic() const { return (**this).Automatic(); };
+               inline bool Pseudo() const { return (**this).Pseudo(); };
+               inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
+       };
+       // 103. set::iterator is required to be modifiable, but this allows modification of keys
+       typedef typename APT::VersionSet::const_iterator iterator;
 
                                                                        /*}}}*/
-};
-                                                                       /*}}}*/
+};                                                                     /*}}}*/
 }
 #endif

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index adaae9c89139361d94c2bd1deb1be819ffc71d35..30bb41470237d87913f8233be3720df189d99230 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -742,7 +742,7 @@ pkgCache::VerFileIterator pkgCache::VerIterator::NewestFile() const
 // ---------------------------------------------------------------------
 /* This describes the version from a release-centric manner. The output is a 
    list of Label:Version/Archive */
-string pkgCache::VerIterator::RelStr()
+string pkgCache::VerIterator::RelStr() const
 {
    bool First = true;
    string Res;

diff --git a/debian/changelog b/debian/changelog
index 6b9057ae3927dd2d8a44675372beb5e98ab10273..994be2bbc50ead501d53aabaa3c64deb5f5094b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low
     - correct "Dangerous iterator usage." pointed out by cppcheck
   * ftparchive/writer.h:
     - add a virtual destructor to FTWScanner class (for cppcheck)
-  * apt-pkg/cacheset.h:
-    - add a simple wrapper around std::set for packages with it
+  * apt-pkg/cacheset.{cc,h}:
+    - add simple wrapper around std::set for cache structures
     - move regex magic from apt-get to new FromRegEx method
     - move cmdline parsing from apt-cache to new FromCommandLine method
   * apt-pkg/contrib/cmdline.cc:
@@ -33,7 +33,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low
   * cmdline/apt-cache.cc:
     - make the search multiarch compatible by using GrpIterator instead
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 31 May 2010 20:00:24 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 31 May 2010 22:36:35 +0200
 
 apt (0.7.26~exp5) experimental; urgency=low