sanify API to get 'the' candidate version

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

diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index 29ef79b84f3ba21d99a777863d060808e320d13f..80876e3f9499d46249e8183e8a3ef5ec9c0acf63 100644 (file)
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -24,7 +24,7 @@
 class pkgDepCache;
 class pkgOrderList : protected pkgCache::Namespace
 {
-   void *d;
+   void * const d;
    protected:
 
    pkgDepCache &Cache;   
@@ -69,9 +69,8 @@ class pkgOrderList : protected pkgCache::Namespace
    bool DoRun();
    
    // For pre sorting
-   static pkgOrderList *Me;
-   static int OrderCompareA(const void *a, const void *b) APT_PURE;
-   static int OrderCompareB(const void *a, const void *b) APT_PURE;
+   int OrderCompareA(Package *a, Package *b) APT_PURE;
+   int OrderCompareB(Package *a, Package *b) APT_PURE;
    int FileCmp(PkgIterator A,PkgIterator B) APT_PURE;
    
    public:
@@ -122,7 +121,7 @@ class pkgOrderList : protected pkgCache::Namespace
 
    int Score(PkgIterator Pkg);
 
-   pkgOrderList(pkgDepCache *Cache);
+   explicit pkgOrderList(pkgDepCache *Cache);
    virtual ~pkgOrderList();
 };