more explicit MarkRequired algorithm code

[apt.git] / apt-private / private-cachefile.h

diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h
index 4a68d973314d4f62dbb03dcdd09349f4d7396106..27642e0258d53e25a3b4ec16ad89dcf07d871c9d 100644 (file)
--- a/apt-private/private-cachefile.h
+++ b/apt-private/private-cachefile.h
@@ -11,17 +11,6 @@
 
 #include <apti18n.h>
 
 
 #include <apti18n.h>
 

-// FIXME: we need to find a way to export this
-class APT_PUBLIC SourceList : public pkgSourceList
-{
- public:
-   // Add custom metaIndex (e.g. local files)
-   void AddMetaIndex(metaIndex *mi) {
-      SrcList.push_back(mi);
-   }
-
-};
-

 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
 class APT_PUBLIC CacheFile : public pkgCacheFile
 {
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
 class APT_PUBLIC CacheFile : public pkgCacheFile
 {


@@ -36,16 +25,6 @@ class APT_PUBLIC CacheFile : public pkgCacheFile
         return false;
       return true;
    }
         return false;
       return true;
    }

-   // FIXME: this can go once the "libapt-pkg" pkgSourceList has a way
-   //        to add custom metaIndexes (or custom local files or so)
-   bool BuildSourceList(OpProgress */*Progress*/ = NULL) {
-      if (SrcList != NULL)
-         return true;
-      SrcList = new SourceList();
-      if (SrcList->ReadMainList() == false)
-         return _error->Error(_("The list of sources could not be read."));
-      return true;
-   }

    bool Open(bool WithLock = true)
    {
       OpTextProgress Prog(*_config);
    bool Open(bool WithLock = true)
    {
       OpTextProgress Prog(*_config);


@@ -61,36 +40,35 @@ class APT_PUBLIC CacheFile : public pkgCacheFile
 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/
 

-class APT_PUBLIC SortedPackageUniverse : public APT::PackageUniverse
+class SortedPackageUniverse : public APT::PackageUniverse

 {
    std::vector<map_pointer_t> &List;
    void LazyInit() const;
 
 public:
 {
    std::vector<map_pointer_t> &List;
    void LazyInit() const;
 
 public:

-   SortedPackageUniverse(CacheFile &Cache);
+   explicit SortedPackageUniverse(CacheFile &Cache);

 
    class const_iterator : public APT::Container_iterator_base<APT::PackageContainerInterface, SortedPackageUniverse, SortedPackageUniverse::const_iterator, std::vector<map_pointer_t>::const_iterator, pkgCache::PkgIterator>
    {
       pkgCache * const Cache;
 
    class const_iterator : public APT::Container_iterator_base<APT::PackageContainerInterface, SortedPackageUniverse, SortedPackageUniverse::const_iterator, std::vector<map_pointer_t>::const_iterator, pkgCache::PkgIterator>
    {
       pkgCache * const Cache;

-      protected:
-        inline virtual pkgCache::PkgIterator getType(void) const APT_OVERRIDE
+      public:
+        inline pkgCache::PkgIterator getType(void) const

         {
            if (*_iter == 0) return pkgCache::PkgIterator(*Cache);
            return pkgCache::PkgIterator(*Cache, Cache->PkgP + *_iter);
         }
         {
            if (*_iter == 0) return pkgCache::PkgIterator(*Cache);
            return pkgCache::PkgIterator(*Cache, Cache->PkgP + *_iter);
         }

-      public:

         explicit const_iterator(pkgCache * const Owner, std::vector<map_pointer_t>::const_iterator i):
            Container_iterator_base<APT::PackageContainerInterface, SortedPackageUniverse, SortedPackageUniverse::const_iterator, std::vector<map_pointer_t>::const_iterator, pkgCache::PkgIterator>(i), Cache(Owner) {}
 
    };
    typedef const_iterator iterator;
 
         explicit const_iterator(pkgCache * const Owner, std::vector<map_pointer_t>::const_iterator i):
            Container_iterator_base<APT::PackageContainerInterface, SortedPackageUniverse, SortedPackageUniverse::const_iterator, std::vector<map_pointer_t>::const_iterator, pkgCache::PkgIterator>(i), Cache(Owner) {}
 
    };
    typedef const_iterator iterator;
 

-   APT_PUBLIC const_iterator begin() const { LazyInit(); return const_iterator(data(), List.begin()); }
-   APT_PUBLIC const_iterator end() const { LazyInit(); return const_iterator(data(), List.end()); }
-   APT_PUBLIC const_iterator cbegin() const { LazyInit(); return const_iterator(data(), List.begin()); }
-   APT_PUBLIC const_iterator cend() const { LazyInit(); return const_iterator(data(), List.end()); }
-   APT_PUBLIC iterator begin() { LazyInit(); return iterator(data(), List.begin()); }
-   APT_PUBLIC iterator end() { LazyInit(); return iterator(data(), List.end()); }
+   const_iterator begin() const { LazyInit(); return const_iterator(data(), List.begin()); }
+   const_iterator end() const { LazyInit(); return const_iterator(data(), List.end()); }
+   const_iterator cbegin() const { LazyInit(); return const_iterator(data(), List.begin()); }
+   const_iterator cend() const { LazyInit(); return const_iterator(data(), List.end()); }
+   iterator begin() { LazyInit(); return iterator(data(), List.begin()); }
+   iterator end() { LazyInit(); return iterator(data(), List.end()); }

 };
 
 #endif
 };
 
 #endif