make all d-pointer * const pointers

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 35b786e1a1556b57d646cf9d3316e9e1279250b6..e17ad6a9a67ccba035c15061e138afcfd244e0bf 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: sourcelist.h,v 1.12.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    SourceList - Manage a list of sources
 /* ######################################################################
 
    SourceList - Manage a list of sources


@@ -52,23 +51,16 @@ class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
 
 class pkgIndexFile;
 class metaIndex;
 

-class pkgSource
-{
-   protected:
-
-   std::vector<metaIndex *> SrcList;
-
-};
-
-class pkgSourceList : public pkgSource
+class pkgSourceList

 {
 {

+   void * const d;

    public:
    public:

-   
+

    // List of supported source list types
    class Type
    {
       public:
    // List of supported source list types
    class Type
    {
       public:

-      
+

       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;


@@ -91,14 +83,18 @@ class pkgSourceList : public pkgSource
       Type();
       virtual ~Type() {};
    };
       Type();
       virtual ~Type() {};
    };

-   
+

    typedef std::vector<metaIndex *>::const_iterator const_iterator;
    typedef std::vector<metaIndex *>::const_iterator const_iterator;

-   
-   public:
+
+   protected:
+
+   std::vector<metaIndex *> SrcList;

 
    int ParseFileDeb822(std::string File);
    bool ParseFileOldStyle(std::string File);
 
 
    int ParseFileDeb822(std::string File);
    bool ParseFileOldStyle(std::string File);
 

+   public:
+

    bool ReadMainList();
    bool Read(std::string File);
 
    bool ReadMainList();
    bool Read(std::string File);
 


@@ -121,8 +117,8 @@ class pkgSourceList : public pkgSource
    time_t GetLastModifiedTime();
 
    pkgSourceList();
    time_t GetLastModifiedTime();
 
    pkgSourceList();

-   pkgSourceList(std::string File);
-   ~pkgSourceList();      
+   explicit pkgSourceList(std::string File);
+   virtual ~pkgSourceList();

 };
 
 #endif
 };
 
 #endif